|
@@ -466,7 +466,6 @@ public class SyPackingListFabricController {
|
|
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
|
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
|
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
|
|
- System.out.println("新增");
|
|
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()){
|
|
|
try {
|
|
|
MultipartFile file = entity.getValue();// 获取上传文件对象
|
|
@@ -496,7 +495,6 @@ public class SyPackingListFabricController {
|
|
|
public Result<?> importExcel2(HttpServletRequest request, HttpServletResponse response) throws IOException {
|
|
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
|
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
|
|
- System.out.println("测试");
|
|
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()){
|
|
|
try {
|
|
|
MultipartFile file = entity.getValue();// 获取上传文件对象
|
|
@@ -515,14 +513,23 @@ public class SyPackingListFabricController {
|
|
|
return Result.OK("文件导入失败!");
|
|
|
}
|
|
|
|
|
|
- public Map<String,SyPackingListFabric> refreshSheet(Workbook workbook1) {
|
|
|
+ public Map<String,SyPackingListFabric> refreshSheet(Workbook workbook1) throws ParseException {
|
|
|
Map<String,SyPackingListFabric> maps=new HashMap<>();
|
|
|
Iterator sheets=workbook1.sheetIterator();
|
|
|
while (sheets.hasNext()){
|
|
|
Sheet sheet=(Sheet) sheets.next();
|
|
|
+ SyPackingListFabric main =new SyPackingListFabric();
|
|
|
+ List<String> mainStrs=new ArrayList<>();
|
|
|
for (int x=0;x<=sheet.getLastRowNum();x++){
|
|
|
Row row=sheet.getRow(x);
|
|
|
- if(x>3){
|
|
|
+ if(x<2) {
|
|
|
+ mainStrs.add(row.getCell(4)==null?"":row.getCell(4).toString());
|
|
|
+ mainStrs.add(row.getCell(8)==null?"":row.getCell(8).toString());
|
|
|
+ mainStrs.add(row.getCell(12)==null?"":row.getCell(12).toString());
|
|
|
+ mainStrs.add(row.getCell(16)==null?"":row.getCell(16).toString());
|
|
|
+ }else if(x==2){
|
|
|
+ main =new SyPackingListFabric(mainStrs.toArray(new String[mainStrs.size()]));
|
|
|
+ }else if(x>3){
|
|
|
List<String> itemStrs=new ArrayList<>();
|
|
|
for (int i=0;i<row.getLastCellNum();i++){
|
|
|
Cell cell=row.getCell(i);
|
|
@@ -535,8 +542,7 @@ public class SyPackingListFabricController {
|
|
|
}
|
|
|
SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]));
|
|
|
if(!maps.containsKey(syPackingListFabricItem.getGarmentFactory())){
|
|
|
- SyPackingListFabric main =new SyPackingListFabric();
|
|
|
- main.setGarmentFactory(syPackingListFabricItem.getGarmentFactory());//成衣工厂
|
|
|
+ //main.setGarmentFactory(syPackingListFabricItem.getGarmentFactory());//成衣工厂
|
|
|
main.setSyPackingListFabricItem(new ArrayList<>());
|
|
|
main.getSyPackingListFabricItem().add(syPackingListFabricItem);
|
|
|
maps.put(syPackingListFabricItem.getGarmentFactory(),main);
|
|
@@ -544,7 +550,7 @@ public class SyPackingListFabricController {
|
|
|
maps.get(syPackingListFabricItem.getGarmentFactory()).getSyPackingListFabricItem().add(syPackingListFabricItem);
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
return maps;
|
|
|
}
|