From 692d5f062d6095cb353caf77bf1b5007da317cf8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 25 Mar 2023 10:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8E=92=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 2 + .../inout/OrderDetailController.java | 4 +- .../inout/StockOrderDetailController.java | 43 ++++++++++--------- .../inout/StockQRCodeTextController.java | 10 +++++ 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index b4d404f..13d36c6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -47,6 +47,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -298,6 +299,7 @@ public class UdiRelevanceController { //更新供应商关联表相关信息 CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceRequest.getId(), customerId + ""); companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceRequest.getPrice())); + companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index 416001d..188f266 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -487,7 +487,9 @@ public class OrderDetailController { } } Collections.sort(resultList, (o1, o2) -> { - Integer cp = o1.getCodeId() - o2.getCodeId(); + String o1Str = o1.getCoName() + o1.getPackSpec() + o1.getBatchNo() + o1.getSerialNo(); + String o2Str = o2.getCoName() + o2.getPackSpec() + o2.getBatchNo() + o1.getSerialNo(); + Integer cp = o1Str.compareTo(o2Str); return cp; }); return resultList; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index e95d449..3bfe28c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -97,26 +97,25 @@ public class StockOrderDetailController { List stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); - //计算实际数量 - if (CollUtil.isNotEmpty(stockOrderDetailEntityList)) { - List codeList = codesService.findByReceiptId(stockOrderEntity.getOrderIdFk()); - if (CollUtil.isNotEmpty(codeList)) { - stockOrderDetailEntityList.forEach(stockOrderDetailEntity -> { - codeList.forEach(codeEntity -> { - if (StrUtil.trimToEmpty(codeEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) && (StrUtil.trimToEmpty(codeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())))) { - int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(stockOrderDetailEntity.getRelId(), codeEntity.getNameCode()); - stockOrderDetailEntity.setReCount(String.valueOf(codeEntity.getCount() * actCount)); - } - }); - - }); - } - - } +// //计算实际数量 +// if (CollUtil.isNotEmpty(stockOrderDetailEntityList)) { +// List codeList = codesService.findByReceiptId(stockOrderEntity.getOrderIdFk()); +// if (CollUtil.isNotEmpty(codeList)) { +// stockOrderDetailEntityList.forEach(stockOrderDetailEntity -> { +// codeList.forEach(codeEntity -> { +// if (StrUtil.trimToEmpty(codeEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) && (StrUtil.trimToEmpty(codeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())))) { +// int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(stockOrderDetailEntity.getRelId(), codeEntity.getNameCode()); +// stockOrderDetailEntity.setReCount(String.valueOf(codeEntity.getCount() * actCount)); +// } +// }); +// +// }); +// } +// +// } BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); - if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) { stockOrderDetailEntityList = transferSerList(stockOrderDetailEntityList, stockOrderEntity.getOrderIdFk()); } @@ -146,10 +145,10 @@ public class StockOrderDetailController { item.setCodeId(codeDetaiEntity.getId().intValue()); item.setSerialNo(codeDetaiEntity.getSerialNo()); item.setCount(codeDetaiEntity.getCount() + ""); - //item.setReCount(codeDetaiEntity.getCount() + ""); + item.setReCount(codeDetaiEntity.getCount() + ""); //计算实际数量 - int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(codeDetaiEntity.getRelId(), codeDetaiEntity.getNameCode()); - item.setReCount(String.valueOf(codeDetaiEntity.getCount() * actCount)); +// int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(codeDetaiEntity.getRelId(), codeDetaiEntity.getNameCode()); +// item.setReCount(String.valueOf(codeDetaiEntity.getCount() * actCount)); resultList.add(item); } @@ -159,7 +158,9 @@ public class StockOrderDetailController { } } Collections.sort(resultList, (o1, o2) -> { - Integer cp = o1.getCodeId() - o2.getCodeId(); + String o1Str = o1.getProductName() + o1.getSpec() + o1.getBatchNo() + o1.getSerialNo(); + String o2Str = o2.getProductName() + o2.getSpec() + o2.getBatchNo() + o1.getSerialNo(); + Integer cp = o1Str.compareTo(o2Str); return cp; }); 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 1adc9bb..3d0f5ca 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 @@ -441,6 +441,14 @@ public class StockQRCodeTextController { stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId()); List stockOrderDetailEntities = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); List list = stockOrderService.listCodePrint(stockOrderEntity.getOrderIdFk()); + Collections.sort(list, (o1, o2) -> { + String o1Str = o1.getProductName() + o1.getSpec() + o1.getBatchNo() + o1.getSerialNo(); + String o2Str = o2.getProductName() + o2.getSpec() + o2.getBatchNo() + o1.getSerialNo(); + Integer cp = o1Str.compareTo(o2Str); + return cp; + }); + + if (list != null && list.size() > 0) { SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(stockQRCodeTextPDFTemplateRequest.getModuleId() + ""); SystemPDFTemplateEntity systemPDFTemplateEntity = @@ -483,6 +491,8 @@ public class StockQRCodeTextController { } } + + Map data = new HashMap(); data.put("data", list); JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");