From c5c6f5c572892e4d8139859d8139c877f8f241d4 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Wed, 1 Apr 2026 08:09:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutPurchaseController.java | 2 +- .../service/NormalPGIControllerService.java | 67 ++++++++++--------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index 7f2f6fad..0288cf1e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -234,7 +234,7 @@ public class OutPurchaseController extends BaseController { .setSernr("") ); } else { - it.getSernrs().forEach(sernr -> { + it.getSernrs().forEach(sernr -> { input2.add(new ZWM3A06Input2DTO() .setEbelp(it.getEbelp()) .setLfpos(it.getLfpos()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java index 2e9c9172..c02ca650 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java @@ -118,6 +118,7 @@ public class NormalPGIControllerService { * 该方法首先根据订单编号查询订单主表信息，若不存在则返回 null； * 若存在，则进一步查询订单行项目列表，并结合 SAP 系统同步物料相关信息， * 最终组装成 PDAOrderVO 对象返回。 + * * @param orderNo 订单编号，用于查询订单主表和子表数据 * @return PDAOrderVO 包含订单头信息和行项目信息的视图对象；若未找到对应订单则返回 null * @throws Exception 查询或业务处理过程中可能抛出的异常 @@ -479,6 +480,7 @@ public class NormalPGIControllerService { /** * 将检验物料信息推送到SRM系统 + * * @param request SRM检验输入数据传输对象，包含需要推送的检验物料信息 */ private void pushInspectionMaterialsToSRM(SRMInspectionInputDTO request) { @@ -515,6 +517,7 @@ public class NormalPGIControllerService { *

* 该方法首先尝试从Redis缓存中获取SRM Token，如果缓存中不存在或为空， * 则通过OAuth认证接口重新获取Token并存入Redis缓存50分钟。 + * * @return SRM系统认证Token字符串 */ private String GetSRMToken() { @@ -618,38 +621,38 @@ public class NormalPGIControllerService { } //编码管理 - if (CollectionUtil.isNotEmpty(dto.getQrCodes())) { - //同步箱码信息到物料码中 - List parents = dto.getQrCodes() - .stream() - .filter(qrCode -> qrCode.getPackagingType() == 1) - .toList(); - if (CollectionUtil.isNotEmpty(parents)) { - List children = qrCodeMasterService.lambdaQuery() - .in(WmsQrCodeMaster::getParentBarcodeId, parents - .stream() - .map(WmsQrCodeMaster::getId) - .toList() - ) - .list(); - parents.forEach(p -> { - children.stream() - .filter(c -> c.getParentBarcodeId().equals(p.getId())) - .forEach(c -> { - c.setProcessStage(p.getProcessStage()); - c.setLastScanBy(UserUtil.getUserId()); - c.setLastScanByname(UserUtil.getUserName()); - c.setLastScanTime(LocalDateTime.now()); - c.setFactoryCode(p.getFactoryCode()); - c.setStorageLocation(p.getStorageLocation()); - c.setBinLocation(p.getBinLocation()); - c.setReceiptItemId(p.getReceiptItemId()); - }); - }); - dto.getQrCodes().addAll(children); - } - qrCodeMasterService.updateBarCode(dto.getQrCodes()); - } +// if (CollectionUtil.isNotEmpty(dto.getQrCodes())) { +// //同步箱码信息到物料码中 +// List parents = dto.getQrCodes() +// .stream() +// .filter(qrCode -> qrCode.getPackagingType() == 1) +// .toList(); +// if (CollectionUtil.isNotEmpty(parents)) { +// List children = qrCodeMasterService.lambdaQuery() +// .in(WmsQrCodeMaster::getParentBarcodeId, parents +// .stream() +// .map(WmsQrCodeMaster::getId) +// .toList() +// ) +// .list(); +// parents.forEach(p -> { +// children.stream() +// .filter(c -> c.getParentBarcodeId().equals(p.getId())) +// .forEach(c -> { +// c.setProcessStage(p.getProcessStage()); +// c.setLastScanBy(UserUtil.getUserId()); +// c.setLastScanByname(UserUtil.getUserName()); +// c.setLastScanTime(LocalDateTime.now()); +// c.setFactoryCode(p.getFactoryCode()); +// c.setStorageLocation(p.getStorageLocation()); +// c.setBinLocation(p.getBinLocation()); +// c.setReceiptItemId(p.getReceiptItemId()); +// }); +// }); +// dto.getQrCodes().addAll(children); +// } + qrCodeMasterService.updateBarCode(dto.getQrCodes()); } } } + From 3a6161fb930b93e54a10b358276469977681182b Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Wed, 1 Apr 2026 09:09:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=A9=BA=E6=8C=87=E9=92=88=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/wms/admin/controller/NormalQMController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 7d5a7a1b..3813dc1f 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 @@ -295,13 +295,17 @@ public class NormalQMController extends BaseController { List qrCodes = CollectionUtil.unionAll( request.stream() .map(QCReceiveTaskConfirmQO::getReceiveItems) + .filter(Objects::nonNull) .flatMap(List::stream) .map(InCostCenterBackSubmitItemQRQO::getQrCode) + .filter(Objects::nonNull) .toList() , request.stream() .map(QCReceiveTaskConfirmQO::getRejectItems) + .filter(Objects::nonNull) .flatMap(List::stream) .map(InCostCenterBackSubmitItemQRQO::getQrCode) + .filter(Objects::nonNull) .toList() ); List qrCodeMasters = qrCodeMasterService.getChildrenWithParent(qrCodes);