From e5a96bc789ca0252e31fd2e01bec5e471a02c0d6 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 22 五月 2025 17:57:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java | 10 ++++++++--
1 files changed, 8 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..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,17 +118,23 @@
/*鏁版嵁鍒椾粠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;
+ }
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();
apsGasPipelineMo.setMo(mo);
+ apsGasPipelineMo.setMaterialCode(materialNum);
apsGasPipelineMo.setId(IdUtil.getSnowflakeNextId());
apsGasPipelineMo.setFactory(factory);
apsGasPipelineMo.setCreateBy(SecurityUtils.getUsername());
--
Gitblit v1.9.3