From e146067ae373f9385b9ddbb57c6eb7a933bf2561 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 10:10:41 +0800
Subject: [PATCH] 生产工序增加字段
---
src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java | 3 +
docs/routing_operation_plan_person.md | 103 ++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java | 6 ++
doc/20260615_add_plan_person_and_executor_to_routing_operation.sql | 15 +++++
src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml | 1
src/main/resources/mapper/technology/TechnologyOperationMapper.xml | 9 ++
src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml | 1
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java | 3 +
src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java | 9 +++
9 files changed, 149 insertions(+), 1 deletions(-)
diff --git a/doc/20260615_add_plan_person_and_executor_to_routing_operation.sql b/doc/20260615_add_plan_person_and_executor_to_routing_operation.sql
new file mode 100644
index 0000000..a3ac54d
--- /dev/null
+++ b/doc/20260615_add_plan_person_and_executor_to_routing_operation.sql
@@ -0,0 +1,15 @@
+# 鐢熶骇宸ュ簭鏂板璁″垝浜哄憳銆佽鍒掓墽琛屼汉鍛樸�佸伐搴忕被鍨嬪瓧娈�
+ALTER TABLE technology_operation
+ ADD plan_person bigint NULL COMMENT '璁″垝浜哄憳ID',
+ ADD executor bigint NULL COMMENT '璁″垝鎵ц浜哄憳ID',
+ ADD process_type varchar(255) NULL COMMENT '宸ュ簭绫诲瀷';
+
+ALTER TABLE technology_routing_operation
+ ADD plan_person bigint NULL COMMENT '璁″垝浜哄憳ID',
+ ADD executor bigint NULL COMMENT '璁″垝鎵ц浜哄憳ID',
+ ADD process_type varchar(255) NULL COMMENT '宸ュ簭绫诲瀷';
+
+ALTER TABLE production_order_routing_operation
+ ADD plan_person bigint NULL COMMENT '璁″垝浜哄憳ID',
+ ADD executor bigint NULL COMMENT '璁″垝鎵ц浜哄憳ID',
+ ADD process_type varchar(255) NULL COMMENT '宸ュ簭绫诲瀷';
diff --git a/docs/routing_operation_plan_person.md b/docs/routing_operation_plan_person.md
new file mode 100644
index 0000000..acd6387
--- /dev/null
+++ b/docs/routing_operation_plan_person.md
@@ -0,0 +1,103 @@
+# 鐢熶骇宸ュ簭鏂板璁″垝浜哄憳鍜岃鍒掓墽琛屼汉鍛�
+
+## 娑夊強椤甸潰
+
+- 鍩虹宸ュ簭绠＄悊椤甸潰锛坱echnology_operation / 宸ュ簭绠＄悊锛�
+- 宸ヨ壓璺嚎宸ュ簭绠＄悊椤甸潰锛坱echnology_routing_operation锛�
+- 鐢熶骇璁㈠崟宸ュ簭锛坧roduction_order_routing_operation锛�
+
+## API
+
+### 鍩虹宸ュ簭锛坱echnologyOperation锛�
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | /technologyOperation/listPage | 鍒嗛〉鏌ヨ |
+| GET | /technologyOperation/list | 鏌ヨ鍏ㄩ儴 |
+| POST | /technologyOperation/add | 鏂板 |
+| PUT | /technologyOperation/update | 淇敼 |
+| DELETE | /technologyOperation/batchDelete | 鎵归噺鍒犻櫎 |
+
+### 宸ヨ壓璺嚎宸ュ簭锛坱echnologyRoutingOperation锛�
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | /technologyRoutingOperation/page | 鍒嗛〉鏌ヨ |
+| GET | /technologyRoutingOperation/list | 鍒楄〃鏌ヨ |
+| GET | /technologyRoutingOperation/{id} | 璇︽儏 |
+| POST | /technologyRoutingOperation/add | 鏂板 |
+| PUT | /technologyRoutingOperation | 淇敼 |
+
+**鏂板鍝嶅簲/璇锋眰瀛楁锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭～ | 璇存槑 |
+|------|------|------|------|
+| planPerson | Long | 鍚� | 璁″垝浜哄憳ID |
+| executor | Long | 鍚� | 璁″垝鎵ц浜哄憳ID |
+| planPersonName | String | 鍚� | 璁″垝浜哄憳濮撳悕锛堝搷搴斿瓧娈碉紝鍚庣鑷姩鍏宠仈鏌ヨ锛� |
+| executorName | String | 鍚� | 璁″垝鎵ц浜哄憳濮撳悕锛堝搷搴斿瓧娈碉紝鍚庣鑷姩鍏宠仈鏌ヨ锛� |
+
+## 鍓嶇淇敼鐐�
+
+### 1. 琛ㄥ崟鏂板瀛楁
+
+鍦ㄥ伐搴忚〃鍗曚腑鏂板涓や釜浜哄憳閫夋嫨涓嬫媺妗嗭細
+
+```html
+<el-form-item label="璁″垝浜哄憳" prop="planPerson">
+ <el-select v-model="processForm.planPerson"
+ placeholder="璇烽�夋嫨璁″垝浜哄憳"
+ clearable
+ filterable
+ style="width: 100%">
+ <el-option v-for="item in employeeOptions"
+ :key="item.id"
+ :label="item.staffName"
+ :value="item.id" />
+ </el-select>
+</el-form-item>
+<el-form-item label="璁″垝鎵ц浜哄憳" prop="executor">
+ <el-select v-model="processForm.executor"
+ placeholder="璇烽�夋嫨璁″垝鎵ц浜哄憳"
+ clearable
+ filterable
+ style="width: 100%">
+ <el-option v-for="item in employeeOptions"
+ :key="item.id"
+ :label="item.staffName"
+ :value="item.id" />
+ </el-select>
+</el-form-item>
+```
+
+### 2. data 鏁版嵁
+
+```js
+data() {
+ return {
+ processForm: {
+ planPerson: null,
+ executor: null,
+ // ...鍏朵粬瀛楁
+ },
+ employeeOptions: [], // 鍛樺伐鍒楄〃锛岄渶浠庢帴鍙ｈ幏鍙�
+ }
+}
+```
+
+### 3. 琛ㄦ牸鍒楁柊澧�
+
+鍒楄〃涓彲鐩存帴浣跨敤鍚庣杩斿洖鐨勫鍚嶅睍绀猴細
+
+```html
+<el-table-column label="璁″垝浜哄憳" prop="planPersonName" />
+<el-table-column label="璁″垝鎵ц浜哄憳" prop="executorName" />
+```
+
+## 娉ㄦ剰浜嬮」
+
+- `planPerson` 鍜� `executor` 瀛樺偍鐨勬槸鍛樺伐ID锛圠ong绫诲瀷锛夛紝鎻愪氦琛ㄥ崟鏃朵紶ID
+- 鍝嶅簲涓� `planPersonName` 鍜� `executorName` 鐢卞悗绔�氳繃 `staff_on_job` 琛ㄨ嚜鍔ㄥ叧鑱旀煡璇紝鍓嶇鏃犻渶棰濆杞崲
+- 鍛樺伐涓嬫媺鍒楄〃鏁版嵁闇�浠庡憳宸ユ帴鍙ｈ幏鍙栵紙鍙傝�冪幇鏈� `employeeOptions` 鏁版嵁婧愶級
+- 鏁版嵁搴撹縼绉籗QL锛歚doc/20260615_add_plan_person_and_executor_to_routing_operation.sql`
+- 涓夊紶琛ㄥ潎鏀寔锛歚technology_operation`銆乣technology_routing_operation`銆乣production_order_routing_operation`
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
index 42208bf..108f0ad 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -76,4 +76,7 @@
@Schema(description = "璁″垝鎵ц浜哄憳ID")
private Long executor;
+
+ @Schema(description = "宸ュ簭绫诲瀷")
+ private String processType;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java
index 1433990..a96f749 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyOperationVo.java
@@ -9,4 +9,10 @@
@Data
@Schema(name = "TechnologyOperationVo瀵硅薄", description = "宸ュ簭杩斿洖瀵硅薄")
public class TechnologyOperationVo extends TechnologyOperation {
+
+ @Schema(description = "璁″垝浜哄憳濮撳悕")
+ private String planPersonName;
+
+ @Schema(description = "璁″垝鎵ц浜哄憳濮撳悕")
+ private String executorName;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java
index 1915946..0d50498 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyOperation.java
@@ -65,4 +65,13 @@
@Schema(description = "鏄惁鐢熶骇")
private Boolean isProduction;
+
+ @Schema(description = "璁″垝浜哄憳ID")
+ private Long planPerson;
+
+ @Schema(description = "璁″垝鎵ц浜哄憳ID")
+ private Long executor;
+
+ @Schema(description = "宸ュ簭绫诲瀷")
+ private String processType;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
index 1aaea44..322d9c0 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
@@ -67,4 +67,7 @@
@Schema(description = "璁″垝鎵ц浜哄憳ID")
private Long executor;
+
+ @Schema(description = "宸ュ簭绫诲瀷")
+ private String processType;
}
diff --git a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
index 84b1073..4fc54e8 100644
--- a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
@@ -16,6 +16,7 @@
<result column="type" property="type" />
<result column="plan_person" property="planPerson" />
<result column="executor" property="executor" />
+ <result column="process_type" property="processType" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
</resultMap>
diff --git a/src/main/resources/mapper/technology/TechnologyOperationMapper.xml b/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
index b09fdc2..6b63fa5 100644
--- a/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
@@ -14,13 +14,20 @@
<result column="is_quality" property="isQuality" />
<result column="type" property="type" />
<result column="device_ledger_id" property="deviceLedgerId" />
+ <result column="plan_person" property="planPerson" />
+ <result column="executor" property="executor" />
+ <result column="process_type" property="processType" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
</resultMap>
<select id="listPage" resultType="com.ruoyi.technology.bean.vo.TechnologyOperationVo">
- select *
+ select t.*,
+ sp.staff_name as planPersonName,
+ se.staff_name as executorName
from technology_operation t
+ left join staff_on_job sp on t.plan_person = sp.id
+ left join staff_on_job se on t.executor = se.id
<where>
<if test="c.name != null and c.name != ''">
and t.name like concat('%', #{c.name}, '%')
diff --git a/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml b/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
index 756e34f..f50c8b9 100644
--- a/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
@@ -15,6 +15,7 @@
<result column="type" property="type" />
<result column="plan_person" property="planPerson" />
<result column="executor" property="executor" />
+ <result column="process_type" property="processType" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
</resultMap>
--
Gitblit v1.9.3