From 5b85d5c3e11a12f5099b03e60398cefabfeffbf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Sat, 7 Feb 2026 12:25:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=85=A5=E5=BA=93=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=A4=E7=A9=BA(=E4=B8=8A=E6=9E=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=A4=B1=E8=B4=A5);?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/StockShelfOrderDomainService.java                | 5 +++++
 1 file changed, 5 insertions(+)

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 eefa94178..b275ee219 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
@@ -545,19 +545,24 @@ public class StockShelfOrderDomainService {
                 BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
                 BigDecimal newAllocationQuantity = materialInventoryPO.getAllocationQuantity().add(shelvesQuantity);
                 BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
+
                 BigDecimal oldArea = materialInventoryPO.getArea();
+                oldArea = oldArea != null ? oldArea : BigDecimal.ZERO;
                 BigDecimal totalArea = shelfMaterialDetail.getTotalArea();
                 totalArea = totalArea != null ? totalArea : BigDecimal.ZERO;
                 BigDecimal newArea = oldArea.add(totalArea);
                 BigDecimal oldVolume = materialInventoryPO.getVolume();
+                oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO;
                 BigDecimal totalVolume = shelfMaterialDetail.getTotalVolume();
                 totalVolume = totalVolume != null ? totalVolume : BigDecimal.ZERO;
                 BigDecimal newVolume = oldVolume.add(totalVolume);
                 BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight();
+                oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO;
                 BigDecimal totalGrossWeight = shelfMaterialDetail.getTotalGrossWeight();
                 totalGrossWeight = totalGrossWeight != null ? totalGrossWeight : BigDecimal.ZERO;
                 BigDecimal newGrossWeight = oldGrossWeight.add(totalGrossWeight);
                 BigDecimal oldNetWeight = materialInventoryPO.getNetWeight();
+                oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO;
                 BigDecimal totalNetWeight = shelfMaterialDetail.getTotalNetWeight();
                 totalNetWeight = totalNetWeight != null ? totalNetWeight : BigDecimal.ZERO;
                 BigDecimal newNetWeight = oldNetWeight.add(totalNetWeight);