From dd2c11783fbf0d442a7f594ec42dfdfdb01ea5b6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 14 五月 2026 11:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_鹤壁_善鼎通讯_pro' into dev_pro_河南鹤壁

---
 src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml b/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
index 4614ef7..a80fd02 100644
--- a/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
@@ -30,7 +30,7 @@
                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 production_order_routing_operation poro on pot.production_order_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}
@@ -47,7 +47,7 @@
                popr.create_time as supplementTime
         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 production_order_routing_operation poro on pot.production_order_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
                  left join sys_user su on popr.create_user = su.user_id

--
Gitblit v1.9.3