From f42440e32e5cb2b059d60435b40d7c9816bc4d9a Mon Sep 17 00:00:00 2001
From: qinyulong <yulong.qin@ceict.com.cn>
Date: Tue, 13 Jan 2026 17:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BD=9C=E4=B8=9A=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9+sql=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pojo/entity/EquipmentEntity.java   | 27 +------------------
 .../desk/device/mapper/EquipmentMapper.xml    |  2 +-
 .../service/impl/EquipmentServiceImpl.java    |  2 +-
 doc/sql/mes/increase-260113.sql               |  5 ++++
 4 files changed, 8 insertions(+), 28 deletions(-)
 create mode 100644 doc/sql/mes/increase-260113.sql

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 1de7aa0c..bd61a14d 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
@@ -1,28 +1,3 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
 package org.springblade.desk.device.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -153,7 +128,7 @@ public class EquipmentEntity extends BaseEntity {
 	 * 作业中心ID
 	 */
 	@Schema(description = "作业中心ID")
-	private Long workstationId;
+	private Long workCenterId;
 	public void setDocking(String docking) {
 		// 核心逻辑：如果传入的是 null 或空字符串，则使用默认值 "0"
 		if (docking == null || docking.trim().isEmpty()) {
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 d8632dfd..7713186b 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
@@ -27,7 +27,7 @@
         <result column="IS_DELETED" property="isDeleted"/>
         <result column="ATTACH_LINK" property="attachLink"/>
         <result column="EQUIPMENT_LOCATION" property="equipmentLocation"/>
-        <result column="WORKSTATION_ID" property="workstationId"/>
+        <result column="WORK_CENTER_ID" property="workCenterId"/>
     </resultMap>
     <!-- 定义结果映射，将查询结果的列映射到VO的属性上 -->
     <resultMap id="EquipmentStatusStatisticsResultMap"
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
index 743691a2..302b4e26 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
@@ -66,7 +66,7 @@ public class EquipmentServiceImpl extends BaseServiceImpl<EquipmentMapper, Equip
 				.like(Objects.nonNull(equipment.getEquipmentLocation()), EquipmentEntity::getEquipmentLocation, equipment.getEquipmentLocation())
 				.eq(Objects.nonNull(equipment.getUsed()), EquipmentEntity::getUsed, equipment.getUsed())
 				.eq(Objects.nonNull(equipment.getVirtualMac()), EquipmentEntity::getVirtualMac, equipment.getVirtualMac())
-				.eq(Objects.nonNull(equipment.getWorkstationId()), EquipmentEntity::getWorkstationId, equipment.getWorkstationId());
+				.eq(Objects.nonNull(equipment.getWorkCenterId()), EquipmentEntity::getWorkCenterId, equipment.getWorkCenterId());
 		// 3. 执行分页查询
 		return baseMapper.selectPage(page, wrapper);
 	}
diff --git a/doc/sql/mes/increase-260113.sql b/doc/sql/mes/increase-260113.sql
new file mode 100644
index 00000000..c61bf037
--- /dev/null
+++ b/doc/sql/mes/increase-260113.sql
@@ -0,0 +1,5 @@
+--设备作业中心字段修改
+ALTER TABLE MES_EQUIPMENT
+    MODIFY (WORKSTATION_ID NUMBER (20,0));
+ALTER TABLE MES_EQUIPMENT RENAME COLUMN WORKSTATION_ID TO WORK_CENTER_ID;
+