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/ParaBladeController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java
index 3723d0e..819b610 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java
@@ -504,6 +504,23 @@
paraBlade.setPitch(ExcelUtils.getCellValueAsString(cell35));
Cell cell36 = row.getCell(36);//鏈�灏忓姞宸ュ唴铻虹汗鍏О鐩村緞
paraBlade.setMinInternalThread(ExcelUtils.getCellValueAsString(cell36));
+ Cell cell37 = row.getCell(37);//闆嗗洟鍏徃缂栫爜
+ paraBlade.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell37));
+ Cell cell38 = row.getCell(38);//闆嗗洟鍏徃鏍囪
+ if (cell38 == null || cell38.getCellType() == CellType.BLANK) {
+ //鏍囪涓虹┖锛屾嫾鎺�
+ String sign = ExcelUtils.getCellValueAsString(cell7)//涓枃鍚嶇О
+ + "-" + ExcelUtils.getCellValueAsString(cell11)//鍨嬪彿/鍥惧彿
+ + "-" + ExcelUtils.getCellValueAsString(cell13)//鍒�鐗囧舰鐘�
+ + "-" + ExcelUtils.getCellValueAsString(cell14)//鍒�鐗囬暱搴�
+ + "-" + ExcelUtils.getCellValueAsString(cell15)//鍒囧墛鍒冩暟
+ + "-" + ExcelUtils.getCellValueAsString(cell18);//鍒�灏朢
+ paraBlade.setGroupCompanySign(sign);
+ } else {
+ paraBlade.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell38));
+ }
+ Cell cell39 = row.getCell(39);//宸ュ叿绠�绉�
+ paraBlade.setShortCalled(ExcelUtils.getCellValueAsString(cell39));
paraBladeImportList.add(paraBlade);
successLines++;
--
Gitblit v1.9.3