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/ParaMillToolController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaMillToolController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaMillToolController.java
index 441e08c..43b7694 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaMillToolController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaMillToolController.java
@@ -530,6 +530,22 @@
paraMillTool.setPitch(ExcelUtils.getCellValueAsString(cell44));
Cell cell45 = row.getCell(45);//鏈�灏忓姞宸ョ洿寰�
paraMillTool.setRecentlyDiameter(ExcelUtils.getCellValueAsString(cell45));
+ Cell cell46 = row.getCell(46);//闆嗗洟鍏徃缂栫爜
+ paraMillTool.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell46));
+ Cell cell47 = row.getCell(47);//闆嗗洟鍏徃鏍囪
+ if (cell47 == null || cell47.getCellType() == CellType.BLANK) {
+ //鏍囪涓虹┖锛屾嫾鎺�
+ String sign = ExcelUtils.getCellValueAsString(cell7)//涓崍鍚嶇О
+ + "-" + ExcelUtils.getCellValueAsString(cell11)//鍨嬪彿/鍥惧彿
+ + "-" + ExcelUtils.getCellValueAsString(cell13)//鍒�鍏风洿寰�
+ //+ "-" + ExcelUtils.getCellValueAsString()//绔垉搴曡瀛楁涓嶆槑纭紝鍏堢┖鐫�
+ + "-" + ExcelUtils.getCellValueAsString(cell17);//鍒�鍏锋�婚暱
+ paraMillTool.setGroupCompanySign(sign);
+ } else {
+ paraMillTool.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell47));
+ }
+ Cell cell48 = row.getCell(48);//宸ュ叿绠�绉�
+ paraMillTool.setShortCalled(ExcelUtils.getCellValueAsString(cell48));
paraMillToolImportList.add(paraMillTool);
successLines++;
--
Gitblit v1.9.3