From 35f74c2abd95e6913180fbccd864915486eecc48 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 10:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml b/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
index 37c1285..818f4d9 100644
--- a/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
@@ -21,4 +21,19 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <select id="listPickedDetailByOrderId" resultType="com.ruoyi.production.bean.vo.ProductionOrderPickVo">
+ select popr.*,
+ poro.operation_name as operationName,
+ p.product_name as productName,
+ pm.model as model,
+ pm.unit as unit
+ from production_order_pick_record popr
+ left join production_operation_task pot on popr.production_operation_task_id = pot.id
+ left join production_order_routing_operation poro on pot.technology_routing_operation_id = poro.id
+ left join product_model pm on popr.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ where popr.production_order_id = #{productionOrderId}
+ order by popr.create_time desc, popr.id desc
+ </select>
+
</mapper>
--
Gitblit v1.9.3