Browse Source

【钜弘MES】SN清单导入限制提到20000

caosy 5 years ago
parent
commit
8c3120108e

+ 3 - 3
WebContent/app/controller/common/Import.js

@@ -1685,7 +1685,7 @@ Ext.define('erp.controller.common.Import', {
      * 数据校验
      */
     checkdata: function(grid){
-    	var me = this, count = grid.down('pagingtoolbar').dataCount, pageSize = 10000, page = 0, a, b,
+    	var me = this, count = grid.down('pagingtoolbar').dataCount, pageSize = 20000, page = 0, a, b,
     		len = Math.ceil(count/pageSize), index = 0;
     	var p = Ext.create('Ext.ProgressBar', {
 			width: '60%',
@@ -1752,8 +1752,8 @@ Ext.define('erp.controller.common.Import', {
     		    	}
     			} else {
     				if(res.exceptionInfo) {
-        				if(res.exceptionInfo = '数据超过10000条,请分批导入'){
-        					alert('数据超过10000条,请分批导入!');
+        				if(res.exceptionInfo = '数据超过20000条,请分批导入'){
+        					alert('数据超过20000条,请分批导入!');
         					grid.setLoading(false);
             				p.destroy();
             				return;

+ 2 - 2
src/com/uas/mes/common/service/impl/InitServiceImpl.java

@@ -303,8 +303,8 @@ public class InitServiceImpl implements InitService {
 		 */
 		int count = 0;
 	    count = baseDao.getCountByCondition("InitData", "id_ilid=" + id);
-		if(count > 10000){
-			BaseUtil.showError("数据超过10000条,请分批导入");
+		if(count > 20000){
+			BaseUtil.showError("数据超过20000条,请分批导入");
 		}
 		// 删除InitNodes的数据
 		baseDao.deleteByCondition("InitNodes", "in_ilid=" + id);