From 398551392afc2ab879f837f60f95f9c9d8cf3c98 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 27 四月 2026 13:08:24 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
index 7bfc539..55739db 100644
--- a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
@@ -7,7 +7,7 @@
<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" />
@@ -19,6 +19,7 @@
<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" />
@@ -26,13 +27,14 @@
<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
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
WHERE poro.production_order_id = #{orderId}
--
Gitblit v1.9.3