From 73be743ff89b54fa14fb07afa72e6d833406a381 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 16 六月 2025 16:49:09 +0800
Subject: [PATCH] 工具管理-调整参数导入增加集团公司编码、标记、工具简称字段
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaCommonToolController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaCommonToolController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaCommonToolController.java
index b09c212..ba59624 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaCommonToolController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaCommonToolController.java
@@ -410,6 +410,19 @@
}
Cell cell14 = row.getCell(14);//闆朵欢鏉愭枡
paraCommonTool.setPartMaterial(ExcelUtils.getCellValueAsString(cell14));
+ Cell cell15 = row.getCell(15);//闆嗗洟鍏徃缂栫爜
+ paraCommonTool.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell15));
+ Cell cell16 = row.getCell(16);//闆嗗洟鍏徃鏍囪
+ if (cell16 == null || cell16.getCellType() == CellType.BLANK) {
+ //鏍囪涓虹┖锛屾嫾鎺�
+ String sign = ExcelUtils.getCellValueAsString(cell7)//涓枃鍚嶇О
+ + "-" + ExcelUtils.getCellValueAsString(cell11);//鍨嬪彿/鍥惧彿
+ paraCommonTool.setGroupCompanySign(sign);
+ } else {
+ paraCommonTool.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell16));
+ }
+ Cell cell17 = row.getCell(17);//宸ュ叿绠�绉�
+ paraCommonTool.setShortCalled(ExcelUtils.getCellValueAsString(cell17));
paraCommonToolImportList.add(paraCommonTool);
successLines++;
--
Gitblit v1.9.3