From 5a47d42c3372ae5605c212ad70e8d082bd3b3d1e Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Fri, 20 Mar 2026 10:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=89=A9=E6=96=99=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E6=89=B9=E6=AC=A1=E5=B7=AE=E5=BC=82null=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LocationTransferController.java           | 12 +++++-----
 .../controller/ScanRecordController.java      | 22 ++++++++++++++++---
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java
index 7e157937..ec544fdc 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java
@@ -136,11 +136,13 @@ public class LocationTransferController extends BaseController {
                 .collect(Collectors.toList()).size();
         VUtil.trueThrowBusinessError(count2 > 0).throwMessage("存在不同仓库的二维码");
 
-        boolean hasDuplicates1 = allQcMasters.stream()
-                .map(WmsQrCodeMaster::getBarcodeCode)
-                .collect(Collectors.toSet())
-                .size() != request.getItems().size();
-        VUtil.trueThrowBusinessError(!hasDuplicates1).throwMessage("存在同时扫箱码和箱中物料码的情况");
+
+
+//        boolean hasDuplicates1 = allQcMasters.stream()
+//                .map(WmsQrCodeMaster::getBarcodeCode)
+//                .collect(Collectors.toSet())
+//                .size() != request.getItems().size();
+//        VUtil.trueThrowBusinessError(!hasDuplicates1).throwMessage("存在同时扫箱码和箱中物料码的情况");
 
         List<WmsTransferOrders> transferOrders = new ArrayList<>();
         List<InventoryOutDTO> outBoundInventory = new ArrayList<>();
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java
index b3e30cac..06762e7d 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java
@@ -138,14 +138,30 @@ public class ScanRecordController extends BaseController {
                         v.stream()
                                 .collect(Collectors.groupingBy(OutMaterialScanRecord::getKey9))
                                 .forEach((key, vv) -> {
+                                    List<String> keyParts = StrUtil.split(key, "|");
+                                    String scanBatchNo = "";
+                                    if (keyParts.size() > 1) {
+                                        scanBatchNo = "null".equals(keyParts.get(1)) ? "" : keyParts.get(1);
+                                    }
+                                    String scanSerialNo = "";
+                                    if (keyParts.size() > 2) {
+                                        scanSerialNo = "null".equals(keyParts.get(2)) ? "" : keyParts.get(2);
+                                    }
+                                    String scanBinNo = "";
+                                    if (keyParts.size() > 3) {
+                                        scanBinNo = keyParts.get(3);
+                                    }
                                     vo.getItems().add(new OutDifferenceItemVO()
                                             .setRecommendbatchNo("")
                                             .setRecommendSerialNo("")
                                             .setRecommendBinNo("")
 //                                            .setRecommendNum(BigDecimal.ZERO)
-                                            .setScanBatchNo(StrUtil.split(key, "|").get(1))
-                                            .setScanSerialNo(StrUtil.split(key, "|").get(2))
-                                            .setScanBinNo(StrUtil.split(key, "|").get(3))
+//                                            .setScanBatchNo(StrUtil.split(key, "|").get(1))
+//                                            .setScanSerialNo(StrUtil.split(key, "|").get(2))
+//                                            .setScanBinNo(StrUtil.split(key, "|").get(3))
+                                            .setScanBatchNo(scanBatchNo)
+                                            .setScanSerialNo(scanSerialNo)
+                                            .setScanBinNo(scanBinNo)
                                             .setScanNum(vv.stream().map(OutMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add)));
                                 });
                     });