From fda672b4fd0ef3bd4f0759e5c58fdca8f243e550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 31 五月 2024 14:58:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index b42f279..7362a69 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -537,8 +537,8 @@
left join flow_card as d
on d.order_id = a.order_id and d.order_number = a.order_number and
d.technology_number = a.technology_number
- left join sd.product e
- on e.id = b.product_id
+ left join sd.basic_glass_type e
+ on e.type_id = b.product_id
where d.process_id = #{processId}
and d.technology_number = #{technologyNumber}
group by a.glass_child, a.child_width, a.child_height
--
Gitblit v1.8.0