From 6fe8a990494bbe6e62a80ab5cc47714ba00c510d Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Wed, 14 Jan 2026 16:59:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=AF=BC=E5=85=A5=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=92=8Cdbs=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/utils/excel/listener/UploadDbsListener.java | 13 ++++++++----- .../excel/listener/UploadKateOrdersListener.java | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) 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); + } } } }