diff --git a/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml b/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml
new file mode 100644
index 000000000..69ab5e796
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index f78f7cd6c..8dd286f20 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -219,6 +219,8 @@
+
+
@@ -227,12 +229,11 @@
-
-
+
+
-
diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml
index 919ef246c..80cdb34e8 100644
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@@ -41,6 +41,7 @@
+
@@ -176,6 +177,8 @@
+
+
@@ -184,12 +187,11 @@
-
-
+
+
-
diff --git a/emis-biz/pom-1.xml b/emis-biz/pom-1.xml
new file mode 100644
index 000000000..7bf617989
--- /dev/null
+++ b/emis-biz/pom-1.xml
@@ -0,0 +1,203 @@
+
+
+ 4.0.0
+
+ com.xdadan
+ emis
+ 1.0.2
+ ../pom.xml
+
+
+ emis-biz
+ 1.0.2
+ emis模块
+
+
+
+
+
+ com.xdadan
+ emis-common
+ 1.0.4
+
+
+ commons-logging
+ commons-logging
+
+
+ jsqlparser
+ com.github.jsqlparser
+
+
+
+
+
+ com.xdadan
+ emis-system
+ 1.0.4
+ compile
+
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.googlecode.aviator
+ aviator
+ 5.2.4
+
+
+
+
+ com.itextpdf
+ itextpdf
+ 5.5.6
+
+
+ com.itextpdf
+ itext-asian
+ 5.2.0
+
+
+
+ com.itextpdf.tool
+ xmlworker
+ 5.5.6
+
+
+
+ org.apache.pdfbox
+ pdfbox
+ 2.0.9
+
+
+ org.apache.pdfbox
+ fontbox
+ 2.0.9
+
+
+
+ net.coobird
+ thumbnailator
+ 0.4.11
+
+
+
+
+
+ com.aliyun
+ dysmsapi20170525
+ 2.0.22
+
+
+ tea
+ com.aliyun
+
+
+ tea-util
+ com.aliyun
+
+
+ bcprov-jdk15on
+ org.bouncycastle
+
+
+ org.jacoco.agent
+ org.jacoco
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.aliyun
+ tea-util
+ 0.2.14
+
+
+ com.aliyun
+ tea
+ 1.1.14
+
+
+
+
+ com.alibaba
+ easyexcel
+ 3.3.2
+
+
+
+ com.deepoove
+ poi-tl
+ 1.10.6
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.aspose
+ aspose-words
+ 15.8.0
+ system
+ ${project.basedir}/lib/aspose-words-15.8.0-jdk16.jar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index 7bf617989..136c6b24f 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -21,16 +21,6 @@
com.xdadan
emis-common
1.0.4
-
-
- commons-logging
- commons-logging
-
-
- jsqlparser
- com.github.jsqlparser
-
-
@@ -93,35 +83,17 @@
com.aliyun
dysmsapi20170525
2.0.22
-
-
- tea
- com.aliyun
-
-
- tea-util
- com.aliyun
-
-
- bcprov-jdk15on
- org.bouncycastle
-
-
- org.jacoco.agent
- org.jacoco
-
-
-
-
-
-
-
-
-
-
-
-
+
+ com.aliyun
+ tea-openapi
+ 0.2.6
+
+
+ com.aliyun
+ tea-console
+ 0.0.1
+
com.aliyun
tea-util
@@ -133,6 +105,16 @@
1.1.14
+
+
+
+
+
+
+
+
+
+
com.alibaba
@@ -144,35 +126,9 @@
com.deepoove
poi-tl
1.10.6
-
-
- commons-logging
- commons-logging
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
com.aspose
aspose-words
@@ -182,21 +138,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/DocUtils.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/DocUtils.java
index c241e5b00..2a45a4aeb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/DocUtils.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/DocUtils.java
@@ -1,6 +1,5 @@
package com.xdadan.erp.emis.service.warehouse;
-
import com.aspose.words.*;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;