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/ParaTurningToolsController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java
index 2448abb..c1859cd 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java
@@ -533,6 +533,21 @@
paraTurningTools.setBladeThickness(ExcelUtils.getCellValueAsString(cell47));
Cell cell48 = row.getCell(48);//鏈�灏忓姞宸ョ洿寰�
paraTurningTools.setMinDiameter(ExcelUtils.getCellValueAsString(cell48));
+ Cell cell49 = row.getCell(49);//闆嗗洟鍏徃缂栫爜
+ paraTurningTools.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell49));
+ Cell cell50 = row.getCell(50);//闆嗗洟鍏徃鏍囪
+ if (cell50 == null || cell50.getCellType() == CellType.BLANK) {
+ //鏍囪涓虹┖锛屾嫾鎺�
+ String sign = ExcelUtils.getCellValueAsString(cell7)//涓枃鍚嶇О
+ + "-" + ExcelUtils.getCellValueAsString(cell11)//鍨嬪彿/鍥惧彿
+ + "-" + ExcelUtils.getCellValueAsString(cell13)//鍒�澶磋鏍�
+ + "-" + ExcelUtils.getCellValueAsString(cell15);//涓诲亸瑙�
+ paraTurningTools.setGroupCompanySign(sign);
+ } else {
+ paraTurningTools.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell50));
+ }
+ Cell cell51 = row.getCell(51);//宸ュ叿绠�绉�
+ paraTurningTools.setShortCalled(ExcelUtils.getCellValueAsString(cell51));
paraTurningToolsImportList.add(paraTurningTools);
successLines++;
--
Gitblit v1.9.3