From fa36f5cd68b301ba92e853a78c77481d968a47d8 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 23 Nov 2021 10:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E5=8D=B0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=EF=BC=8Colap4j=EF=BC=8Ccom.lowagie.text=EF=BC=8C?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=97=AE=E9=A2=98=EF=BC=8C=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=89=93=E5=8D=B0=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api-admin/pom.xml                             | 136 +++++++++++-------
 .../inout/StockQRCodeTextController.java      |   2 +-
 .../mybatis/mapper/inout/StockOrderDao.xml    |  31 ++--
 3 files changed, 97 insertions(+), 72 deletions(-)

diff --git a/api-admin/pom.xml b/api-admin/pom.xml
index 954a1e5..68397dd 100644
--- a/api-admin/pom.xml
+++ b/api-admin/pom.xml
@@ -182,6 +182,14 @@
             <scope>provided</scope>
         </dependency>
         <!--部署成war包时开启↑↑↑↑-->
+        <!-- https://mvnrepository.com/artifact/org.olap4j/olap4j -->
+        <!-- https://mvnrepository.com/artifact/org.olap4j/olap4j -->
+        <!-- https://mvnrepository.com/artifact/org.olap4j/olap4j -->
+        <dependency>
+            <groupId>org.olap4j</groupId>
+            <artifactId>olap4j</artifactId>
+            <version>1.2.0</version>
+        </dependency>
 
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -203,62 +211,88 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>RELEASE</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>RELEASE</version>
+            <version>4.0.0</version>
         </dependency>
-        
+
         <!-- jasperreports-dependency-begin -->
-		<!-- jasperreports-->
-		<!-- https://mvnrepository.com/artifact/net.sf.barcode4j/barcode4j -->
-		<!-- jasperreports相关 -->
-		<dependency>
-		    <groupId>net.sf.barcode4j</groupId>
-		    <artifactId>barcode4j</artifactId>
-		    <version>2.1</version>
-		</dependency>
-		<dependency>
-		  <groupId>net.sf.jasperreports</groupId>
-		  <artifactId>jasperreports</artifactId>
-		  <version>6.5.1</version>
-		</dependency>
-		<dependency>
-		  <groupId>net.sf.jasperreports</groupId>
-		  <artifactId>jasperreports-fonts</artifactId>
-		  <version>6.0.0</version>
-		</dependency>
-		
-		<dependency>
-		  <groupId>com.itextpdf</groupId>
-		  <artifactId>itext-pdfa</artifactId>
-		  <version>5.5.0</version>
-		</dependency>
-		
-		<dependency>
-		  <groupId>cn.lesper</groupId>
-		  <artifactId>iTextAsian</artifactId>
-		  <version>3.0</version>
-		</dependency>
-		
-
-		<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-bridge -->
-		<dependency>
-		    <groupId>org.apache.xmlgraphics</groupId>
-		    <artifactId>batik-bridge</artifactId>
-		    <version>1.11</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-dom -->
-		<dependency>
-		    <groupId>org.apache.xmlgraphics</groupId>
-		    <artifactId>batik-dom</artifactId>
-		    <version>1.11</version>
-		</dependency>
-		
-		<!-- jasperreports end-->
-		<!-- jasperreports-dependency-end -->
+        <!-- jasperreports-->
+        <!-- https://mvnrepository.com/artifact/net.sf.barcode4j/barcode4j -->
+        <!-- jasperreports相关 -->
+        <dependency>
+            <groupId>net.sf.barcode4j</groupId>
+            <artifactId>barcode4j</artifactId>
+            <version>2.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.olap4je</groupId>
+                    <artifactId>olap4j</artifactId>
+                </exclusion>
+            </exclusions>
+
+        </dependency>
+        <dependency>
+            <groupId>net.sf.jasperreports</groupId>
+            <artifactId>jasperreports</artifactId>
+            <version>6.5.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.lowagie</groupId>
+                    <artifactId>itext</artifactId>
+                </exclusion>
+            </exclusions>
+
+        </dependency>
+        <dependency>
+            <groupId>net.sf.jasperreports</groupId>
+            <artifactId>jasperreports-fonts</artifactId>
+            <version>6.0.0</version>
+
+        </dependency>
+
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itext-pdfa</artifactId>
+            <version>5.5.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.lesper</groupId>
+            <artifactId>iTextAsian</artifactId>
+            <version>3.0</version>
+        </dependency>
+
+
+        <!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-bridge -->
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-bridge</artifactId>
+            <version>1.11</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-dom -->
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-dom</artifactId>
+            <version>1.11</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.birt.runtime.3_7_1</groupId>
+            <artifactId>com.lowagie.text</artifactId>
+            <version>2.1.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.olap4j</groupId>
+            <artifactId>olap4j</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+        <!-- jasperreports end-->
+        <!-- jasperreports-dependency-end -->
     </dependencies>
 
     <build>
