【钜弘MES】SN清单导入限制放大至10000

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 = 5000, page = 0, a, b,
+    	var me = this, count = grid.down('pagingtoolbar').dataCount, pageSize = 10000, page = 0, a, b,
     		len = Math.ceil(count/pageSize), index = 0;
     	var p = Ext.create('Ext.ProgressBar', {
 			width: '60%',
@@ -1709,7 +1709,7 @@ Ext.define('erp.controller.common.Import', {
     		    		b = (page + 1) * pageSize;
     		    		Ext.Ajax.request({
     		        		url: basePath + 'system/checkInitData.action',
-    		        		timeout: 30000,
+    		        		timeout: 60000,
     		        		async: false,
     		        		method: 'post',
     		        		params: {
@@ -1730,7 +1730,7 @@ Ext.define('erp.controller.common.Import', {
     		        				p.updateProgress(0.4, '准备完毕，正在校验...', true);
     		        				Ext.Ajax.request({
     		        		    		url: basePath + 'system/afterCheckLog.action',
-    		        		    		timeout: 30000,
+    		        		    		timeout: 60000,
     		        		    		params: {
     		        		    			id: grid.ilid
     		        		    		},
@@ -1752,8 +1752,8 @@ Ext.define('erp.controller.common.Import', {
     		    	}
     			} else {
     				if(res.exceptionInfo) {
-        				if(res.exceptionInfo = '数据超过5000条,请分批导入'){
-        					alert('数据超过5000条,请分批导入!');
+        				if(res.exceptionInfo = '数据超过10000条,请分批导入'){
+        					alert('数据超过10000条,请分批导入!');
         					grid.setLoading(false);
             				p.destroy();
             				return;

src/com/uas/mes/common/service/impl/InitServiceImpl.java

@@ -1,30 +1,9 @@
 package com.uas.mes.common.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
 import com.uas.mes.common.dao.InitDao;
 import com.uas.mes.common.data.BaseDao;
 import com.uas.mes.common.data.SqlUtil;
-import com.uas.mes.common.entity.Employee;
-import com.uas.mes.common.entity.InitData;
-import com.uas.mes.common.entity.InitDetail;
-import com.uas.mes.common.entity.InitLog;
-import com.uas.mes.common.entity.InitNodes;
-import com.uas.mes.common.entity.Initialize;
-import com.uas.mes.common.entity.Master;
+import com.uas.mes.common.entity.*;
 import com.uas.mes.common.service.AbstractInit;
 import com.uas.mes.common.service.InitService;
 import com.uas.mes.common.support.CheckUtil;
@@ -38,6 +17,14 @@ import com.uas.mes.core.util.FlexJsonUtil;
 import com.uas.mes.core.util.JSONUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.*;
 
 
 @Service("initService")
@@ -316,8 +303,8 @@ public class InitServiceImpl implements InitService {
 		 */
 		int count = 0;
 	    count = baseDao.getCountByCondition("InitData", "id_ilid=" + id);
-		if(count > 5000){
-			BaseUtil.showError("数据超过5000条,请分批导入");
+		if(count > 10000){
+			BaseUtil.showError("数据超过10000条,请分批导入");
 		}
 		// 删除InitNodes的数据
 		baseDao.deleteByCondition("InitNodes", "in_ilid=" + id);