From 48f5220bc5eb826402f43e440dc34867368ff17c Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 23 五月 2025 13:41:20 +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 | 4 ++++
1 files changed, 4 insertions(+), 0 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 c392f97..d714577 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
@@ -118,6 +118,9 @@
/*鏁版嵁鍒椾粠1寮�濮�*/
for (int i = 1; i <= rows; i++) {
Row row = sheet.getRow(i);
+ if (row.getCell(0) == null){
+ continue;
+ }
String mo = row.getCell(0).getStringCellValue();
if (StringUtils.isEmpty(mo)){
continue;
@@ -131,6 +134,7 @@
planEnd != null) {
ApsGasPipelineMo apsGasPipelineMo = new ApsGasPipelineMo();
apsGasPipelineMo.setMo(mo);
+ apsGasPipelineMo.setMaterialCode(materialNum);
apsGasPipelineMo.setId(IdUtil.getSnowflakeNextId());
apsGasPipelineMo.setFactory(factory);
apsGasPipelineMo.setCreateBy(SecurityUtils.getUsername());
--
Gitblit v1.9.3