From 140e9dc3c826af8c21884a3d1f82fe15784c43e2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 28 Jul 2024 16:57:03 +0800
Subject: [PATCH] md

---
 emis-biz-web/emis-biz-web.iml                 |  9 ++++++
 emis-biz/emis-biz.iml                         |  9 ++++++
 emis-biz/pom.xml                              | 29 +++++++++----------
 .../service/impl/EmisWaybillServiceImpl.java  |  8 ++---
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index b587cac55..5629c9673 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -270,5 +270,14 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.aspose:aspose-words:15.8.0">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../emis-biz/lib/aspose-words-15.8.0-jdk16.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml
index c3ffeed96..781b7da7a 100644
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@@ -229,5 +229,14 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.aspose:aspose-words:15.8.0">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/aspose-words-15.8.0-jdk16.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index e8f7fc176..472ca1905 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -106,14 +106,13 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>com.mascloud</groupId>
-            <artifactId>massdk</artifactId>
-            <version>1.0.3</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar</systemPath>
-        </dependency>
-
+<!--        <dependency>-->
+<!--            <groupId>com.mascloud</groupId>-->
+<!--            <artifactId>massdk</artifactId>-->
+<!--            <version>1.0.3</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${project.basedir}/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar</systemPath>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -152,13 +151,13 @@
             <version>1.10.6</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.aspose</groupId>-->
-<!--            <artifactId>aspose-words</artifactId>-->
-<!--            <version>15.8.0</version>-->
-<!--            <scope>system</scope>-->
-<!--            <systemPath>${project.basedir}/lib/aspose-words-15.8.0-jdk16.jar</systemPath>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.aspose</groupId>
+            <artifactId>aspose-words</artifactId>
+            <version>15.8.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/aspose-words-15.8.0-jdk16.jar</systemPath>
+        </dependency>
 
 
         <!--        <dependency>-->
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 3b1409474..99358d38c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -2336,11 +2336,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             // 写入流
-//            template.write(bos);
-            template.write(outputStream);
+            template.write(bos);
+//            template.write(outputStream);
 
-//            ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-//            DocUtils.wordToPdf(bis, outputStream);
+            ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+            DocUtils.wordToPdf(bis, outputStream);
 
             response.flushBuffer();