From 085cc87ffa5b8b526ada5c6abf7e49b08cd4e854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 14 Jun 2026 21:28:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor(controller):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=A1=AE=E8=AE=A4=E5=8A=9F=E8=83=BD=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除重复的 wmsQrCodeMasterService 注入，统一使用 qrCodeMasterService - 为收货确认接口添加事务注解确保数据一致性 - 修复数字比较逻辑，使用 compareTo 方法替代 equals 方法 - 统一所有二维码服务调用，全部使用 qrCodeMasterService 实例 - 优化代码可读性并减少服务实例的冗余引用 --- .../admin/controller/NormalPGIController.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 31f43297..081c9b6e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -99,9 +99,6 @@ public class NormalPGIController extends BaseController { @Resource private IWmsPackageItemService wmsPackageItemService; - @Resource - private IWmsQrCodeMasterService wmsQrCodeMasterService; - @Resource private IWmsQrCodeMasterService qrCodeMasterService; @@ -641,6 +638,7 @@ public class NormalPGIController extends BaseController { * @return */ //收货确认 + @Transactional @PostMapping("PDA/takeDelivery") @ApiMark(moduleName = "送货单管理", apiName = "收货确认") public ApiResult takeDelivery(@Valid @RequestBody List request) { @@ -679,7 +677,7 @@ public class NormalPGIController extends BaseController { for (SrmMaterialReceiptQO item : request) { - if (item.getReceiptNum().equals(BigDecimal.ZERO)) + if (item.getReceiptNum().compareTo(BigDecimal.ZERO)==0) continue; // 处理二维码 List autoFindChildCodes = Lists.newArrayList(); @@ -726,7 +724,7 @@ public class NormalPGIController extends BaseController { setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId(), orderItemId); for (PDAScanCodeQO code : item.getScanCodes()) { // 处理条码 - WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery() + WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId()) .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】"); @@ -745,7 +743,7 @@ public class NormalPGIController extends BaseController { setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder, orderItemId); for (PDAScanCodeQO code : item.getScanCodes()) { // 处理条码 - WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery() + WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId()) .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】"); @@ -1656,7 +1654,7 @@ public class NormalPGIController extends BaseController { if (CollectionUtil.isNotEmpty(scanCode)) { scanCode.forEach(code -> { - WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.getByCode(code.getCodeId()); + WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.getByCode(code.getCodeId()); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("条码不存在:" + code.getCodeId()); // 库存 InventoryInDTO inventoryDTO = inventories.stream() @@ -2016,7 +2014,7 @@ public class NormalPGIController extends BaseController { .map(WmsPackageItemDetailDTO::getBarcodeId).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(parentIds)) { - List childMasters = wmsQrCodeMasterService.lambdaQuery() + List childMasters = qrCodeMasterService.lambdaQuery() .in(WmsQrCodeMaster::getParentBarcodeId, parentIds).list(); childMasters.forEach(child -> { WmsPackageItemDetailDTO dto = new WmsPackageItemDetailDTO(); @@ -2136,7 +2134,7 @@ public class NormalPGIController extends BaseController { setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId(), orderItemId); for (PDAScanCodeQO code : item.getScanCodes()) { // 处理条码 - WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery() + WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId()) .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】"); @@ -2155,7 +2153,7 @@ public class NormalPGIController extends BaseController { setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder, orderItemId); for (PDAScanCodeQO code : item.getScanCodes()) { // 处理条码 - WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery() + WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId()) .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");