md

2024-07-28 16:08:06 +08:00 · 2024-07-28 16:08:06 +08:00 · 3734664b7d
commit 3734664b7d
parent 4aa19cf802
6 changed files with 249 additions and 85 deletions
--- a/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml
+++ b/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.aliyun:tea-console:0.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-console/0.0.1/tea-console-0.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-console/0.0.1/tea-console-0.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-console/0.0.1/tea-console-0.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@ -219,6 +219,8 @@
    <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.11" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.22" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
@ -227,12 +229,11 @@
    <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
+    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.4" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-console:0.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea:1.1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.4" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.3.2" level="project" />
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@ -41,6 +41,7 @@
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.0" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.0" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.0" level="project" />
@ -176,6 +177,8 @@
    <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.11" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.22" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
@ -184,12 +187,11 @@
    <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
+    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.4" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-console:0.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea:1.1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.4" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.3.2" level="project" />
--- a/emis-biz/pom-1.xml
+++ b/emis-biz/pom-1.xml
@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.xdadan</groupId>
+        <artifactId>emis</artifactId>
+        <version>1.0.2</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>emis-biz</artifactId>
+    <version>1.0.2</version>
+    <description>emis模块</description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.xdadan</groupId>
+            <artifactId>emis-common</artifactId>
+            <version>1.0.4</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jsqlparser</artifactId>
+                    <groupId>com.github.jsqlparser</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.xdadan</groupId>
+            <artifactId>emis-system</artifactId>
+            <version>1.0.4</version>
+            <scope>compile</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.aviator</groupId>
+            <artifactId>aviator</artifactId>
+            <version>5.2.4</version>
+        </dependency>
+
+        <!-- pdf核心包 -->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itext-asian</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+        <!-- html转pdf -->
+        <dependency>
+            <groupId>com.itextpdf.tool</groupId>
+            <artifactId>xmlworker</artifactId>
+            <version>5.5.6</version>
+        </dependency>
+        <!-- pdf转图片 -->
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>fontbox</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+        <!--缩略图-->
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.11</version>
+        </dependency>
+
+
+        <!-- 阿里云短信服务 -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+            <version>2.0.22</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>tea</artifactId>
+                    <groupId>com.aliyun</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>tea-util</artifactId>
+                    <groupId>com.aliyun</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>org.jacoco.agent</artifactId>
+                    <groupId>org.jacoco</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.aliyun</groupId>-->
+<!--            <artifactId>tea-openapi</artifactId>-->
+<!--            <version>0.2.8</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.aliyun</groupId>-->
+<!--            <artifactId>tea-console</artifactId>-->
+<!--            <version>0.0.1</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-util</artifactId>
+            <version>0.2.14</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea</artifactId>
+            <version>1.1.14</version>
+        </dependency>
+
+        <!-- alibaba/easyexcel 使用高版本,低版本string接收数字丢小数位的bug -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.deepoove</groupId>
+            <artifactId>poi-tl</artifactId>
+            <version>1.10.6</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
+<!--        <dependency>-->
+<!--            <groupId>fr.opensagres.xdocreport</groupId>-->
+<!--            <artifactId>xdocreport</artifactId>-->
+<!--            <version>2.0.2</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>fr.opensagres.xdocreport</groupId>-->
+<!--            <artifactId>fr.opensagres.xdocreport.converter.docx.xwpf</artifactId>-->
+<!--            <version>2.0.2</version>-->
+<!--        </dependency>-->
+
+
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>ooxml-schemas</artifactId>-->
+<!--            <version>1.4</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.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.fastreport</groupId>-->
+<!--            <artifactId>fastreport</artifactId>-->
+<!--            <version>1.0.0</version>-->
+<!--        </dependency>-->
+
+    </dependencies>
+
+</project>
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@ -21,16 +21,6 @@
            <groupId>com.xdadan</groupId>
            <artifactId>emis-common</artifactId>
            <version>1.0.4</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jsqlparser</artifactId>
-                    <groupId>com.github.jsqlparser</groupId>
-                </exclusion>
-            </exclusions>
        </dependency>

        <dependency>
@ -93,35 +83,17 @@
            <groupId>com.aliyun</groupId>
            <artifactId>dysmsapi20170525</artifactId>
            <version>2.0.22</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>tea</artifactId>
-                    <groupId>com.aliyun</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>tea-util</artifactId>
-                    <groupId>com.aliyun</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                    <groupId>org.bouncycastle</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>org.jacoco.agent</artifactId>
-                    <groupId>org.jacoco</groupId>
-                </exclusion>
-            </exclusions>
        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.aliyun</groupId>-->
-<!--            <artifactId>tea-openapi</artifactId>-->
-<!--            <version>0.2.8</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.aliyun</groupId>-->
-<!--            <artifactId>tea-console</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-openapi</artifactId>
+            <version>0.2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-console</artifactId>
+            <version>0.0.1</version>
+        </dependency>
        <dependency>
            <groupId>com.aliyun</groupId>
            <artifactId>tea-util</artifactId>
@ -133,6 +105,16 @@
            <version>1.1.14</version>
        </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>-->
+
+
        <!-- alibaba/easyexcel 使用高版本,低版本string接收数字丢小数位的bug -->
        <dependency>
            <groupId>com.alibaba</groupId>
@ -144,35 +126,9 @@
            <groupId>com.deepoove</groupId>
            <artifactId>poi-tl</artifactId>
            <version>1.10.6</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
        </dependency>


-<!--        <dependency>-->
-<!--            <groupId>fr.opensagres.xdocreport</groupId>-->
-<!--            <artifactId>xdocreport</artifactId>-->
-<!--            <version>2.0.2</version>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>fr.opensagres.xdocreport</groupId>-->
-<!--            <artifactId>fr.opensagres.xdocreport.converter.docx.xwpf</artifactId>-->
-<!--            <version>2.0.2</version>-->
-<!--        </dependency>-->
-
-
-<!--        <dependency>-->
-<!--            <groupId>org.apache.poi</groupId>-->
-<!--            <artifactId>ooxml-schemas</artifactId>-->
-<!--            <version>1.4</version>-->
-<!--        </dependency>-->
-
-
        <dependency>
            <groupId>com.aspose</groupId>
            <artifactId>aspose-words</artifactId>
@ -182,21 +138,11 @@
        </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.fastreport</groupId>-->
-<!--            <artifactId>fastreport</artifactId>-->
-<!--            <version>1.0.0</version>-->
-<!--        </dependency>-->
+        <!--            <groupId>com.fastreport</groupId>-->
+        <!--            <artifactId>fastreport</artifactId>-->
+        <!--            <version>1.0.0</version>-->
+        <!--        </dependency>-->

    </dependencies>

--- 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;