From 3147afaa276ea7eac409d29e5b8210e5b12f7d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 28 Aug 2023 22:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A2=AB=E4=BF=AE=E6=94=B9=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/constants/ExceptionConstants.java  | 3 +++
 .../java/com/jsh/erp/service/depotItem/DepotItemService.java | 4 ++++
 .../erp/service/materialExtend/MaterialExtendService.java    | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
index dfacbb40..100f7aa1 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
@@ -335,6 +335,9 @@ public class ExceptionConstants {
     //多属性商品不能输入库存，建议进行盘点录入
     public static final int MATERIAL_SKU_BEGIN_STOCK_FAILED_CODE = 8000025;
     public static final String MATERIAL_SKU_BEGIN_STOCK_FAILED_MSG = "多属性商品%s不能输入库存，建议进行盘点录入";
+    //商品条码不存在，请重新选择
+    public static final int MATERIAL_BARCODE_IS_NOT_EXIST_CODE = 8000026;
+    public static final String MATERIAL_BARCODE_IS_NOT_EXIST_MSG = "商品条码%s不存在，请重新选择";
 
     /**
      *  单据信息
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
index eb5c3dae..ddaa56bc 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -420,6 +420,10 @@ public class DepotItemService {
                 depotItem.setHeaderId(headerId);
                 String barCode = rowObj.getString("barCode");
                 MaterialExtend materialExtend = materialExtendService.getInfoByBarCode(barCode);
+                if(materialExtend == null) {
+                    throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_BARCODE_IS_NOT_EXIST_CODE,
+                            String.format(ExceptionConstants.MATERIAL_BARCODE_IS_NOT_EXIST_MSG, barCode));
+                }
                 depotItem.setMaterialId(materialExtend.getMaterialId());
                 depotItem.setMaterialExtendId(materialExtend.getId());
                 depotItem.setMaterialUnit(rowObj.getString("unit"));
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
index 073a1a03..1a679559 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
@@ -382,9 +382,10 @@ public class MaterialExtendService {
                 .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
         List<MaterialExtend> list = materialExtendMapper.selectByExample(example);
         if(list!=null && list.size()>0) {
-            materialExtend = list.get(0);
+            return list.get(0);
+        } else {
+            return null;
         }
-        return materialExtend;
     }
 
     /**