From b5f260b2364fad1e74a7eb1f5985268056e3a9e7 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 18:24:15 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
index d47c4e9..7bfc539 100644
--- a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
@@ -17,4 +17,26 @@
         <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="productName" property="productName" />
+        <result column="model" property="model" />
+        <result column="unit" property="unit" />
+    </resultMap>
+
+    <select id="selectVoListByOrderId" resultMap="OperationVoResultMap">
+        SELECT
+        poro.*,
+        tro.technology_operation_id AS technologyOperationId,
+        p.product_name AS productName,
+        pm.model AS model,
+        pm.unit AS unit
+        FROM production_order_routing_operation poro
+        LEFT JOIN technology_routing_operation tro ON poro.technology_routing_operation_id = tro.id
+        LEFT JOIN product_model pm ON poro.product_model_id = pm.id
+        LEFT JOIN product p ON pm.product_id = p.id
+        WHERE poro.production_order_id = #{orderId}
+        ORDER BY poro.drag_sort ASC, poro.id ASC
+    </select>
+
 </mapper>

--
Gitblit v1.9.3