装箱单导入bug修复

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1398,6 +1398,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             list.add("净净重");
             for (int x=0;x<=sheet.getLastRowNum();x++){
                 Row row=sheet.getRow(x);//列
+                if(row==null){
+                    continue;
+                }
                 Cell cell2=row.getCell(0);
                 if(cell2==null){//如果这一列为空就退出
                     continue;
@@ -1514,6 +1517,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             for (int x=0;x<=sheet.getLastRowNum();x++){
                 //System.out.println("sheet.getLastRowNum()\t"+sheet.getLastRowNum());
                 Row row=sheet.getRow(x);//列
+                if(row==null){
+                    continue;
+                }
                 Cell cell2=row.getCell(0);
                 if(cell2==null){//如果这一列为空就退出
                     continue;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -891,6 +891,11 @@ public class SyPackingListTailoringController {
 				 String str1="";//尺码比例
 				 String strMain="";
 				 Row row=sheet.getRow(x);//列
+
+				 if(row==null){
+				 	continue;
+				 }
+
 				 if(oConvertUtils.isEmpty(row.getCell(1))){//如果这一列为空就退出
 				 	continue;
 				 }
@@ -990,6 +995,9 @@ public class SyPackingListTailoringController {
 				 String str1="";//尺码比例
 				 String strMain="";
 				 Row row=sheet.getRow(x);//列
+				 if(row==null){
+				 	continue;
+				 }
 				 if(oConvertUtils.isEmpty(row.getCell(1))){//如果这一列为空就退出
 					 continue;
 				 }