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 @@ provided + + + + + org.olap4j + olap4j + 1.2.0 + javax.xml.bind @@ -203,62 +211,88 @@ org.apache.poi poi - RELEASE + 4.0.0 org.apache.poi poi-ooxml - RELEASE + 4.0.0 - + - - - - - net.sf.barcode4j - barcode4j - 2.1 - - - net.sf.jasperreports - jasperreports - 6.5.1 - - - net.sf.jasperreports - jasperreports-fonts - 6.0.0 - - - - com.itextpdf - itext-pdfa - 5.5.0 - - - - cn.lesper - iTextAsian - 3.0 - - - - - - org.apache.xmlgraphics - batik-bridge - 1.11 - - - - org.apache.xmlgraphics - batik-dom - 1.11 - - - - + + + + + net.sf.barcode4j + barcode4j + 2.1 + + + org.olap4je + olap4j + + + + + + net.sf.jasperreports + jasperreports + 6.5.1 + + + com.lowagie + itext + + + + + + net.sf.jasperreports + jasperreports-fonts + 6.0.0 + + + + + com.itextpdf + itext-pdfa + 5.5.0 + + + + cn.lesper + iTextAsian + 3.0 + + + + + + org.apache.xmlgraphics + batik-bridge + 1.11 + + + + org.apache.xmlgraphics + batik-dom + 1.11 + + + + org.eclipse.birt.runtime.3_7_1 + com.lowagie.text + 2.1.7 + + + + org.olap4j + olap4j + 1.2.0 + + + @@ -307,7 +341,7 @@ true - + Generate MyBatis Artifacts generate 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 data = new HashMap(); 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 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}) UPDATE stock_order @@ -161,22 +159,15 @@ limit 1 - + \ No newline at end of file