Просмотр исходного кода

修改物料上传数量限制

dongbw 8 лет назад
Родитель
Сommit
403f5bb613

+ 1 - 1
src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -31,7 +31,7 @@ public class ProductUtils {
     /**
      * 物料单次请求数据量大小
      */
-    private static final int ONE_TIME_DATA_SIZE = 5000;
+    private static final int ONE_TIME_DATA_SIZE = 1000;
 
     /**
      * 分页批量更新物料

+ 1 - 1
src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -305,7 +305,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 			}
 			if (!CollectionUtils.isEmpty(products)) {
 				try {
-					ProductUtils.update(products);
+					ProductUtils.paginationUpdate(products);
 //					saveUserOrders(products);
 					modelMap.put("success", products.size());
 				} catch (Exception e) {

+ 2 - 2
src/main/java/com/uas/platform/b2b/service/impl/ProductUsersServiceImpl.java

@@ -70,7 +70,7 @@ public class ProductUsersServiceImpl implements ProductUsersService {
     /**
      * 一次上传允许的最大数量 (前三行为标题 从0开始)
      */
-    private final static Integer MAX_ROWNUM = 20002;
+    private final static Integer MAX_ROWNUM = 5002;
 
     @Override
     public SPage<ProductUsers> findProductInfoByPageInfo(PageInfo pageInfo) {
@@ -182,7 +182,7 @@ public class ProductUsersServiceImpl implements ProductUsersService {
         Sheet sheet = workbook.getSheetAt(0);
         int rowNum = sheet.getLastRowNum();
         if (rowNum > MAX_ROWNUM) {
-            throw new IllegalOperatorException("单次上传不超过20000条");
+            throw new IllegalOperatorException("单次上传不超过5000条");
         }
         Row headerRow = sheet.getRow(0);
         int total = 0;

+ 1 - 1
src/main/java/com/uas/platform/b2b/service/impl/PurcProductServiceImpl.java

@@ -327,7 +327,7 @@ public class PurcProductServiceImpl implements PurcProductService {
 			if (!CollectionUtils.isEmpty(products) || !CollectionUtils.isEmpty(oldProducts)) {
 				try {
 				    products.addAll(oldProducts);
-					ProductUtils.update(products);
+					ProductUtils.paginationUpdate(products);
 					modelMap.put("success", products.size());
 				} catch (Exception e) {
 					modelMap.put("error", "上传失败,可能存在编号相同的物料");

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/modal/uplodaByBatch.html

@@ -13,7 +13,7 @@
 </div>
 <div class="modal-header Deputy" style="min-height: 50px;">
 	<div class="content f16 text-bold">批量导入
-		<span class="f12" style="color:#55b6ff;"><i class="fa fa-info-circle"></i>单次上传不超过20000条</span>
+		<span class="f12" style="color:#55b6ff;"><i class="fa fa-info-circle"></i>单次上传不超过5000条</span>
 		<a style="float:right; padding-right: 30px;" ng-click="cancel()"><i class="fa fa-close"></i></a>
 	</div>
 </div>