From 7d673950361782c31a5620cbab448df67f59c475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 24 Jun 2026 11:13:09 +0800 Subject: [PATCH] =?UTF-8?q?refactor(normalQM):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注入SapService依赖以支持后续功能扩展 - 简化入库参数空值检查的条件判断逻辑 - 修正物料入库状态检查的条件，使用正确的集合变量 - 移除废弃的代码注释块，提高代码可读性 - 重新组织QCReceiveDTO对象创建逻辑，确保在正确位置初始化 - 删除重复的数据添加操作，避免数据冗余 --- .../admin/controller/NormalQMController.java | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java index 982b3ba6..8ad2f3e4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java @@ -75,6 +75,7 @@ public class NormalQMController extends BaseController { @Resource private IWmsQrCodeMasterService qrCodeMasterService; + @Resource private SapService sapService; /** @@ -137,8 +138,7 @@ public class NormalQMController extends BaseController { @PostMapping("PDA/task/confirm") @ApiMark(moduleName = "质检物料管理", apiName = "质检任务上架确认") public ApiResult confirm(@Valid @RequestBody List request) { - if (CollectionUtil.isEmpty(request)) - VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("入库参数为空"); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("入库参数为空"); //根据详情ID 获取到相应的入库单信息 List uniqueIds = request.stream() @@ -151,7 +151,7 @@ public class NormalQMController extends BaseController { .apply("check_qty>in_qty") .list(); - VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("不存在待入库的物料(或此物料已入库)"); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(wmsQcReceiveItems)).throwMessage("不存在待入库的物料(或此物料已入库)"); List qrCodes = CollectionUtil.unionAll( request.stream() @@ -232,14 +232,14 @@ public class NormalQMController extends BaseController { List qcReceiveDTOS = new ArrayList<>(); for (String poNum : poNums) { - //封装一个数据 - QCReceiveDTO qcReceiveDTO = new QCReceiveDTO() -// .setUnqualifiedInventories(new ArrayList<>()) - .setQcIdList(new ArrayList<>()) - .setReceiveIds(new ArrayList<>()) - .setWaitModifyItems(new ArrayList<>()) - .setStorageLocationDTOS(new ArrayList<>()) - .setQualifiednventories(new ArrayList<>()); +// //封装一个数据 +// QCReceiveDTO qcReceiveDTO = new QCReceiveDTO() +//// .setUnqualifiedInventories(new ArrayList<>()) +// .setQcIdList(new ArrayList<>()) +// .setReceiveIds(new ArrayList<>()) +// .setWaitModifyItems(new ArrayList<>()) +// .setStorageLocationDTOS(new ArrayList<>()) +// .setQualifiednventories(new ArrayList<>()); List qcReceiveTaskConfirmQOS = request.stream() .filter(q -> q.getPoNum().equals(poNum)) .collect(Collectors.toList()); @@ -252,6 +252,15 @@ public class NormalQMController extends BaseController { if (Objects.isNull(wmsQcReceiveItem)) { continue; } + //封装一个数据 + QCReceiveDTO qcReceiveDTO = new QCReceiveDTO() +// .setUnqualifiedInventories(new ArrayList<>()) + .setQcIdList(new ArrayList<>()) + .setReceiveIds(new ArrayList<>()) + .setWaitModifyItems(new ArrayList<>()) + .setStorageLocationDTOS(new ArrayList<>()) + .setQualifiednventories(new ArrayList<>()); + qcReceiveDTOS.add(qcReceiveDTO); if (!qcReceiveDTO.getReceiveIds().stream().anyMatch(id -> id.equals(wmsQcReceiveItem.getReceiveId()))) { qcReceiveDTO.getReceiveIds().add(wmsQcReceiveItem.getReceiveId()); } @@ -366,7 +375,7 @@ public class NormalQMController extends BaseController { } } } - qcReceiveDTOS.add(qcReceiveDTO); +// qcReceiveDTOS.add(qcReceiveDTO); } qrCodeMasterService.updateBarCode(qrCodeMasters); normalQMControllerService.confirmReceive(qcReceiveDTOS);