From 5b944d18d20843ee3fdd2323b3825a5227b3ae23 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, 1 Sep 2019 11:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=E5=87=BA=E7=8E=B0=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/serialNumber.html        |  7 +--
 .../serialNumber/SerialNumberService.java     | 49 +++++++++----------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html
index 3d713db2..18b2c179 100644
--- a/erp_web/pages/manage/serialNumber.html
+++ b/erp_web/pages/manage/serialNumber.html
@@ -121,7 +121,7 @@
                         <td style="width:80px;">序列号数量</td>
                         <td style="padding:5px;width:180px;">
                             <input name="batAddTotal" id="batAddTotal" class="easyui-numberbox"
-                                   data-options="min:0,max:10000"
+                                   data-options="min:0,max:500"
                                    style="width: 180px;height: 20px"/>
                         </td>
                         <td></td>
@@ -514,9 +514,6 @@
             success: function (res) {
                 if(res && res.code === 200){
                     if(res.data && res.data.page) {
-                        if(res.data.page.total==0){
-                            $.messager.alert('查询提示', '没有对应数据！', 'warning');
-                        }
                         $("#tableData").datagrid('loadData', res.data.page);
                     }
                 }
@@ -578,7 +575,7 @@
         $(".window-mask").css({width: webW, height: webH});
         $('#batAddMaterialName').val('');
         $('#batAddSerialNumberInput').val('');
-        $('#batAddTotal').val('100');
+        $('#batAddTotal').val('10');
         $('#batAddremark').val('');
         url = '/serialNumber/batAddSerialNumber';
     }
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 43d8b097..0c1b1a06 100644
--- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
+++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
@@ -497,7 +497,7 @@ public class SerialNumberService {
     /**
      * create by: cjl
      * description:
-     *批量添加序列号
+     *批量添加序列号，最多500个
      * create time: 2019/1/29 15:11
      * @Param: materialName
      * @Param: serialNumberPrefix
@@ -526,33 +526,28 @@ public class SerialNumberService {
 
             int insertNum=0;
             StringBuffer prefixBuf=new StringBuffer(serialNumberPrefix).append(million);
-            do{
-                list=new ArrayList<SerialNumberEx>();
-                int forNum = BusinessConstants.BATCH_INSERT_MAX_NUMBER>=batAddTotal?batAddTotal:BusinessConstants.BATCH_INSERT_MAX_NUMBER;
-               for(int i=0;i<forNum;i++){
-                   insertNum++;
-                   SerialNumberEx each=new SerialNumberEx();
-                   each.setMaterialId(materialId);
-                   each.setCreator(userId);
-                   each.setCreateTime(date);
-                   each.setUpdater(userId);
-                   each.setUpdateTime(date);
-                   each.setRemark(remark);
-                   each.setSerialNumber(new StringBuffer(prefixBuf.toString()).append(insertNum).toString());
-                   list.add(each);
-               }
-                int result=0;
-                try{
-                    result = serialNumberMapperEx.batAddSerialNumber(list);
-                }catch(Exception e){
-                    logger.error("异常码[{}],异常提示[{}],异常[{}]",
-                            ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
-                    throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE,
-                            ExceptionConstants.DATA_WRITE_FAIL_MSG);
-                }
+            list=new ArrayList<SerialNumberEx>();
+            int forNum = BusinessConstants.BATCH_INSERT_MAX_NUMBER>=batAddTotal?batAddTotal:BusinessConstants.BATCH_INSERT_MAX_NUMBER;
+            for(int i=0;i<forNum;i++){
+               insertNum++;
+               SerialNumberEx each=new SerialNumberEx();
+               each.setMaterialId(materialId);
+               each.setCreator(userId);
+               each.setCreateTime(date);
+               each.setUpdater(userId);
+               each.setUpdateTime(date);
+               each.setRemark(remark);
+               each.setSerialNumber(new StringBuffer(prefixBuf.toString()).append(insertNum).toString());
+               list.add(each);
+            }
+            try{
                 serialNumberMapperEx.batAddSerialNumber(list);
-                batAddTotal -= BusinessConstants.BATCH_INSERT_MAX_NUMBER;
-            }while(batAddTotal>0);
+            }catch(Exception e){
+                logger.error("异常码[{}],异常提示[{}],异常[{}]",
+                        ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
+                throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE,
+                        ExceptionConstants.DATA_WRITE_FAIL_MSG);
+            }
         }
     }
     /**