|
@@ -550,7 +550,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
|
|
|
UpdateWrapper<SyPreAssembledPackingList> wrapper=new UpdateWrapper<>();
|
|
|
if(code.equals("S")){
|
|
|
wrapper.set("push_Status","1");//推送过去
|
|
|
- wrapper.in(" id",ids);
|
|
|
+ wrapper.in(" id",ids);
|
|
|
}else{
|
|
|
wrapper.set("push_Status","2");//推送失败
|
|
|
wrapper.in(" id",ids);
|
|
@@ -1407,7 +1407,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
|
|
|
sheet.getRow(0).getCell(i).getStringCellValue()+"未填值!");
|
|
|
}
|
|
|
cell.setCellType(CellType.STRING);//获取的都转换成String
|
|
|
- if(cell.getStringCellValue().length()<1&&!nums.contains(sheet.getRow(0).getCell(i).getStringCellValue())){
|
|
|
+ if(cell.getStringCellValue().length()<1&&!nums.contains(i)){
|
|
|
throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
|
|
|
sheet.getRow(0).getCell(i).getStringCellValue()+"未填值!");
|
|
|
}
|
|
@@ -1510,7 +1510,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
|
|
|
}
|
|
|
cell.setCellType(CellType.STRING);//获取的都转换成String
|
|
|
if(cell.getStringCellValue().length()<1&&x>0&&!nums.contains(i)){
|
|
|
- System.out.println("报错了\t第"+(i+1)+"个\t"+sheet.getRow(0).getCell(i).getStringCellValue());
|
|
|
throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
|
|
|
sheet.getRow(0).getCell(i).getStringCellValue()+"未填值!");
|
|
|
}
|
|
@@ -1520,7 +1519,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
|
|
|
}
|
|
|
if(list.contains(cell.getStringCellValue())){
|
|
|
nums.add(i);
|
|
|
- System.out.println("字段\t"+cell.getStringCellValue()+"\t"+i);
|
|
|
}
|
|
|
}else{
|
|
|
if((i>7&&i<row.getLastCellNum()-13)||i==row.getLastCellNum()-4){
|
|
@@ -1543,7 +1541,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
|
|
|
main.setSyPreAssembledPackingListItemList(items);//获取集合
|
|
|
mains.add(main);
|
|
|
}
|
|
|
- System.out.println("mains\t"+mains);
|
|
|
return syPreAssembledPackingListService.test(mains);
|
|
|
}
|
|
|
|