|
@@ -2,6 +2,7 @@ package com.ruoyi.admin.test.base;
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.comparator.CompareUtil;
|
|
|
+import cn.hutool.core.io.FileUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ruoyi.RuoYiApplication;
|
|
@@ -14,6 +15,7 @@ import com.ruoyi.base.service.IBaseLocationInfoService;
|
|
|
import com.ruoyi.base.service.IBaseSkuService;
|
|
|
import com.ruoyi.common.constant.Constants;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
+import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
import io.netty.util.internal.StringUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.compress.utils.Lists;
|
|
@@ -23,7 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.boot.test.context.SpringBootTest;
|
|
|
import org.springframework.test.context.junit4.SpringRunner;
|
|
|
import org.springframework.util.Assert;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import java.io.File;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -75,14 +79,14 @@ public class ProcessLocationTest {
|
|
|
Assert.isTrue(CollectionUtil.isNotEmpty(skuTypeMapping), "skuTypeMapping is empty");
|
|
|
|
|
|
//2.到Excel中查询数据
|
|
|
- //TODO
|
|
|
- /*MultipartFile multipartFile = null;
|
|
|
+ //TODO 从路径获取文件
|
|
|
+ File excelFile = FileUtil.file("\"C:\\Users\\ChenYang\\Desktop\\123.xlsx\"");
|
|
|
ExcelUtil<ExcelLocLotModel> locLotModelExcelUtil = new ExcelUtil<ExcelLocLotModel>(ExcelLocLotModel.class);
|
|
|
- List<ExcelLocLotModel> ExcelLocLotList = locLotModelExcelUtil.importExcel(multipartFile.getInputStream());*/
|
|
|
+ List<ExcelLocLotModel> ExcelLocLotList = locLotModelExcelUtil.importExcel(FileUtil.getInputStream(excelFile));
|
|
|
|
|
|
-
|
|
|
- String LocLotJsonInfo = "[{\"locationNo\":\"A-01-04\",\"bindSku\":\"EMP_TRAY_BAG\",\"quantity\":2},{\"locationNo\":\"A-01-08\"},{\"locationNo\":\"A-05-03\",\"bindSku\":\"EMP_TRAY_BUC\"},{\"locationNo\":\"A-02-08\",\"bindSku\":\"(NH4)2SO4\",\"quantity\":10}]";
|
|
|
- List<ExcelLocLotModel> ExcelLocLotList = JSONObject.parseArray(LocLotJsonInfo, ExcelLocLotModel.class);
|
|
|
+ //2.转json
|
|
|
+ /*String LocLotJsonInfo = "[{\"locationNo\":\"A-01-02\",\"bindSku\":\"C4H9O2PSSNH4\",\"quantity\":50,\"palletNo\":\"TP0023\"},{\"locationNo\":\"A-01-02\",\"bindSku\":\"C4H9O2PSSNH4\",\"quantity\":50,\"palletNo\":\"TP0023\"}]";
|
|
|
+ List<ExcelLocLotModel> ExcelLocLotList = JSONObject.parseArray(LocLotJsonInfo, ExcelLocLotModel.class);*/
|
|
|
List<ExcelLocLotModel> errorLocLotList = Lists.newArrayList();
|
|
|
for(ExcelLocLotModel locLotModel : ExcelLocLotList){
|
|
|
try {
|