|
@@ -524,7 +524,7 @@ public class SyPackingListFabricController {
|
|
|
SyPackingListFabric main =new SyPackingListFabric();
|
|
|
List<SyPackingListFabricItem> items=new ArrayList<>();
|
|
|
List<String> mainStrs=new ArrayList<>();
|
|
|
- for (int x=0;x<sheet.getLastRowNum()-1;x++){
|
|
|
+ for (int x=0;x<=sheet.getLastRowNum();x++){
|
|
|
Row row=sheet.getRow(x);
|
|
|
if(x<2) {
|
|
|
mainStrs.add(row.getCell(4)==null?"":row.getCell(4).toString());
|
|
@@ -533,7 +533,7 @@ public class SyPackingListFabricController {
|
|
|
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){
|
|
|
+ }else if(x>3){
|
|
|
if(oConvertUtils.isEmpty(row.getCell(1))||row.getCell(1).toString().length()<10){//如果这一列为空就退出
|
|
|
break;
|
|
|
}
|