面辅料导入调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -814,6 +814,9 @@ public class SyPackingListFabricController implements Job {
 			 List<String> mainStrs=new ArrayList<>();
 			 for (int x=0;x<=sheet.getLastRowNum();x++){
 				 Row row=sheet.getRow(x);
+				 if (row==null){
+				 	break;
+				 }
 				 if(x<2) {
 					 mainStrs.add(row.getCell(4)==null?"":row.getCell(4).toString());
 					 mainStrs.add(row.getCell(8)==null?"":row.getCell(8).toString());
@@ -823,7 +826,7 @@ public class SyPackingListFabricController implements Job {
 				 }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){//如果这一列为空就退出
+					 if(row.getCell(1)==null||row.getCell(1).toString().length()<10){//如果这一列为空就退出
 						 break;
 					 }
 					 List<String> itemStrs=new ArrayList<>();