From fbafafdb6086c03208fa7ae1269974709b9dd391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 26 Feb 2023 21:52:32 +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=81=E9=81=87=E5=88=B0=E7=9A=84=E5=88=9D=E5=A7=8B=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/service/material/MaterialService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
index 6e933714..66f96b33 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -659,7 +659,7 @@ public class MaterialService {
                         BigDecimal initStock = getInitStock(mId, depotId);
                         BigDecimal currentNumber = getCurrentStockByMaterialIdAndDepotId(mId, depotId);
                         //当前库存的更新：减去初始库存，再加上导入的新初始库存
-                        if(currentNumber!=null && initStock!=null) {
+                        if(currentNumber!=null && initStock!=null && stock!=null) {
                             currentNumber = currentNumber.subtract(initStock).add(stock);
                         }
                         MaterialCurrentStock materialCurrentStock = new MaterialCurrentStock();