From d878bcd48999cbb187b2e7c3a4ceb454630790bc Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 20 十月 2025 10:16:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 4 +++-
1 files changed, 3 insertions(+), 1 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 8541123..6a6363a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2822,6 +2822,7 @@
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
ogd.technology_number = fc.technology_number
+
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
group by fc.process_id,od.order_number, width, height
@@ -3056,7 +3057,8 @@
'鏂囨湰' as custom3,
'鏂囨湰' as custom4,
'鏂囨湰' as custom5,
- od.quantity
+ od.quantity,
+ CONCAT(opt.stock_id,"/",opt.polys_id) as stockPolysId
from optimize_detail as opt
left join optimize_layout as opl on opl.project_no=opt.project_no and opl.stock_id=opt.stock_id
left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number
--
Gitblit v1.8.0