From 896b0d72abd1e312917e5216e8912f10875852fa Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 09:46:17 +0800
Subject: [PATCH] feat(technology): 生产工序新增计划人员和计划执行人员字段
---
src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java | 6 ++++++
src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java | 6 ++++++
src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java | 6 ++++++
src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml | 10 +++++++++-
src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml | 20 +++++++++++++++++---
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java | 6 ++++++
6 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java
index 4333814..b6b7e79 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java
@@ -23,4 +23,10 @@
@Schema(description = "鍩虹宸ュ簭ID")
private Long productionOrderRoutingOperationId;
+
+ @Schema(description = "璁″垝浜哄憳濮撳悕")
+ private String planPersonName;
+
+ @Schema(description = "璁″垝鎵ц浜哄憳濮撳悕")
+ private String executorName;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
index d784109..42208bf 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -70,4 +70,10 @@
@Schema(description = "绫诲瀷 鍖哄垎璁℃椂鍜岃浠讹紝0璁℃椂锛�1璁′欢")
private Integer type;
+
+ @Schema(description = "璁″垝浜哄憳ID")
+ private Long planPerson;
+
+ @Schema(description = "璁″垝鎵ц浜哄憳ID")
+ private Long executor;
}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java
index a75cdfa..12fb064 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java
@@ -24,4 +24,10 @@
@Schema(description = "鍗曚綅")
private String unit;
+
+ @Schema(description = "璁″垝浜哄憳濮撳悕")
+ private String planPersonName;
+
+ @Schema(description = "璁″垝鎵ц浜哄憳濮撳悕")
+ private String executorName;
}
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
index 93ae801..1aaea44 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
@@ -61,4 +61,10 @@
@Schema(description = "绫诲瀷 鍖哄垎璁℃椂鍜岃浠讹紝0璁℃椂锛�1璁′欢")
private Integer type;
+
+ @Schema(description = "璁″垝浜哄憳ID")
+ private Long planPerson;
+
+ @Schema(description = "璁″垝鎵ц浜哄憳ID")
+ private Long executor;
}
diff --git a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
index 4d63797..84b1073 100644
--- a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
@@ -14,6 +14,8 @@
<result column="drag_sort" property="dragSort" />
<result column="is_quality" property="isQuality" />
<result column="type" property="type" />
+ <result column="plan_person" property="planPerson" />
+ <result column="executor" property="executor" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
</resultMap>
@@ -24,6 +26,8 @@
<result column="productName" property="productName" />
<result column="model" property="model" />
<result column="unit" property="unit" />
+ <result column="planPersonName" property="planPersonName" />
+ <result column="executorName" property="executorName" />
</resultMap>
<select id="selectVoListByOrderId" resultMap="OperationVoResultMap">
@@ -33,11 +37,15 @@
too.id AS technologyOperationId,
p.product_name AS productName,
pm.model AS model,
- pm.unit AS unit
+ pm.unit AS unit,
+ sp.staff_name AS planPersonName,
+ se.staff_name AS executorName
FROM production_order_routing_operation poro
LEFT JOIN technology_operation too ON poro.technology_operation_id = too.id
LEFT JOIN product_model pm ON poro.product_model_id = pm.id
LEFT JOIN product p ON pm.product_id = p.id
+ LEFT JOIN staff_on_job sp ON poro.plan_person = sp.id
+ LEFT JOIN staff_on_job se ON poro.executor = se.id
WHERE poro.production_order_id = #{orderId}
ORDER BY poro.drag_sort ASC, poro.id ASC
</select>
diff --git a/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml b/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
index 26053b8..756e34f 100644
--- a/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyRoutingOperationMapper.xml
@@ -13,6 +13,8 @@
<result column="drag_sort" property="dragSort" />
<result column="is_quality" property="isQuality" />
<result column="type" property="type" />
+ <result column="plan_person" property="planPerson" />
+ <result column="executor" property="executor" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
</resultMap>
@@ -23,11 +25,15 @@
p.product_name as productName,
pm.model,
pm.model as specificationName,
- pm.unit
+ pm.unit,
+ sp.staff_name as planPersonName,
+ se.staff_name as executorName
from technology_routing_operation tro
left join technology_operation top2 on tro.technology_operation_id = top2.id
left join product_model pm on tro.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join staff_on_job sp on tro.plan_person = sp.id
+ left join staff_on_job se on tro.executor = se.id
<where>
<if test="c != null">
<if test="c.id != null">
@@ -59,11 +65,15 @@
p.product_name as productName,
pm.model,
pm.model as specificationName,
- pm.unit
+ pm.unit,
+ sp.staff_name as planPersonName,
+ se.staff_name as executorName
from technology_routing_operation tro
left join technology_operation top2 on tro.technology_operation_id = top2.id
left join product_model pm on tro.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join staff_on_job sp on tro.plan_person = sp.id
+ left join staff_on_job se on tro.executor = se.id
<where>
<if test="c != null">
<if test="c.id != null">
@@ -95,11 +105,15 @@
p.product_name as productName,
pm.model,
pm.model as specificationName,
- pm.unit
+ pm.unit,
+ sp.staff_name as planPersonName,
+ se.staff_name as executorName
from technology_routing_operation tro
left join technology_operation top2 on tro.technology_operation_id = top2.id
left join product_model pm on tro.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join staff_on_job sp on tro.plan_person = sp.id
+ left join staff_on_job se on tro.executor = se.id
where tro.id = #{id}
limit 1
</select>
--
Gitblit v1.9.3