diff --git a/src/main/java/com/wms/utils/excel/listener/UploadDbsListener.java b/src/main/java/com/wms/utils/excel/listener/UploadDbsListener.java index 7e6275f..3f8826a 100644 --- a/src/main/java/com/wms/utils/excel/listener/UploadDbsListener.java +++ b/src/main/java/com/wms/utils/excel/listener/UploadDbsListener.java @@ -77,11 +77,14 @@ public class UploadDbsListener implements ReadListener { throw new RuntimeException("第" + rowCount + "行DBS开工日期" + kateDbsExcelVo.getPlanStartDate().toLocalDate() + "为非工作日。"); } cachedDataList.add(kateDbsExcelVo); - } - if (!isAddReqmtDate) { - // 缺少开工日期 - logger.error("第{}行DBS缺少开工日期。", rowCount); - throw new RuntimeException("第" + rowCount + "行DBS缺少开工日期。"); + } else { + if (!isAddReqmtDate) { + // 缺少开工日期 + logger.error("第{}行DBS缺少开工日期。", rowCount); + throw new RuntimeException("第" + rowCount + "行DBS缺少开工日期。"); + } else { + cachedDataList.add(kateDbsExcelVo); + } } } // 达到BATCH_COUNT了,需要去存储一次数据库,防止数据几万条数据在内存,容易OOM diff --git a/src/main/java/com/wms/utils/excel/listener/UploadKateOrdersListener.java b/src/main/java/com/wms/utils/excel/listener/UploadKateOrdersListener.java index a3d7e94..35993ec 100644 --- a/src/main/java/com/wms/utils/excel/listener/UploadKateOrdersListener.java +++ b/src/main/java/com/wms/utils/excel/listener/UploadKateOrdersListener.java @@ -82,11 +82,14 @@ public class UploadKateOrdersListener implements ReadListener throw new RuntimeException("第" + rowCount + "行工单需求日期" + kateOrdersExcelVo.getPlanStartDate() + "为非工作日。"); } cachedDataList.add(kateOrdersExcelVo); - } - if (isAddReqmtDate) { - // 缺少开工日期 - logger.error("第{}行工单缺少需求日期。", rowCount); - throw new RuntimeException("第" + rowCount + "行工单缺少需求日期。"); + } else { + if (isAddReqmtDate) { + // 缺少开工日期 + logger.error("第{}行工单缺少需求日期。", rowCount); + throw new RuntimeException("第" + rowCount + "行工单缺少需求日期。"); + } else { + cachedDataList.add(kateOrdersExcelVo); + } } } }