From 1c4f49734f9f39b1a437428bea0c75e595e9d811 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 26 Jul 2025 09:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=85=A5=E5=95=86?=
 =?UTF-8?q?=E5=93=81excel=E9=81=87=E5=88=B0=E7=9A=84=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=B8=BAnull=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsh/erp/service/MaterialService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
index 4263a3d1..da0bf060 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
@@ -807,7 +807,7 @@ public class MaterialService {
                         }
                         buildChangeInitialStock(deleteInitialStockMaterialIdList, insertInitialStockMaterialList, materialDepotInitialMap, mId, depotId, materialDepotKey, stock);
                     } else {
-                        if(initStock.compareTo(BigDecimal.ZERO)!=0) {
+                        if(initStock!=null && initStock.compareTo(BigDecimal.ZERO)!=0) {
                             buildChangeInitialStock(deleteInitialStockMaterialIdList, insertInitialStockMaterialList, materialDepotInitialMap, mId, depotId, materialDepotKey, stock);
                         }
                     }
@@ -817,7 +817,7 @@ public class MaterialService {
                         if(stock!=null && stock.compareTo(BigDecimal.ZERO)!=0) {
                             buildChangeCurrentStock(deleteCurrentStockMaterialIdList, insertCurrentStockMaterialList, materialDepotCurrentMap, mId, depotId, materialDepotKey, stock);
                         } else {
-                            if(initStock.compareTo(BigDecimal.ZERO)!=0) {
+                            if(initStock!=null && initStock.compareTo(BigDecimal.ZERO)!=0) {
                                 buildChangeCurrentStock(deleteCurrentStockMaterialIdList, insertCurrentStockMaterialList, materialDepotCurrentMap, mId, depotId, materialDepotKey, stock);
                             }
                         }