|
|
@@ -472,7 +472,10 @@ public class SyPackingListFabricController {
|
|
|
InputStream inputStream=file.getInputStream();
|
|
|
Workbook workbook=new XSSFWorkbook(inputStream);
|
|
|
Map<String,SyPackingListFabric> maps=refreshSheet(workbook);
|
|
|
- syPackingListFabricService.excelAdd(maps);//循环
|
|
|
+ boolean bool= syPackingListFabricService.excelAdd(maps);//循环
|
|
|
+ if(bool==false){
|
|
|
+ return Result.error("文件导入失败");
|
|
|
+ }
|
|
|
return Result.OK("文件导入成功！数据行数:" + maps.size());
|
|
|
} catch (Exception e) {
|
|
|
log.error(e.getMessage(),e);
|
|
|
@@ -519,8 +522,9 @@ public class SyPackingListFabricController {
|
|
|
while (sheets.hasNext()){
|
|
|
Sheet sheet=(Sheet) sheets.next();
|
|
|
SyPackingListFabric main =new SyPackingListFabric();
|
|
|
+ List<SyPackingListFabricItem> items=new ArrayList<>();
|
|
|
List<String> mainStrs=new ArrayList<>();
|
|
|
- for (int x=0;x<=sheet.getLastRowNum();x++){
|
|
|
+ for (int x=0;x<sheet.getLastRowNum()-1;x++){
|
|
|
Row row=sheet.getRow(x);
|
|
|
if(x<2) {
|
|
|
mainStrs.add(row.getCell(4)==null?"":row.getCell(4).toString());
|
|
|
@@ -530,27 +534,29 @@ public class SyPackingListFabricController {
|
|
|
}else if(x==2){
|
|
|
main =new SyPackingListFabric(mainStrs.toArray(new String[mainStrs.size()]));
|
|
|
}else if(x>3){
|
|
|
+ if(oConvertUtils.isEmpty(row.getCell(1))||row.getCell(1).toString().length()<10){//如果这一列为空就退出
|
|
|
+ break;
|
|
|
+ }
|
|
|
List<String> itemStrs=new ArrayList<>();
|
|
|
for (int i=0;i<row.getLastCellNum();i++){
|
|
|
Cell cell=row.getCell(i);
|
|
|
if(i<18&&i>14){
|
|
|
if(cell==null||cell.equals("")||cell.toString().length()<1){
|
|
|
- throw new JeecgBootException("请填写第"+x+"行里的"+sheet.getRow(3).getCell(i));
|
|
|
+ throw new JeecgBootException("请填写第"+(x+1)+"行里的"+sheet.getRow(3).getCell(i));
|
|
|
}
|
|
|
}
|
|
|
itemStrs.add(cell.toString());
|
|
|
}
|
|
|
SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]));
|
|
|
- if(!maps.containsKey(syPackingListFabricItem.getGarmentFactory())){
|
|
|
- //main.setGarmentFactory(syPackingListFabricItem.getGarmentFactory());//成衣工厂
|
|
|
- main.setSyPackingListFabricItem(new ArrayList<>());
|
|
|
- main.getSyPackingListFabricItem().add(syPackingListFabricItem);
|
|
|
- maps.put(syPackingListFabricItem.getGarmentFactory(),main);
|
|
|
- }else{
|
|
|
- maps.get(syPackingListFabricItem.getGarmentFactory()).getSyPackingListFabricItem().add(syPackingListFabricItem);
|
|
|
- }
|
|
|
+ items.add(syPackingListFabricItem);
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
+ main.setSyPackingListFabricItem(items);
|
|
|
+ if(main.getGarmentFactory()!=null){
|
|
|
+ maps.put(main.getGarmentFactory(),main);
|
|
|
+ }else{
|
|
|
+ maps.put(sheet.getSheetName(),main);
|
|
|
+ }
|
|
|
}
|
|
|
return maps;
|
|
|
}
|
huxy