From e5288c92a99e7bd0d618df72d650d2d4658e4f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Tue, 24 Feb 2026 15:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E7=A9=BA;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/StockOutOrderDomainService.java           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
index e5133e62e..617c96e00 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
@@ -63,6 +63,7 @@ import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
 import com.mhd.wms.domain.waveOrder.factorys.WaveOrderServiceFactory;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -699,10 +700,12 @@ public class StockOutOrderDomainService {
             outMaterialDetailPO.setMaterialName(outMaterialDetailPO.getCommodityName());
             Long materialBaseInfoId = outMaterialDetailPO.getMaterialBaseInfoId();
             PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(outOrderNumber, materialBaseInfoId);
-            outMaterialDetailPO.setTotalArea(pickingMaterialDetailPO.getTotalArea());
-            outMaterialDetailPO.setTotalVolume(pickingMaterialDetailPO.getTotalVolume());
-            outMaterialDetailPO.setTotalNetWeight(pickingMaterialDetailPO.getTotalNetWeight());
-            outMaterialDetailPO.setTotalGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight());
+            if (ObjectUtils.isNotEmpty(pickingMaterialDetailPO)) {
+                outMaterialDetailPO.setTotalArea(pickingMaterialDetailPO.getTotalArea());
+                outMaterialDetailPO.setTotalVolume(pickingMaterialDetailPO.getTotalVolume());
+                outMaterialDetailPO.setTotalNetWeight(pickingMaterialDetailPO.getTotalNetWeight());
+                outMaterialDetailPO.setTotalGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight());
+            }
         }
         stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList);
         BigDecimal weightLimit = BigDecimal.ZERO;