sephiroth190326/EPCMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

访问请求条目数量修改、导入报错问题修复

Browse Source
This commit is contained in:
suncz
2024-05-29 08:51:35 +08:00
parent f6d68a2701
commit 8ce789d64b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/vverp/controller/admin/MaterialOrderController.java
View File

@@ -748,7 +748,7 @@ public class MaterialOrderController extends BaseController {
// map.put("loadFlag", false); // map.put("loadFlag", false);
// } // }
int pageSize = 100; int pageSize = 1000;
Pageable pageable = new Pageable(); Pageable pageable = new Pageable();
pageable.setPageNumber(nowSize / pageSize + 1); pageable.setPageNumber(nowSize / pageSize + 1);
pageable.setPageSize(pageSize); pageable.setPageSize(pageSize);

7
src/main/java/com/vverp/service/MaterialOrderService.java
View File

@@ -2,6 +2,7 @@ package com.vverp.service;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.comparator.CompareUtil;
import com.vverp.base.exception.ImportExcelException; import com.vverp.base.exception.ImportExcelException;
import com.vverp.dao.MaterialOrderDao; import com.vverp.dao.MaterialOrderDao;
import com.vverp.dto.CellDto; import com.vverp.dto.CellDto;
@@ -897,7 +898,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
MaterialOrderItem item = new MaterialOrderItem(); MaterialOrderItem item = new MaterialOrderItem();
if ("".equals(bigType) || productTypeMap.getOrDefault(bigType, null) == null) { if (bigType.isEmpty() || productTypeMap.getOrDefault(bigType, null) == null) {
// ProductType productType = new ProductType(); // ProductType productType = new ProductType();
// productType.setName(bigType); // productType.setName(bigType);
// productType.setLevel(1); // productType.setLevel(1);
@@ -916,7 +917,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
item.setBigProductDes( productTypeMap.get(bigType).getTypeDescribe()); item.setBigProductDes( productTypeMap.get(bigType).getTypeDescribe());
} }
if (smallType.equals("") || productTypeMap.getOrDefault(smallType, null) == null) { if (smallType.isEmpty() || productTypeMap.getOrDefault(smallType, null) == null) {
// throw new RuntimeException(smallType+"小类不存在"); // throw new RuntimeException(smallType+"小类不存在");
// ProductType parent = productTypeMap.get(bigType); // ProductType parent = productTypeMap.get(bigType);
// ProductType productType = new ProductType(); // ProductType productType = new ProductType();
@@ -961,7 +962,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
Long productTypeId = product.getProductType().getId(); Long productTypeId = product.getProductType().getId();
if (!smallType.equals("")) { if (!smallType.equals("")) {
product.setProductType(productTypeMap.get(smallType)); product.setProductType(productTypeMap.get(smallType));
}else { }else if(!bigType.equals("")){
product.setProductType(productTypeMap.get(bigType)); product.setProductType(productTypeMap.get(bigType));
} }
if (!productTypeId.equals(product.getProductType().getId())) { if (!productTypeId.equals(product.getProductType().getId())) {