This commit is contained in:
linfso 2024-07-28 16:57:03 +08:00
parent e998ad2a33
commit 140e9dc3c8
4 changed files with 36 additions and 19 deletions

View File

@ -270,5 +270,14 @@
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" /> <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: 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="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> </component>
</module> </module>

View File

@ -229,5 +229,14 @@
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" /> <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: 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="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> </component>
</module> </module>

View File

@ -106,14 +106,13 @@
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.mascloud</groupId> <!-- <groupId>com.mascloud</groupId>-->
<artifactId>massdk</artifactId> <!-- <artifactId>massdk</artifactId>-->
<version>1.0.3</version> <!-- <version>1.0.3</version>-->
<scope>system</scope> <!-- <scope>system</scope>-->
<systemPath>${project.basedir}/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar</systemPath> <!-- <systemPath>${project.basedir}/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar</systemPath>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
@ -152,13 +151,13 @@
<version>1.10.6</version> <version>1.10.6</version>
</dependency> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>com.aspose</groupId>--> <groupId>com.aspose</groupId>
<!-- <artifactId>aspose-words</artifactId>--> <artifactId>aspose-words</artifactId>
<!-- <version>15.8.0</version>--> <version>15.8.0</version>
<!-- <scope>system</scope>--> <scope>system</scope>
<!-- <systemPath>${project.basedir}/lib/aspose-words-15.8.0-jdk16.jar</systemPath>--> <systemPath>${project.basedir}/lib/aspose-words-15.8.0-jdk16.jar</systemPath>
<!-- </dependency>--> </dependency>
<!-- <dependency>--> <!-- <dependency>-->

View File

@ -2336,11 +2336,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
// 写入流 // 写入流
// template.write(bos); template.write(bos);
template.write(outputStream); // template.write(outputStream);
// ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
// DocUtils.wordToPdf(bis, outputStream); DocUtils.wordToPdf(bis, outputStream);
response.flushBuffer(); response.flushBuffer();