From 924ce82faeec6d896fcdc360b279215e84b69fb9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 11:44:44 +0800
Subject: [PATCH] 1、代码补充提交
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml | 141 ++++++++++++++++++++++++++++-------------------
1 files changed, 84 insertions(+), 57 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
index 1af4682..f4388b2 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
@@ -5,27 +5,37 @@
<select id="selectFlowCard" resultType="java.util.Map">
select fc.order_number,
- concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
- od.quantity,
- round(ogd.total_area, 2) as total_area,
- od.perimeter,
- od.bend_radius,
- concat(IFNULL(od.processing_note,''), IFNULL(od.remarks,'')) as remarks,
- od.other_columns,
- round(ogd.child_width) as width,
- round(ogd.child_height) as height,
- pd.separation,
- fc.technology_number
+ concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
+ od.quantity,
+ round(ogd.total_area, 2) as total_area,
+ od.perimeter,
+ od.bend_radius,
+ concat(IFNULL(od.processing_note,''), IFNULL(od.remarks,'')) as remarks,
+ od.other_columns,
+ round(ogd.child_width) as width,
+ round(ogd.child_height) as height,
+ pd.separation
+ <if test="technologyNumber != 0">
+ ,fc.technology_number
+ </if>
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
- left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
- left join sd.product_detail as pd
- on pd.prod_id = od.product_id and pd.glass_sort = ogd.technology_number
- where fc.process_id = #{processId}
- and position(fc.technology_number in #{technologyNumber})
- group by fc.process_id, fc.order_number, fc.technology_number
+ 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
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ left join sd.product_detail as pd
+ on pd.prod_id = od.product_id and pd.glass_sort = ogd.technology_number
+ where fc.process_id = #{processId}
+
+ <if test="technologyNumber != 0">
+ and position(fc.technology_number in #{technologyNumber})
+ </if>
+ <if test="technologyNumber != 0">
+ group by fc.process_id, fc.order_number, fc.technology_number
+ </if>
+ <if test="technologyNumber == 0">
+ group by fc.process_id, fc.order_number
+ </if>
order by IF(sort != NULL || sort != '', sort, fc.order_number)
</select>
@@ -33,18 +43,26 @@
<select id="selectProject" resultType="java.util.Map">
select o.customer_name,
o.project,
- (select process from sd.order_glass_detail where order_id=fc.order_id and order_number=fc.order_number and technology_number=fc.technology_number) as process ,
+ (select process
+ from sd.order_glass_detail
+ where order_id = fc.order_id
+ and order_number = fc.order_number
+ and technology_number = fc.technology_number) as process,
od.edging_type,
- (select glass_child from sd.order_glass_detail where order_id=fc.order_id and order_number=fc.order_number and technology_number=fc.technology_number) as glass_child ,
+ (select glass_child
+ from sd.order_glass_detail
+ where order_id = fc.order_id
+ and order_number = fc.order_number
+ and technology_number = fc.technology_number) as glass_child,
od.product_name,
o.processing_note,
fc.process_id,
- SUM(od.quantity) as quantity,
- round(SUM(ogd.total_area), 2) as gross_area,
- sum(od.weight) as weight,
- 1 as technologyNumber,
- concat(fc.process_id, '/', 1) as processIdNumber,
- concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks
+ SUM(od.quantity) as quantity,
+ round(SUM(ogd.total_area), 2) as gross_area,
+ sum(od.weight) as weight,
+ 1 as technologyNumber,
+ concat(fc.process_id, '/', 1) as processIdNumber,
+ concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks
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
@@ -58,7 +76,8 @@
ogd.glass_child,
GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
from sd.order_glass_detail as ogd
- where ogd.order_id = left(#{processId}, 10)
+ where ogd.order_id = left (#{processId}
+ , 10)
and position(ogd.technology_number in #{technologyNumber})
GROUP BY order_id, order_number) as ogdc
on ogdc.order_id = ogd.order_id and ogdc.order_number = ogd.order_number and
@@ -70,35 +89,43 @@
<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
+ 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
+ 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 in (
+ <foreach collection="processId" item="item" separator=",">
+ #{item}
+ </foreach>
+ )
+ and fc.technology_number in (
+ <foreach collection="technologyNumber" item="items" separator=",">
+ #{items}
+ </foreach>
+ )
+ group by fc.process_id, fc.technology_number, od.order_number, od.width, od.height
</select>
--
Gitblit v1.8.0