From fe4b0082e3d0a836f6aec7a32999aee643c2e4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 22 May 2023 17:49:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8A=A5=E8=A1=A8=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 85 ++++++++++++++++++- .../req/basic/FilterOrderPrintRequest.java | 1 + src/main/resources/schemas/schema_v2.1.sql | 1 + 3 files changed, 83 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index 3f7c559ac..88aab0b5c 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -10,20 +10,25 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inv.InnerOrderEntity; +import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.entity.purchase.SupProductEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; -import com.glxp.api.entity.system.SystemPDFModuleEntity; -import com.glxp.api.entity.system.SystemPDFTemplateEntity; -import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; +import com.glxp.api.entity.system.*; import com.glxp.api.req.basic.FilterOrderPrintRequest; +import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.InspectionPDFTemplateRequest; +import com.glxp.api.req.inv.FilterinnerOrderprintRequest; +import com.glxp.api.req.inv.InnerOrderQRCodeTextPDFTemplateRequest; +import com.glxp.api.req.inv.PdfPrintCountEntity; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; import com.glxp.api.req.system.FilterPdfTemplateRequest; +import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.res.inv.InnerOrderPrintResponse; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.UdiProductService; @@ -36,6 +41,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -221,4 +227,75 @@ public class BasicOrderPrintController { return name; } + + //-----------打印码 + @AuthRuleAnnotation("") + @PostMapping("/udiwms/pdf/template/inspection/order/code/file") + public BaseResponse inspectionStockQRCodeTextPDFFromTemplateStatementFile( + @RequestBody FilterOrderPrintRequest filterOrderPrintRequest) throws Exception { + + //查询模板文件是否存在 + SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(filterOrderPrintRequest.getLabelId()+""); + if (null == sysPdfTemplateRelevanceStatemenEntity) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); + } + + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceStatemenEntity.getTemplateId())); + if (null == systemPDFTemplateEntity) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); + } + return ResultVOUtils.success(sysPdfTemplateRelevanceStatemenEntity.getTemplateId()); + } + + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/pdf/template/text/inspection/order/code/file") + public BaseResponse stockQRCodeTextPDFFromTemplateStatementFile( + @RequestBody FilterOrderPrintRequest filterOrderPrintRequest, + HttpServletRequest request, HttpServletResponse response) throws Exception { + + + List list = new ArrayList<>(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 + SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(filterOrderPrintRequest.getLabelId() + ""); + if (sysPdfTemplateRelevanceStatemenEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceStatemenEntity.getTemplateId())); + if (null == systemPDFTemplateEntity) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); + } + + + //查询单据表 + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk()); + IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0); + //查询业务单详情 + List ioCodeEntityList = ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); + int i = 1; + if (ioCodeEntityList != null && ioCodeEntityList.size() > 0) { + for (IoCodeEntity obj : ioCodeEntityList) { + //查询产品表 + UdiProductEntity udiProductEntity = udiProductService.findByNameCode(obj.getNameCode()); + //组装数据 + Map bizData = new HashMap<>(); + bizData.put("index", i); + bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode()); + bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc()); + bizData.put("ggxh", udiProductEntity.getGgxh() == null ? ' ' : udiProductEntity.getGgxh()); + bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo()); + bizData.put("productDate", obj.getProduceDate()); + bizData.put("expireDate", obj.getExpireDate()); + bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); + list.add(bizData); + i++; + } + String param = JSON.toJSONString(list); + JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); + return ResultVOUtils.success(); + } + return ResultVOUtils.success(); + } + + + } diff --git a/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java b/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java index bfa3de4db..ee95b9c89 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java @@ -15,5 +15,6 @@ public class FilterOrderPrintRequest { private String templateId; private String orderIdFk; private Integer status; + private Integer labelId; } diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 21ccb9c45..ba0996973 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -63,6 +63,7 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'certIdFk', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'zdcfsycs', 'int', 1); CALL Pro_Temp_ColumnWork('basic_products', 'allowNoSerial', 'tinyint', 1);