Merge remote-tracking branch 'origin/develop' into develop

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 {
      * <p>
      * 该方法首先尝试从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<WmsQrCodeMaster> parents = dto.getQrCodes()
-                        .stream()
-                        .filter(qrCode -> qrCode.getPackagingType() == 1)
-                        .toList();
-                if (CollectionUtil.isNotEmpty(parents)) {
-                    List<WmsQrCodeMaster> 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);
-                }
+//            if (CollectionUtil.isNotEmpty(dto.getQrCodes())) {
+//                //同步箱码信息到物料码中
+//                List<WmsQrCodeMaster> parents = dto.getQrCodes()
+//                        .stream()
+//                        .filter(qrCode -> qrCode.getPackagingType() == 1)
+//                        .toList();
+//                if (CollectionUtil.isNotEmpty(parents)) {
+//                    List<WmsQrCodeMaster> 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());
         }
     }
-    }
 }
+