From 2d734b96502b6efbaa10bc49a91c806c2795609c Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 26 Jul 2022 15:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8D=95=E6=8D=AE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockOrderDetailController.java | 7 ++- .../business/StockQRCodeTextController.java | 45 +++++++++++++------ .../inout/OrderDetailController.java | 10 +++-- .../business/StockOrderDetailEntity.java | 2 + .../business/StockOrderPrintEntity.java | 5 +++ .../admin/entity/inout/ErpOrderEntity.java | 2 +- 6 files changed, 51 insertions(+), 20 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index 2e81071e..21851137 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -127,8 +127,10 @@ public class StockOrderDetailController { StockOrderDetailEntity item = new StockOrderDetailEntity(); BeanUtils.copyProperties(stockOrderDetailEntity, item); item.setCode(codeDetaiEntity.getCode()); + item.setCodeId(codeDetaiEntity.getId().intValue()); item.setSerialNo(codeDetaiEntity.getSerialNo()); item.setCount(codeDetaiEntity.getCount()); + item.setReCount(codeDetaiEntity.getCount()); resultList.add(item); } @@ -138,9 +140,10 @@ public class StockOrderDetailController { } } Collections.sort(resultList, (o1, o2) -> { - Long cp = Long.parseLong(o1.getProductId()) - Long.parseLong(o2.getProductId()); - return cp.intValue(); + Integer cp = o1.getCodeId() - o2.getCodeId(); + return cp; }); + return resultList; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java index 274728c4..edfccd23 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.business.StockOrderPrintEntity; @@ -26,6 +27,7 @@ import com.glxp.api.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.SystemPDFTemplateRelevanceResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.service.basic.BussinessLocalTypeService; import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.UdiInfoService; @@ -57,13 +59,11 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @RestController public class StockQRCodeTextController { + @Resource StockOrderService stockOrderService; @Resource @@ -89,6 +89,8 @@ public class StockQRCodeTextController { private JaspaperService jaspaperService; @Resource private BussinessLocalTypeService bussinessLocalTypeService; + @Resource + private BussinessTypeService bussinessTypeService; @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/qrcode/text/filter") @@ -173,7 +175,6 @@ public class StockQRCodeTextController { } } - if (printEntities.size() > 1000) { //如果标签打印数据大于1000，则切割生成多个文件 if (!FileUtils.isFileExist(dirPath + "/pdfprint")) { new File(dirPath + "/pdfprint").mkdirs(); @@ -367,17 +368,17 @@ public class StockQRCodeTextController { public void stockOrderPDFFromTemplateFile( @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { + + StockOrderEntity stockOrderEntity = stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId()); SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest(); systemPDFTemplateRelevanceRequest.setModuleId(stockQRCodeTextPDFTemplateRequest.getModuleId()); systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType()); - BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); List systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return; SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0); - if (bussinessLocalTypeEntity.getOrderVisibleType() == 0) { /*打印订单*/ List list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId()); @@ -445,9 +446,9 @@ public class StockQRCodeTextController { if (stockOrderDetailEntity != null) { stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice()); } - - index++; + + stockOrderPrintEntity.setCount(stockOrderPrintEntity.getCount() * getActCount(stockOrderPrintEntity)); } Map data = new HashMap(); @@ -461,12 +462,29 @@ public class StockQRCodeTextController { } } + @Resource + UdiRelevanceService udiRelevanceService; + + public int getActCount(StockOrderPrintEntity stockOrderPrintEntity) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(stockOrderPrintEntity.getRelId()); + UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(stockOrderPrintEntity.getNameCode()); + if (udiInfoBean != null) { + if ((udiRelevanceEntity.getIsUseDy() != null && udiRelevanceEntity.getIsUseDy()) && udiInfoBean.getDiType() != 2) { + if (udiInfoBean.getBhzxxsbzsl() == 0) + return udiInfoBean.getZxxsbzbhsydysl(); + else + return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); + } else { + return udiInfoBean.getBhzxxsbzsl(); + } + } + return 1; + } - public StockOrderDetailEntity getDetailByRelBatch - (List stockOrderDetailEntities, String relId, String batchNo) { + public StockOrderDetailEntity getDetailByRelBatch(List stockOrderDetailEntities, String relId, String batchNo) { for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) { - if (StrUtil.trim(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trim(batchNo)) - && StrUtil.trim(stockOrderDetailEntity.getRelId()).equals(StrUtil.trim(relId)) + if (StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trimToEmpty(batchNo)) + && StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()).equals(StrUtil.trimToEmpty(relId)) ) { return stockOrderDetailEntity; } @@ -474,6 +492,7 @@ public class StockQRCodeTextController { return null; } + @AuthRuleAnnotation("") @GetMapping(value = "/udiwms/stock/qrcode/text/upload") public BaseResponse upload(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest, diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index 17009c49..c0b1a48d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -493,14 +493,16 @@ public class OrderDetailController { for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { if (CollUtil.isNotEmpty(codeList)) { for (WarehouseEntity codeDetaiEntity : codeList) { - if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(erpOrderEntity.getRelIdFk())) + if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(erpOrderEntity.getBindRlFk())) && StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(erpOrderEntity.getBatchNo())) ) { ErpOrderEntity item = new ErpOrderEntity(); BeanUtils.copyProperties(erpOrderEntity, item); item.setCode(codeDetaiEntity.getCode()); - item.setSerialNo(codeDetaiEntity.getSerialNo()); item.setCount(codeDetaiEntity.getCount()); + item.setReCount(codeDetaiEntity.getCount()); + item.setErpCount(codeDetaiEntity.getCount()); + item.setCodeId(codeDetaiEntity.getId().intValue()); resultList.add(item); } } @@ -508,8 +510,8 @@ public class OrderDetailController { } } Collections.sort(resultList, (o1, o2) -> { - Long cp = Long.parseLong(o1.getBindRlFk()) - Long.parseLong(o2.getBindRlFk()); - return cp.intValue(); + Integer cp = o1.getCodeId() - o2.getCodeId(); + return cp; }); return resultList; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java index 8b816a55..ec8f2af3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java @@ -40,4 +40,6 @@ public class StockOrderDetailEntity { private String code; private String serialNo; + private Integer codeId; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java index 7f17d023..647c2719 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java @@ -47,4 +47,9 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String remark3; private String manufactory; private String spmc; + private String cpms; + private String measname; //计量单位 + private String udiCode; //条码 + private String serialNo; //序列号 + private String nameCode; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java index 6bfcf1b2..e22d6eaf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java @@ -74,5 +74,5 @@ public class ErpOrderEntity { private String serialNo; private String code; - + private Integer codeId; }