预装箱单参照查询条件调整

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

@@ -194,7 +194,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             queryWrapper.like("t.documentNo", documentNo);//单据号
         }
         if(oConvertUtils.isNotEmpty(clientAbbreviation)){//客户
-            queryWrapper.like("t.customer_Abbreviation",clientAbbreviation);
+            queryWrapper.like("t.customerAbbreviation",clientAbbreviation);
         }
         if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
             queryWrapper.like("t.distributionPoint",distributionPoint);
@@ -1480,16 +1480,21 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                                 strs2.add(cell.getStringCellValue());
                             }
                         }else{
-                            if(cell==null){
-                                throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
-                                        sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
-                            }
-                            cell.setCellType(CellType.STRING);//获取的都转换成String
-                            if(cell.getStringCellValue().length()<1&&!nums.contains(i)){
+                            if(cell==null&&!nums.contains(i)){
                                 throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
                                         sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
+                            }else{
+                                if(cell!=null){
+                                    cell.setCellType(CellType.STRING);//获取的都转换成String
+                                    if(cell.getStringCellValue().length()<1&&!nums.contains(i)){
+                                        throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
+                                                sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
+                                    }
+                                    strs.add(cell.getStringCellValue());
+                                }else{
+                                    strs.add(null);
+                                }
                             }
-                            strs.add(cell.getStringCellValue());
                         }
                     }
                 }
@@ -1599,16 +1604,21 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                                 strs2.add(cell.getStringCellValue());
                             }
                         }else{
-                            if(cell==null){
-                                throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
-                                        sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
-                            }
-                            cell.setCellType(CellType.STRING);//获取的都转换成String
-                            if(cell.getStringCellValue().length()<1&&!nums.contains(i)){
+                            if(cell==null&&!nums.contains(i)){
                                 throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
                                         sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
+                            }else{
+                                if(cell!=null){
+                                    cell.setCellType(CellType.STRING);//获取的都转换成String
+                                    if(cell.getStringCellValue().length()<1&&!nums.contains(i)){
+                                        throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
+                                                sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
+                                    }
+                                    strs.add(cell.getStringCellValue());
+                                }else{
+                                    strs.add(null);
+                                }
                             }
-                            strs.add(cell.getStringCellValue());
                         }
                     }
                 }