From dd3b22bca22373c77843d5ecb96eaa7e7a382461 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 26 九月 2025 10:31:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 47daaac..6dd579c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1413,7 +1413,7 @@
thickness
) VALUES (
#{processId},
- 1,
+ #{stockId},
#{detail.width},
#{detail.height},
#{detail.x},
@@ -1922,11 +1922,11 @@
od.rack_no AS rackNo
FROM
pp.optimize_detail od
- LEFT JOIN pp.flow_card fc on od.process_id = fc.process_id
- LEFT JOIN sd.order_glass_detail ogd ON fc.order_id = ogd.order_id
+ LEFT JOIN pp.flow_card fc on (od.process_id = fc.process_id and od.layer = fc.technology_number and od.order_sort = fc.order_number )
+ LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number)
LEFT JOIN sd.ORDER o ON o.order_id = fc.order_id
- LEFT JOIN sd.order_detail ord ON fc.order_id = ord.order_id
- LEFT JOIN pp.optimize_heat_detail h ON h.process_id = fc.process_id
+ LEFT JOIN sd.order_detail ord ON (fc.order_id = ord.order_id and od.order_sort = ord.order_number)
+ LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
WHERE
od.project_no = #{projectId}
</select>
--
Gitblit v1.8.0