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 @@
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
\ 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 @@
-
- com.mascloud
- massdk
- 1.0.3
- system
- ${project.basedir}/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
-
-
+
+
+
+
+
+
+
org.apache.poi
@@ -152,13 +151,13 @@
1.10.6
-
-
-
-
-
-
-
+
+ com.aspose
+ aspose-words
+ 15.8.0
+ system
+ ${project.basedir}/lib/aspose-words-15.8.0-jdk16.jar
+
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();