From d2119be0539292e0885ca0670e791fd69ba1f875 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 10:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index ab2dd0c..56d59d2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -762,6 +762,7 @@
// 鍒涘缓椤圭洰璇︽儏
EamMaintenanceStandardDetail detail = new EamMaintenanceStandardDetail();
detail.setStandardId(standard.getId());
+ detail.setItemCode(Integer.parseInt(getCellStringValue(row.getCell(0))));
detail.setItemName(getCellStringValue(row.getCell(1)));
detail.setItemCategory(itemCategory);
@@ -1044,15 +1045,17 @@
if (!items.isEmpty()) {
items.remove(0);
}
-
// 2. 涓虹己澶遍儴浣嶇殑鏁版嵁濉厖鍓嶄竴鏉＄殑淇濆吇閮ㄤ綅
String lastPart = "";
+ int i =1;
for (EamMaintenanceStandardDetail item : items) {
+ item.setItemCode(i);
if (item.getItemPart() != null && !item.getItemPart().isEmpty()) {
lastPart = item.getItemPart();
} else if (!lastPart.isEmpty()) {
item.setItemPart(lastPart);
}
+ i++;
}
}
}
--
Gitblit v1.9.3