From 57763020f9e9b86af21029718bb8e5ca302d4d7a Mon Sep 17 00:00:00 2001 From: chenqf <584883665@139.com> Date: Sun, 21 Nov 2021 22:40:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=93=E5=8D=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E5=86=85=E9=83=A8=E7=A0=81=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/.gitignore | 1 + .../inout/StockQRCodeTextController.java | 63 ++-- .../sale/admin/dao/inout/StockOrderDao.java | 16 +- .../entity/inout/StockOrderPrintEntity.java | 23 ++ .../service/inout/StockOrderService.java | 8 +- .../inout/impl/StockOrderServiceImpl.java | 25 +- .../main/resources/application-pro.properties | 2 +- .../main/resources/jaspers/isn_print_1.jasper | Bin 0 -> 31896 bytes .../main/resources/jaspers/isn_print_1.jrxml | 179 +++++++++++ .../resources/jaspers/order_print_1.jasper | Bin 0 -> 35316 bytes .../resources/jaspers/order_print_1.jrxml | 298 ++++++++++++++++++ .../mybatis/mapper/inout/StockOrderDao.xml | 30 ++ api-common/.gitignore | 1 + 13 files changed, 604 insertions(+), 42 deletions(-) create mode 100644 api-admin/.gitignore create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java create mode 100644 api-admin/src/main/resources/jaspers/isn_print_1.jasper create mode 100644 api-admin/src/main/resources/jaspers/isn_print_1.jrxml create mode 100644 api-admin/src/main/resources/jaspers/order_print_1.jasper create mode 100644 api-admin/src/main/resources/jaspers/order_print_1.jrxml create mode 100644 api-common/.gitignore diff --git a/api-admin/.gitignore b/api-admin/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/api-admin/.gitignore @@ -0,0 +1 @@ +/target/ 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 c2b7218..a7908ad 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 @@ -1,12 +1,29 @@ package com.glxp.sale.admin.controller.inout; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + import com.github.pagehelper.PageInfo; -import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; -import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; +import com.glxp.sale.admin.entity.inout.StockOrderEntity; +import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity; +import com.glxp.sale.admin.entity.inout.StockQRCodeTextEntity; import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.sale.admin.req.inout.DeleteRequest; -import com.glxp.sale.admin.req.inout.StockOrderDetailFilterRequest; import com.glxp.sale.admin.req.inout.StockQRCodeTextFilterRequest; import com.glxp.sale.admin.req.itextpdf.InspectionPDFTemplateRequest; import com.glxp.sale.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; @@ -14,25 +31,19 @@ import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; -import com.glxp.sale.admin.service.inout.*; +import com.glxp.sale.admin.service.inout.StockOrderDetailService; +import com.glxp.sale.admin.service.inout.StockOrderDetailTempService; +import com.glxp.sale.admin.service.inout.StockOrderService; +import com.glxp.sale.admin.service.inout.StockQRCodeTextService; import com.glxp.sale.admin.service.param.SystemPDFModuleService; import com.glxp.sale.admin.service.param.SystemPDFTemplateService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.IoTransInoutService; import com.glxp.sale.admin.util.ITextPDFUtils; +import com.glxp.sale.admin.util.JasperUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; @RestController public class StockQRCodeTextController { @@ -113,6 +124,8 @@ public class StockQRCodeTextController { @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { + + StockQRCodeTextEntity stockQRCodeTextEntity = stockQRCodeTextService.findOne(stockQRCodeTextPDFTemplateRequest.getId()); if (stockQRCodeTextEntity == null) { return; @@ -161,6 +174,8 @@ public class StockQRCodeTextController { @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { + + /* StockOrderEntity stockOrderEntity = stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId()); if (stockOrderEntity == null) { @@ -189,11 +204,21 @@ public class StockQRCodeTextController { ITextPDFUtils.exportStockOrderPDFFromTemplateFile( stockQRCodeTextPDFTemplateRequest, stockOrderEntity, stockOrderDetailEntityList, request, response); - - StockOrderEntity updateStockOrderEntity = new StockOrderEntity(); - updateStockOrderEntity.setId(stockOrderEntity.getId()); - updateStockOrderEntity.setPrintStatus("102"); - stockOrderService.updateById(updateStockOrderEntity); + */ + /*打印订单*/ + List list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId()); + if(list!=null&&list.size()>0) { + StockOrderEntity updateStockOrderEntity = new StockOrderEntity(); + updateStockOrderEntity.setId(stockQRCodeTextPDFTemplateRequest.getId()); + updateStockOrderEntity.setPrintStatus("102"); + stockOrderService.updateById(updateStockOrderEntity); + + + Map data = new HashMap(); + data.put("data", list); + JasperUtils.jasperReport(request, response, data, "aspers/order_print_1.jasper", "pdf"); + + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/StockOrderDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/StockOrderDao.java index 89889aa..f07ef0f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/StockOrderDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/StockOrderDao.java @@ -1,16 +1,14 @@ package com.glxp.sale.admin.dao.inout; -import com.glxp.sale.admin.entity.inout.OrderEntity; -import com.glxp.sale.admin.entity.inout.StockOrderEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; -import com.glxp.sale.admin.req.inout.OrderFilterRequest; -import com.glxp.sale.admin.req.inout.OrderQueryRequest; -import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; -import com.glxp.sale.admin.req.inout.StockOrderQueryRequest; +import java.util.List; + import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; +import com.glxp.sale.admin.entity.inout.StockOrderEntity; +import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity; +import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; +import com.glxp.sale.admin.req.inout.StockOrderQueryRequest; @Mapper public interface StockOrderDao { @@ -32,4 +30,6 @@ public interface StockOrderDao { List filterListOr(StockOrderFilterRequest stockOrderFilterRequest); StockOrderEntity findOne(StockOrderFilterRequest stockOrderFilterRequest); + + List listOrderPrint(StockOrderFilterRequest stockOrderFilterRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java new file mode 100644 index 0000000..4c3305f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.entity.inout; + +import lombok.Data; + +@Data +public class StockOrderPrintEntity extends StockOrderDetailEntity { + + private String id; + private String billNo; + private String billdate; + private String corpId; + private String corpName; + private String billType; + private String billFlag; + private String thirdSysFk; + private String status; + private String statusInfo; + private String type; + private String sourceType; + private String printStatus; + private String unitIdFk; + private String customerId; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderService.java index 49c779f..648d6ba 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderService.java @@ -1,12 +1,12 @@ package com.glxp.sale.admin.service.inout; +import java.util.List; + import com.glxp.sale.admin.entity.inout.StockOrderEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity; import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; import com.glxp.sale.admin.req.inout.StockOrderQueryRequest; -import java.util.List; - public interface StockOrderService { List listStockOrders(StockOrderQueryRequest stockOrderQueryRequest); @@ -30,4 +30,6 @@ public interface StockOrderService { StockOrderEntity findOne(StockOrderFilterRequest stockOrderFilterRequest); StockOrderEntity findById(String orderId); + + List listOrderPrint(String orderId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java index 222248f..5c1bc73 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java @@ -1,22 +1,19 @@ package com.glxp.sale.admin.service.inout.impl; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + import com.github.pagehelper.PageHelper; -import com.glxp.sale.admin.dao.inout.OrderDao; import com.glxp.sale.admin.dao.inout.StockOrderDao; -import com.glxp.sale.admin.dao.inout.WarehouseDao; -import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.inout.StockOrderEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; -import com.glxp.sale.admin.req.inout.OrderFilterRequest; +import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity; import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; import com.glxp.sale.admin.req.inout.StockOrderQueryRequest; -import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.inout.StockOrderService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; @Service public class StockOrderServiceImpl implements StockOrderService { @@ -97,5 +94,11 @@ public class StockOrderServiceImpl implements StockOrderService { return stockOrderDao.findOne(stockOrderFilterRequest); } + @Override + public List listOrderPrint(String orderId) { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setId(orderId); + return stockOrderDao.listOrderPrint(stockOrderFilterRequest); + } } diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index f2777f9..3c85513 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -2,7 +2,7 @@ server.port=9996 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://139.159.187.130:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=root #spring.datasource.password=123456 diff --git a/api-admin/src/main/resources/jaspers/isn_print_1.jasper b/api-admin/src/main/resources/jaspers/isn_print_1.jasper new file mode 100644 index 0000000000000000000000000000000000000000..e94ceed9b8fa1cd14924aaa80c458fed894a2109 GIT binary patch literal 31896 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 literal 0 HcmV?d00001 diff --git a/api-admin/src/main/resources/jaspers/isn_print_1.jrxml b/api-admin/src/main/resources/jaspers/isn_print_1.jrxml new file mode 100644 index 0000000..01a6f12 --- /dev/null +++ b/api-admin/src/main/resources/jaspers/isn_print_1.jrxml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/api-admin/src/main/resources/jaspers/order_print_1.jasper b/api-admin/src/main/resources/jaspers/order_print_1.jasper new file mode 100644 index 0000000000000000000000000000000000000000..fd5ae4ac1ffa8f744c692e7831e37727c17b2d55 GIT binary patch literal 35316 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

^PWAyZ zHJCO|_Gi@3)Y6(w<76MAK#Hx&m~pbd>VTQ87$^ILv-Iw!PWE?HN%2-kAe`(oj3x1B z24ls^K8H=NA}p*FC;L)w2!nazWdFli{HRkl``X?dh}&P_6V=+j?mr$>uZAOY{ik^p(S> z^Rr=%@N>{UV2{D#D}Jtv&*pQ`?oidjwGMq_qD9Wx9HxzM$1W9_N#{Wfn54w31G0m!Y&e5SViIrn@C(?5s548A#sH@B(AW9#1)p1xWWz+S6D&f3L8jVVF8IN z>>qK3^&_sZeZ&=(kGR6_5m#6};tHEbTw(EuE9@O{g|#EDuyw>0mX5f>&JkBwIpPW% zM_ggyh%4+HafNjwuCQ&y6_$;-!mbflST*7bn?_t=(TFST8F7U*Bd)Mz#1)o|xWbMR zS6DIP3L8dTVZn$i>=$u`^&+mYU2t`x#bDPWJRhsiU!%R?oWS#o_p`ah{AaA3f=UXi zDVR?|4F$Cn)Kkz%frkPw1q&&-kb=b&Tui~G6fC8nm4bE(IwshL4~XpF}G@gWR5HW$ZVs zoc*3vus2vGdkeWAVb$ydHV>OR^V#2-n|*=Oe9ac{3|7mXtd8fQUYz|HJcTSESBLPp zA6h(VKl^F%2zpp*3=f31^^Ab+Ei9+0o- zq!;AxbaElc|I*0|LB6Jwi$T7jlNW>hZ=JjpI(A3E6w@(Z0@skib<$Tef_ zXk9<jdlS2g?_^i=z32fBn$<{Y;>(pZ z4M9o&sY?14DTGOd$8~a5@uVWob^2-1Wpb9MSgqVsfm z9nnK{`evdFbb2GvMLK;8(ZhB6Hlj!B^k$+*>+}|)PuA(JM32?!ZF)o1(AQVl4QQwv z(NH%*ovedOSkLO&%}_KO&@>yd+x9(Bx3D|et?1~t;qUisVlSfE4zt_YhinTJ!X0R& ztpFbLMx_XLN#NP#l=Z1HYyJ(=nxMa_({~Ylx=!Cs^aP#WN%WaIeGk!-bb1fbXX&&- z?~cbf#n|0g6Zs*u>rQCMUC?s(;BSiU#`fVJNZY-P^HM$qI}THkG85FdXhd@?Lg8VN z@SAwu$@k%UJ!0wKaQx`+FkFt`mH6F&-zNNa;P+$v4&VnzFZK$4Z{tT>;n>&Wx%iF7 zZvuWZ@T``Gml@mY`aZ`bW+4}sdEQF}mLt5I7)U9C~;K;5WOt3a*Os4%E2G^!QUDvk1j zTB}jjpl;Ksb3kp=sA5nXHEIl~)f$x#>SjevhCd`Ei-yyKkWq#K!+}AplkG=i{2Yqn zVKm4i>}vJ|8s$mI@Y86RXCRx;p>du^n%Ka z7Y%j<;rnQ`57;M=>#x{HoUy;5@%|3!{u~YX1s?+=cLF9|#h5$I;2AKcvv~#PN7a}I zUBL6WmlyCB%ywEaqv_@&d6=Kfzk`{}Dn5?iz~Sr1&;S1;ZgWlIrYI$Dic;dHC?#%+ zQsSm4C2opR;-)AiZi-UkrYI$Dic;dHC?#%+QsO44L~(yTw&9JtAZ~jgZWaH3#O?o(cH_`)Fl9P9v>S(ZS(Z + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="98" splitType="Stretch"> + <textField isBlankWhenNull="true"> + <reportElement x="40" y="8" width="504" height="30" uuid="792264b3-8a9c-42fe-ba28-ffc580771931"/> + <textElement textAlignment="Center" verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$F{title}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="0" y="47" width="50" height="24" uuid="5ba70caa-24aa-45b4-996c-46c1e4500475"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font fontName="华文宋体"/> + </textElement> + <text><![CDATA[单号:]]></text> + </staticText> + <textField isBlankWhenNull="true"> + <reportElement x="56" y="47" width="124" height="24" uuid="92a15708-763f-496c-ab77-55130f8f4e1c"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$F{billNo}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="401" y="70" width="50" height="24" uuid="198d781d-8f0d-4b91-9eb9-eb845e506d3b"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font fontName="华文宋体"/> + </textElement> + <text><![CDATA[开单日期:]]></text> + </staticText> + <textField isBlankWhenNull="true"> + <reportElement x="459" y="70" width="100" height="24" uuid="006f1842-d859-4f94-84be-6601ad8f972a"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$F{billDate}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="-8" y="72" width="58" height="24" uuid="3b263493-0ad2-4c4f-b101-18781d92378f"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font fontName="华文宋体"/> + </textElement> + <text><![CDATA[送货单位:]]></text> + </staticText> + <textField isBlankWhenNull="true"> + <reportElement x="56" y="72" width="337" height="24" uuid="c7ff1896-1c78-44fd-a795-7005efd9e190"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$F{corpName}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 139a44d..e59e150 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -161,5 +161,35 @@ limit 1 + \ No newline at end of file diff --git a/api-common/.gitignore b/api-common/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/api-common/.gitignore @@ -0,0 +1 @@ +/target/