From 55f089a7d67022f9ae2e1ae261473702f37f8ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 2 Jul 2026 09:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=B8=9A=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8A=A5=E9=94=99;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReservationStockInOrderDomainService.java | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
index d45f3d4d9..89d937d72 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
@@ -196,13 +196,30 @@ public class ReservationStockInOrderDomainService {
 //        }
 //
         List<ReservationInMaterialDetailDO> materialDetailList = stockInOrderDO.getMaterialDetailList();
-        if (materialDetailList != null && materialDetailList.size() > 0) {
+//        if (hasNullOrZeroMaterialBaseInfoId(materialDetailList)) {
+//            throw new ServiceException("物料明细中存在未选择物料基础信息的数据，请检查");
+//        }
+        if (materialDetailList != null && materialDetailList.size() > 0&&!hasNullOrZeroMaterialBaseInfoId(materialDetailList)) {
             return materialDetailService.batchUpdate(materialDetailList, inMaterialDetailBaseDO);
         } else {
             return true;
         }
     }
 
+    /**
+     * 判断物料明细列表中是否存在materialBaseInfoId为null或等于0的情况
+     * @param materialDetailList 物料明细列表
+     * @return 存在null或0返回true，否则返回false
+     */
+    private boolean hasNullOrZeroMaterialBaseInfoId(List<ReservationInMaterialDetailDO> materialDetailList) {
+        if (CollectionUtils.isEmpty(materialDetailList)) {
+            return false;
+        }
+        return materialDetailList.stream().anyMatch(detail ->
+                detail.getMaterialBaseInfoId() == null || detail.getMaterialBaseInfoId() == 0L
+        );
+    }
+
     /**
      * 批量删除入库单
      */