@@ -307,7 +341,7 @@
                     <verbose>true</verbose>
                 </configuration>
                 <executions>
-                     <execution>
+                    <execution>
                         <id>Generate MyBatis Artifacts</id>
                         <goals>
                             <goal>generate</goal>
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
index a7908ad..8ca5543 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
@@ -216,7 +216,7 @@ public class StockQRCodeTextController {
     		
     		Map<String,Object> data = new HashMap<String,Object>();
     		data.put("data", list);
-    		JasperUtils.jasperReport(request, response, data, "aspers/order_print_1.jasper", "pdf");
+    		JasperUtils.jasperReport(request, response, data, "jaspers/order_print_1.jasper", "pdf");
            
     	}
     }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
index e59e150..116b7b0 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -23,9 +23,8 @@
     <insert id="insertStockOrder" useGeneratedKeys="true" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag,
-                                thirdSysFk, status, statusInfo, type, sourceType, printStatus,unitIdFk,customerId)
-        values (
-                #{id},
+                                thirdSysFk, status, statusInfo, type, sourceType, printStatus, unitIdFk, customerId)
+        values (#{id},
                 #{billNo},
                 #{billdate},
                 #{corpId},
@@ -37,8 +36,7 @@
                 #{statusInfo},
                 #{type},
                 #{sourceType},
-                #{printStatus},#{unitIdFk},#{customerId}
-                )
+                #{printStatus}, #{unitIdFk}, #{customerId})
     </insert>
     <update id="updateById" parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         UPDATE stock_order
@@ -161,22 +159,15 @@
         limit 1
     </select>
 
-	<select id="listOrderPrint" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
+    <select id="listOrderPrint" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderPrintEntity">
-        SELECT stock_order.*,
-            stock_order_detail.productId,
-            stock_order_detail.productName,
-            stock_order_detail.spec,
-            stock_order_detail.batchNo,
-            stock_order_detail.productDate,
-            stock_order_detail.expireDate,
-            stock_order_detail.count,
-            stock_order_detail.sweepCount,
-            stock_order_detail.ylqxzcrbarmc,
-            stock_order_detail.zczbhhzbapzbh 
-            FROM stock_order,stock_order_detail
+        SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName, stock_order_detail.spec,
+        stock_order_detail.batchNo, stock_order_detail.productDate, stock_order_detail.expireDate,
+        stock_order_detail.count, stock_order_detail.sweepCount, stock_order_detail.ylqxzcrbarmc,
+        stock_order_detail.zczbhhzbapzbh FROM stock_order INNER JOIN stock_order_detail on stock_order.id =
+        stock_order_detail.orderIdFk
         <where>
-            stock_order.id=stock_order_detai.orderIdFk
+
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}
             </if>
@@ -191,5 +182,5 @@
             </if>
 
         </where>
-     </select>
+    </select>
 </mapper>
\ No newline at end of file