From e146067ae373f9385b9ddbb57c6eb7a933bf2561 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 10:10:41 +0800
Subject: [PATCH] 生产工序增加字段
---
src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
index 7bfc539..4fc54e8 100644
--- a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
@@ -7,34 +7,46 @@
<id column="id" property="id" />
<result column="production_order_id" property="productionOrderId" />
<result column="technology_routing_operation_id" property="technologyRoutingOperationId" />
- <result column="technology_routing_id" property="technologyRoutingId" />
+ <result column="order_routing_id" property="orderRoutingId" />
<result column="product_model_id" property="productModelId" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<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="process_type" property="processType" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
</resultMap>
<resultMap id="OperationVoResultMap" type="com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationVo" extends="BaseResultMap">
<result column="technologyOperationId" property="technologyOperationId" />
+ <result column="productionOrderRoutingOperationId" property="productionOrderRoutingOperationId" />
<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">
SELECT
+ poro.id AS productionOrderRoutingOperationId,
poro.*,
- tro.technology_operation_id AS technologyOperationId,
+ 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_routing_operation tro ON poro.technology_routing_operation_id = tro.id
+ 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