From 5e16ca2436f853d7916213e475c015f1d566f79d 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, 5 Feb 2026 15:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=A1=E7=AE=97=E5=88=A4?=
 =?UTF-8?q?=E7=A9=BA=E5=A4=84=E7=90=86;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandoverTaskOrderDomainService.java       |  8 +++++++
 .../persistence/OutMaterialDetailImpl.java    |  4 ++++
 .../service/StockShelfOrderDomainService.java | 22 ++++++++++++++-----
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
index cc2731c2f..ddcf3754f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
@@ -185,6 +185,14 @@ public class HandoverTaskOrderDomainService {
                 BigDecimal checkVolume = outMaterialDetail.getCheckVolume();
                 BigDecimal checkGrossWeight = outMaterialDetail.getCheckGrossWeight();
                 BigDecimal checkNetWeight = outMaterialDetail.getCheckNetWeight();
+
+                // 初始化检查数据，避免空指针
+                checkQuantity = checkQuantity != null ? checkQuantity : BigDecimal.ZERO;
+                checkArea = checkArea != null ? checkArea : BigDecimal.ZERO;
+                checkVolume = checkVolume != null ? checkVolume : BigDecimal.ZERO;
+                checkGrossWeight = checkGrossWeight != null ? checkGrossWeight : BigDecimal.ZERO;
+                checkNetWeight = checkNetWeight != null ? checkNetWeight : BigDecimal.ZERO;
+
                 MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
                 if (materialInventoryPO != null) {
                     //更新库存数量
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
index fd9c573ea..45aa09a23 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
@@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -416,6 +417,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
             Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
             BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity();
+            if (ObjectUtils.isEmpty(allocationQuantity)) {
+                allocationQuantity = BigDecimal.ZERO;
+            }
             MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
             if (materialInventoryPO != null) {
                 //更新库存数量
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
index 8579c78e2..8b28deeb6 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
@@ -534,19 +534,29 @@ public class StockShelfOrderDomainService {
                 inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             } else if (materialInventoryPOS.size() == 1) {
                 MaterialInventory materialInventory = new MaterialInventory();
+                BigDecimal shelvesQuantity = shelfMaterialDetail.getShelvesQuantity();
+                shelvesQuantity = shelvesQuantity != null ? shelvesQuantity : BigDecimal.ZERO;
                 MaterialInventoryPO materialInventoryPO = materialInventoryPOS.get(0);
-                BigDecimal newInventoryQuantity = materialInventoryPO.getInventoryQuantity().add(shelfMaterialDetail.getShelvesQuantity());
+                BigDecimal newInventoryQuantity = materialInventoryPO.getInventoryQuantity().add(shelvesQuantity);
                 BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
-                BigDecimal newAllocationQuantity = materialInventoryPO.getAllocationQuantity().add(shelfMaterialDetail.getShelvesQuantity());
+                BigDecimal newAllocationQuantity = materialInventoryPO.getAllocationQuantity().add(shelvesQuantity);
                 BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
                 BigDecimal oldArea = materialInventoryPO.getArea();
-                BigDecimal newArea = oldArea.add(shelfMaterialDetail.getTotalArea());
+                BigDecimal totalArea = shelfMaterialDetail.getTotalArea();
+                totalArea = totalArea != null ? totalArea : BigDecimal.ZERO;
+                BigDecimal newArea = oldArea.add(totalArea);
                 BigDecimal oldVolume = materialInventoryPO.getVolume();
-                BigDecimal newVolume = oldVolume.add(shelfMaterialDetail.getTotalVolume());
+                BigDecimal totalVolume = shelfMaterialDetail.getTotalVolume();
+                totalVolume = totalVolume != null ? totalVolume : BigDecimal.ZERO;
+                BigDecimal newVolume = oldVolume.add(totalVolume);
                 BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
-                BigDecimal newGrossWeight = oldGrossWeight.add(shelfMaterialDetail.getTotalGrossWeight());
+                BigDecimal totalGrossWeight = shelfMaterialDetail.getTotalGrossWeight();
+                totalGrossWeight = totalGrossWeight != null ? totalGrossWeight : BigDecimal.ZERO;
+                BigDecimal newGrossWeight = oldGrossWeight.add(totalGrossWeight);
                 BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
-                BigDecimal newNetWeight = oldNetWeight.add(shelfMaterialDetail.getTotalNetWeight());
+                BigDecimal totalNetWeight = shelfMaterialDetail.getTotalNetWeight();
+                totalNetWeight = totalNetWeight != null ? totalNetWeight : BigDecimal.ZERO;
+                BigDecimal newNetWeight = oldNetWeight.add(totalNetWeight);
 
                 materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
                 materialInventoryPO.setAllocationQuantity(newAllocationQuantity);