From ce8e6a3494e46b6e36284e73739c5bb8af63ffb7 Mon Sep 17 00:00:00 2001
From: zhangke <sunwill6677@>
Date: Thu, 25 Sep 2025 16:18:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=97=A0=E7=A0=81=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/wms/admin/controller/NormalPGIController.java  | 6 ++++--
 .../nflg/wms/admin/service/NormalPGIControllerService.java  | 3 ++-
 2 files changed, 6 insertions(+), 3 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 a2d11812..78912074 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
@@ -705,10 +705,12 @@ public class NormalPGIController extends BaseController {
                     order.getSupplierNum(),
                     item.getItemCode(), item.getPoLineNumber());
             VUtil.trueThrowBusinessError(Objects.isNull(materialInfoInOrder)).throwMessage("当前物料信息【" + item.getItemCode() + "】,订单号【" + item.getPoNum() + "】，供应商【" + order.getSupplierName() + "】在SAP中搜索不到有效信息");
+            String batchNumber = (materialInfoInOrder.getLbprt().equals("2")
+                    || materialInfoInOrder.getLbprt().equals("4")) ? NoUtil.getBatchNo(order.getSupplierNum()) : "";
             qo.setItemName(materialInfoInOrder.getMaktx());
             qo.setUomCode(materialInfoInOrder.getMeins());
             qo.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo());
-            qo.setBatchNumber(NoUtil.getBatchNo(order.getSupplierNum()));
+            qo.setBatchNumber(batchNumber);
             qo.setBinNos(materialInfoInOrder.getBinNos());
             qo.setTransportNum(materialInfoInOrder.getTransportNum());
             qo.setLbprt(materialInfoInOrder.getLbprt());
@@ -878,7 +880,7 @@ public class NormalPGIController extends BaseController {
             //序列号和批次号验证以及条码信息的组装
             Long receiveItemId = IdUtil.getSnowflakeNextId();
             List<SrmMaterialReceiptScanCodes> scanCodeQOS = new ArrayList<>();
-            List<SrmMaterialReceiptNoScanCodes> itemCodes = validateNoScanCodes(item, materialInfoInOrder, scanCodeQOS,receiveItemId);
+            List<SrmMaterialReceiptNoScanCodes> itemCodes = validateNoScanCodes(item, materialInfoInOrder, scanCodeQOS, receiveItemId);
             if (CollectionUtil.isNotEmpty(itemCodes)) {
                 codes.addAll(itemCodes);
             }
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 0dd56e22..3cb9a382 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
@@ -167,7 +167,8 @@ public class NormalPGIControllerService {
     }
 
 
-    public List<SrmMaterialReceiptScanCodes> validateScanCodes(SrmMaterialReceiptQO item, SAPSyncParamsDTO materialInfoInOrder, Long receiveItemId) {
+    public List<SrmMaterialReceiptScanCodes> validateScanCodes(SrmMaterialReceiptQO item
+            , SAPSyncParamsDTO materialInfoInOrder, Long receiveItemId) {
         String lbprt = materialInfoInOrder.getLbprt();
         //判断序列号、批次号是否规范
         //  1 - 批次号为空，序列号为空