From 6beedcff97476af1d562fdb8c99b1a2e418c4e4a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 13:35:24 +0800
Subject: [PATCH] fix(account): 修复PurchaseInboundDto日期格式双重注解问题
---
src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
index d47c4e9..4d63797 100644
--- a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
@@ -7,14 +7,39 @@
<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="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" />
+ </resultMap>
+
+ <select id="selectVoListByOrderId" resultMap="OperationVoResultMap">
+ SELECT
+ poro.id AS productionOrderRoutingOperationId,
+ poro.*,
+ 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_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}
+ ORDER BY poro.drag_sort ASC, poro.id ASC
+ </select>
+
</mapper>
--
Gitblit v1.9.3