From a663689bd78df6f772074feebe02fd66198e23ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 02 九月 2024 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
index 960c554..1af4682 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
@@ -16,7 +16,7 @@
round(ogd.child_height) as height,
pd.separation,
fc.technology_number
- from flow_card as fc
+ from pp.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
fc.technology_number = ogd.technology_number
@@ -45,7 +45,7 @@
1 as technologyNumber,
concat(fc.process_id, '/', 1) as processIdNumber,
concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks
- from flow_card as fc
+ from pp.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
fc.technology_number = ogd.technology_number
@@ -68,6 +68,38 @@
group by fc.process_id
</select>
+ <select id="selectLabel" resultType="java.util.Map">
+ select fc.process_id,
+ o.order_id,
+ o.project,
+ o.customer_id,
+ ogd.child_width as width,
+ ogd.child_height as height,
+ od.quantity,
+ 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,
+ od.other_columns,
+ od.building_number,
+ od.bend_radius
+ from sd.order as o
+ left join sd.order_detail as od on o.order_id = od.order_id
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id = od.order_id and ogd.order_number = od.order_number
+ left join pp.flow_card as fc on o.order_id = fc.order_id and
+ od.order_number = fc.order_number and
+ fc.technology_number = ogd.technology_number
+ left join sd.product pt on pt.id = od.product_id
+ left join sd.customer c on c.id = o.customer_id
+ left join sd.basic_glass_type bgt on bgt.type_id = pt.type_id
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by od.order_number, od.width, od.height
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0