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 +++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaHoleTools.java | 12 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaCommonToolController.java | 13 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.java | 15 +++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaBlade.java | 12 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java | 17 +++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java | 12 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java | 15 +++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaTurningTools.java | 12 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaMillToolController.java | 16 +++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaThreadingTool.java | 12 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaMillTool.java | 12 ++++
12 files changed, 163 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++;
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++;
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.java
index dc9a762..7ca2d50 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.java
@@ -526,6 +526,21 @@
paraHoleTools.setHeadsNumber(ExcelUtils.getCellValueAsString(cell44));
Cell cell45 = row.getCell(45);//閫傞厤鍒�搴�
paraHoleTools.setAdaptHolder(ExcelUtils.getCellValueAsString(cell45));
+ Cell cell46 = row.getCell(46);//闆嗗洟鍏徃缂栫爜
+ paraHoleTools.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(cell16);//鍒�鍏锋�婚暱
+ paraHoleTools.setGroupCompanySign(sign);
+ } else {
+ paraHoleTools.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell47));
+ }
+ Cell cell48 = row.getCell(48);//宸ュ叿绠�绉�
+ paraHoleTools.setShortCalled(ExcelUtils.getCellValueAsString(cell48));
paraHoleToolsImportList.add(paraHoleTools);
successLines++;
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++;
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++;
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++;
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaBlade.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaBlade.java
index f6f8290..1cb1513 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaBlade.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaBlade.java
@@ -168,6 +168,18 @@
@Excel(name = "鏈�灏忓姞宸ュ唴铻虹汗鍏О鐩村緞", width = 15)
@ApiModelProperty(value = "鏈�灏忓姞宸ュ唴铻虹汗鍏О鐩村緞")
private String minInternalThread;
+ /**闆嗗洟鍏徃缂栫爜*/
+ @Excel(name = "闆嗗洟鍏徃缂栫爜", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃缂栫爜")
+ private String groupCompanyCode;
+ /**闆嗗洟鍏徃鏍囪*/
+ @Excel(name = "闆嗗洟鍏徃鏍囪", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃鏍囪")
+ private String groupCompanySign;
+ /**宸ュ叿绠�绉�*/
+ @Excel(name = "宸ュ叿绠�绉�", width = 15)
+ @ApiModelProperty(value = "宸ュ叿绠�绉�")
+ private String shortCalled;
/**绉熸埛鍙�*/
@Excel(name = "绉熸埛鍙�", width = 15)
@ApiModelProperty(value = "绉熸埛鍙�")
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java
index 4c858c9..c73dac3 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java
@@ -80,6 +80,18 @@
@Excel(name = "闆朵欢鏉愭枡", width = 15)
@ApiModelProperty(value = "闆朵欢鏉愭枡")
private String partMaterial;
+ /**闆嗗洟鍏徃缂栫爜*/
+ @Excel(name = "闆嗗洟鍏徃缂栫爜", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃缂栫爜")
+ private String groupCompanyCode;
+ /**闆嗗洟鍏徃鏍囪*/
+ @Excel(name = "闆嗗洟鍏徃鏍囪", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃鏍囪")
+ private String groupCompanySign;
+ /**宸ュ叿绠�绉�*/
+ @Excel(name = "宸ュ叿绠�绉�", width = 15)
+ @ApiModelProperty(value = "宸ュ叿绠�绉�")
+ private String shortCalled;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaHoleTools.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaHoleTools.java
index 4aa685b..4a8a25d 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaHoleTools.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaHoleTools.java
@@ -204,6 +204,18 @@
@Excel(name = "閫傞厤鍒�搴�", width = 15)
@ApiModelProperty(value = "閫傞厤鍒�搴�")
private String adaptHolder;
+ /**闆嗗洟鍏徃缂栫爜*/
+ @Excel(name = "闆嗗洟鍏徃缂栫爜", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃缂栫爜")
+ private String groupCompanyCode;
+ /**闆嗗洟鍏徃鏍囪*/
+ @Excel(name = "闆嗗洟鍏徃鏍囪", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃鏍囪")
+ private String groupCompanySign;
+ /**宸ュ叿绠�绉�*/
+ @Excel(name = "宸ュ叿绠�绉�", width = 15)
+ @ApiModelProperty(value = "宸ュ叿绠�绉�")
+ private String shortCalled;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaMillTool.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaMillTool.java
index 65adcf7..5b64a90 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaMillTool.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaMillTool.java
@@ -204,6 +204,18 @@
@Excel(name = "鏈�杩戝姞宸ョ洿寰�", width = 15)
@ApiModelProperty(value = "鏈�杩戝姞宸ョ洿寰�")
private String recentlyDiameter;
+ /**闆嗗洟鍏徃缂栫爜*/
+ @Excel(name = "闆嗗洟鍏徃缂栫爜", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃缂栫爜")
+ private String groupCompanyCode;
+ /**闆嗗洟鍏徃鏍囪*/
+ @Excel(name = "闆嗗洟鍏徃鏍囪", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃鏍囪")
+ private String groupCompanySign;
+ /**宸ュ叿绠�绉�*/
+ @Excel(name = "宸ュ叿绠�绉�", width = 15)
+ @ApiModelProperty(value = "宸ュ叿绠�绉�")
+ private String shortCalled;
/**绉熸埛鍙�*/
@Excel(name = "绉熸埛鍙�", width = 15)
@ApiModelProperty(value = "绉熸埛鍙�")
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaThreadingTool.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaThreadingTool.java
index 1f7a941..f34c20b 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaThreadingTool.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaThreadingTool.java
@@ -164,6 +164,18 @@
@Excel(name = "杩炴帴閿Ы", width = 15)
@ApiModelProperty(value = "杩炴帴閿Ы")
private String connectingKeyway;
+ /**闆嗗洟鍏徃缂栫爜*/
+ @Excel(name = "闆嗗洟鍏徃缂栫爜", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃缂栫爜")
+ private String groupCompanyCode;
+ /**闆嗗洟鍏徃鏍囪*/
+ @Excel(name = "闆嗗洟鍏徃鏍囪", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃鏍囪")
+ private String groupCompanySign;
+ /**宸ュ叿绠�绉�*/
+ @Excel(name = "宸ュ叿绠�绉�", width = 15)
+ @ApiModelProperty(value = "宸ュ叿绠�绉�")
+ private String shortCalled;
/**绉熸埛鍙�*/
@Excel(name = "绉熸埛鍙�", width = 15)
@ApiModelProperty(value = "绉熸埛鍙�")
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaTurningTools.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaTurningTools.java
index af8e696..6ebc778 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaTurningTools.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaTurningTools.java
@@ -216,6 +216,18 @@
@Excel(name = "鏈�灏忓姞宸ョ洿寰�", width = 15)
@ApiModelProperty(value = "鏈�灏忓姞宸ョ洿寰�")
private String minDiameter;
+ /**闆嗗洟鍏徃缂栫爜*/
+ @Excel(name = "闆嗗洟鍏徃缂栫爜", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃缂栫爜")
+ private String groupCompanyCode;
+ /**闆嗗洟鍏徃鏍囪*/
+ @Excel(name = "闆嗗洟鍏徃鏍囪", width = 15)
+ @ApiModelProperty(value = "闆嗗洟鍏徃鏍囪")
+ private String groupCompanySign;
+ /**宸ュ叿绠�绉�*/
+ @Excel(name = "宸ュ叿绠�绉�", width = 15)
+ @ApiModelProperty(value = "宸ュ叿绠�绉�")
+ private String shortCalled;
/**绉熸埛鍙�*/
@Excel(name = "绉熸埛鍙�", width = 15)
@ApiModelProperty(value = "绉熸埛鍙�")
--
Gitblit v1.9.3