From 9722720ebb601af58fa4c56d4d71514eefdfdc2a Mon Sep 17 00:00:00 2001
From: qinyulong <yulong.qin@ceict.com.cn>
Date: Mon, 12 Jan 2026 16:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=AD=97=E6=AE=B5=E8=AE=BE=E5=A4=87=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=BD=9C=E4=B8=9A=E4=B8=AD=E5=BF=83ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/device/pojo/entity/EquipmentEntity.java      | 11 ++++++++++-
 .../desk/device/pojo/excel/EquipmentExcel.java        |  6 ++++++
 .../desk/device/mapper/EquipmentMapper.xml            |  2 ++
 doc/sql/mes/increase-260108.sql                       | 11 ++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
index 120f7807..1de7aa0c 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
@@ -144,7 +144,16 @@ public class EquipmentEntity extends BaseEntity {
 	 */
 	@Schema(description = "附件链接")
 	private String attachLink;
-
+	/**
+	 * 设备位置
+	 */
+	@Schema(description = "设备位置")
+	private String equipmentLocation;
+	/**
+	 * 作业中心ID
+	 */
+	@Schema(description = "作业中心ID")
+	private Long workstationId;
 	public void setDocking(String docking) {
 		// 核心逻辑：如果传入的是 null 或空字符串，则使用默认值 "0"
 		if (docking == null || docking.trim().isEmpty()) {
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/EquipmentExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/EquipmentExcel.java
index 6b34982c..cdbe1b3a 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/EquipmentExcel.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/EquipmentExcel.java
@@ -124,8 +124,14 @@ public class EquipmentExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("设备分类")
 	private String categorys;
+	/**
+	 * 设备位置
+	 */
 	@ColumnWidth(20)
+	@ExcelProperty("设备位置")
+	private String equipmentLocation;
 
+	@ColumnWidth(20)
 	@ExcelProperty("附件链接")
 	private String attachLink;
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml
index d8df87f0..d8632dfd 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml
@@ -26,6 +26,8 @@
         <result column="STATUS" property="status"/>
         <result column="IS_DELETED" property="isDeleted"/>
         <result column="ATTACH_LINK" property="attachLink"/>
+        <result column="EQUIPMENT_LOCATION" property="equipmentLocation"/>
+        <result column="WORKSTATION_ID" property="workstationId"/>
     </resultMap>
     <!-- 定义结果映射，将查询结果的列映射到VO的属性上 -->
     <resultMap id="EquipmentStatusStatisticsResultMap"
diff --git a/doc/sql/mes/increase-260108.sql b/doc/sql/mes/increase-260108.sql
index ecc45c7a..6de3a33b 100644
--- a/doc/sql/mes/increase-260108.sql
+++ b/doc/sql/mes/increase-260108.sql
@@ -362,4 +362,13 @@ ON TABLE MES_EQUIPMENT_MAINTENANCE IS '岗位设备维护';
 ALTER TABLE MES_CULTIVATE_DETAIL
     ADD (FINISH_TIME DATE);
 COMMENT
-ON COLUMN MES_CULTIVATE_DETAIL.FINISH_TIME IS '完成时间'
\ No newline at end of file
+ON COLUMN MES_CULTIVATE_DETAIL.FINISH_TIME IS '完成时间'
+
+--设备增加列
+ALTER TABLE MES_EQUIPMENT
+    ADD (EQUIPMENT_LOCATION NVARCHAR2(255))
+ADD (WORKSTATION_ID NUMBER(11));
+COMMENT
+ON COLUMN MES_EQUIPMENT.EQUIPMENT_LOCATION IS '设备位置';
+COMMENT
+ON COLUMN MES_EQUIPMENT.WORKSTATION_ID IS '作业中心ID';
\ No newline at end of file