From 8cd4e3664cc33705b9c68ac278f40e40cf258ecb Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 19 五月 2025 18:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java
index d6f9650..c392f97 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java
@@ -119,12 +119,14 @@
for (int i = 1; i <= rows; i++) {
Row row = sheet.getRow(i);
String mo = row.getCell(0).getStringCellValue();
+ if (StringUtils.isEmpty(mo)){
+ continue;
+ }
String factory = row.getCell(1).getStringCellValue();
String materialNum = row.getCell(2).getStringCellValue();
double quantity = row.getCell(3).getNumericCellValue();
Date planEnd = row.getCell(4).getDateCellValue();
- if (StringUtils.isNotBlank(mo) &&
- StringUtils.isNotBlank(factory) &&
+ if (StringUtils.isNotBlank(factory) &&
StringUtils.isNotBlank(materialNum) &&
planEnd != null) {
ApsGasPipelineMo apsGasPipelineMo = new ApsGasPipelineMo();
--
Gitblit v1.9.3