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/ParaThreadingToolController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java
index a4db31b..58f1c6a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java
@@ -513,6 +513,21 @@
paraThreadingTool.setConnectionAperture(ExcelUtils.getCellValueAsString(cell34));
Cell cell35 = row.getCell(35);//杩炴帴閿Ы
paraThreadingTool.setConnectingKeyway(ExcelUtils.getCellValueAsString(cell35));
+ Cell cell36 = row.getCell(36);//闆嗗洟鍏徃缂栫爜
+ paraThreadingTool.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell36));
+ Cell cell37 = row.getCell(37);//闆嗗洟鍏徃鏍囪
+ if (cell37 == null || cell37.getCellType() == CellType.BLANK) {
+ //鏍囪涓虹┖锛屾嫾鎺�
+ String sign = ExcelUtils.getCellValueAsString(cell7)//涓枃鍚嶇О
+ + "-" + ExcelUtils.getCellValueAsString(cell11)//鍨嬪彿/鍥惧彿
+ + "-" + ExcelUtils.getCellValueAsString(cell13)//铻虹汗浠ｅ彿
+ + "-" + ExcelUtils.getCellValueAsString(cell14);//铻鸿窛
+ paraThreadingTool.setGroupCompanySign(sign);
+ } else {
+ paraThreadingTool.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell37));
+ }
+ Cell cell38 = row.getCell(38);//宸ュ叿绠�绉�
+ paraThreadingTool.setShortCalled(ExcelUtils.getCellValueAsString(cell38));
paraThreadingToolImportList.add(paraThreadingTool);
successLines++;
--
Gitblit v1.9.3