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 @@
序列号数量 |
|
|
@@ -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();
- int forNum = BusinessConstants.BATCH_INSERT_MAX_NUMBER>=batAddTotal?batAddTotal:BusinessConstants.BATCH_INSERT_MAX_NUMBER;
- for(int i=0;i();
+ int forNum = BusinessConstants.BATCH_INSERT_MAX_NUMBER>=batAddTotal?batAddTotal:BusinessConstants.BATCH_INSERT_MAX_NUMBER;
+ for(int i=0;i0);
+ }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);
+ }
}
}
/**