From 4c368a7d1f0bb452b4cbb063a86701b571a01a95 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 七月 2024 17:45:34 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 7 +++++--
1 files changed, 5 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 e118810..f7d948f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -510,7 +510,8 @@
round(ogd.total_area, 2) as total_area,
od.perimeter,
od.bend_radius,
- concat(od.processing_note,od.remarks) as remarks
+ concat(od.processing_note,od.remarks) as remarks,
+ od.other_columns
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -554,6 +555,7 @@
od.width,
od.height,
ogd.glass_child,
+ ogd.process,
e.type_name,
opd.stock_id,
od.quantity,
@@ -563,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}
@@ -580,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