阿伏兔 пре 4 година
родитељ
комит
91ccc28dd3

+ 6 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -4125,6 +4125,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
                 TWarehousebillsitems warehousebillsitems = new TWarehousebillsitems();
                 for (int a = 0; a < rows.getPhysicalNumberOfCells(); a++) {
+                    if (StringUtils.isNull(rows.getCell(a))) {
+                        continue;
+                    }
                     Cell cell = rows.getCell(a);
                     String value = filter(sheet.getRow(0), CellReference.convertNumToColString(cell.getColumnIndex()));
                     switch (value) {
@@ -4165,7 +4168,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             break;
                     }
                 }
-                itemList.add(warehousebillsitems);
+                if (StringUtils.isNotEmpty(warehousebillsitems.getfCntrno())) {
+                    itemList.add(warehousebillsitems);
+                }
             }
         } catch (IOException e) {
             return AjaxResult.error("上传文件失败,请检查文件是否损坏");