From d7a52156c1e3d1eb2d85d582ab26133ae2895fa8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 09 七月 2024 15:45:28 +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, 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 2664d9f..f7d948f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -555,6 +555,7 @@
od.width,
od.height,
ogd.glass_child,
+ ogd.process,
e.type_name,
opd.stock_id,
od.quantity,
@@ -564,7 +565,7 @@
left join sd.order_detail od
on SUBSTR(opd.process_id, 1, 10) = od.order_id and opd.order_sort = od.order_number
left join sd.order_glass_detail ogd
- on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number
+ on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number and opd.layer=ogd.technology_number
left join sd.product p on od.product_id = p.id
left join sd.basic_glass_type e on e.type_id = p.type_id
where opd.project_no = #{projectNo}
@@ -581,6 +582,7 @@
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
ogd.glass_child,
+ ogd.process,
c.customer_abbreviation as customer_name,
ifnull(od.processing_note,'') as processing_note,
bgt.type_name,
--
Gitblit v1.8.0