From fd1c7e1025c2902c9b1d52569f3eb43713d075c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 8 Aug 2019 21:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84=E4=BA=A7=E5=93=81=E9=94=80=E5=94=AE=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js          |  4 +--
 .../serialNumber/SerialNumberService.java     | 35 +++++++------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index 44b823d6..62d89fd3 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -3097,7 +3097,7 @@
 
 				if(tipInfo){
 					if(tipInfo.code!=200){
-						$.messager.alert('提示', tipInfo.msg, 'error');
+						$.messager.alert('提示', tipInfo.msg, 'warning');
 						return;
 					}
 					$.messager.alert('提示','保存成功！','info');
@@ -3146,7 +3146,7 @@
 			success: function (tipInfo){
 				if(tipInfo){
 					if(tipInfo.code!=200){
-						$.messager.alert('提示', tipInfo.msg, 'error');
+						$.messager.alert('提示', tipInfo.msg, 'warning');
 						return;
 					}
 					$.messager.alert('提示','保存成功！','info');
diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
index 498ce83c..43d8b097 100644
--- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
+++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
@@ -426,28 +426,19 @@ public class SerialNumberService {
      * @return void
      */
     public void checkAndUpdateSerialNumber(DepotItem depotItem,User userInfo) throws Exception{
-                if(depotItem!=null){
-                    //查询商品下已分配的可用序列号数量
-                    try{
-                        int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD);
-                        //BasicNumber=OperNumber*ratio
-                        if((depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue()>SerialNumberSum){
-                            //获取商品名称
-                            Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid());
-                            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE,
-                                    String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName()));
-                        }
-                    }catch(Exception e){
-                        logger.error("异常码[{}],异常提示[{}],异常[{}]",
-                                ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
-                        throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE,
-                                ExceptionConstants.DATA_READ_FAIL_MSG);
-                    }
-
-                    //商品下序列号充足，分配序列号
-                    sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),userInfo);
-                }
-
+        if(depotItem!=null){
+            //查询商品下已分配的可用序列号数量
+            int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD);
+            //BasicNumber=OperNumber*ratio
+            if((depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue()>SerialNumberSum){
+                //获取商品名称
+                Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid());
+                throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE,
+                        String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName()));
+            }
+            //商品下序列号充足，分配序列号
+            sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),userInfo);
+        }
     }
     /**
      *