From a065e80bfc4a9f16c7e32f2d1a55013955a40d3c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 20 六月 2025 15:05:17 +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