From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/ProductionProductOutputMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index 6dc9682..f31ca01 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -23,7 +23,7 @@
left join production_product_main ppm on ppo.production_product_main_id = ppm.id
left join production_operation_task pot on ppm.production_operation_task_id = pot.id
left join production_order po on pot.production_order_id = po.id
- left join product_model pm on po.product_model_id = pm.id
+ left join product_model pm on ppo.product_model_id = pm.id
<where>
<if test="c.productNo != null and c.productNo != ''">
and ppm.product_no like concat('%', #{c.productNo}, '%')
--
Gitblit v1.9.3