From e93fb50543d52657b6cf4abe0a1058f5ccdabacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Jun 2026 18:43:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(normalPGI):=20=E6=B7=BB=E5=8A=A0=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E5=AD=98=E5=9C=A8=E6=80=A7=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=B9=B6=E9=9B=86=E6=88=90SAP=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 验证收货单是否存在，不存在时抛出业务异常 - 集成SAP同步参数服务获取物料信息 - 添加工厂代码和仓库编号字段到无扫描项目返回结果 - 重构数据映射逻辑以支持动态物料信息获取 --- .../admin/controller/NormalPGIController.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 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 91aaddb0..78911ac0 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 @@ -193,6 +193,8 @@ public class NormalPGIController extends BaseController { */ @GetMapping("getListForNoScan") public ApiResult> getListForNoScan(@RequestParam Long orderId) { + WmsSrmOrder order = wmsSrmOrderService.getById(orderId); + VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在"); List items = wmsSrmOrderItemService.lambdaQuery() .eq(WmsSrmOrderItem::getOrderId, orderId) .list(); @@ -200,13 +202,18 @@ public class NormalPGIController extends BaseController { || noScanningBaseControllerService.existsQrCode(item.getItemCode())); return ApiResult.success( items.stream() - .map(item -> new NoScanItemVO() - .setRowNo(item.getLineNumber()) - .setOrderItemId(item.getId()) - .setMaterialNo(item.getItemCode()) - .setMaterialDesc(item.getItemName()) - .setWarehouseNo("") - .setNum(item.getDeliveryQty().subtract(item.getReceiptQty()))) + .map(item -> { + SAPSyncParamsDTO syncParamsDTO = sapCommonService.getMaterialInfoInOrder(item.getPoNum(), + order.getSupplierNum(), item.getItemCode(), item.getPoLineNumber()); + return new NoScanItemVO() + .setRowNo(item.getLineNumber()) + .setOrderItemId(item.getId()) + .setMaterialNo(item.getItemCode()) + .setMaterialDesc(item.getItemName()) + .setFactoryNo(order.getIuCode()) + .setWarehouseNo(syncParamsDTO.getWarehouseNo()) + .setNum(item.getDeliveryQty().subtract(item.getReceiptQty())); + }) .toList() ); }