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/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

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>

--
Gitblit v1.9.3