From 5b4ca677d4064eba9a4adb35f957503b82ba2899 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 12 八月 2024 16:52:11 +0800
Subject: [PATCH] 修改发货编辑显示
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 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 edb8a16..9c2d341 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -502,13 +502,15 @@
ogds.order_number,
GROUP_CONCAT(ogds.technology_number SEPARATOR '') AS technology_number,
ogds.glass_child AS concatenated_glass_child,
- process AS processed_part
+ process AS processed_part,
+ ogds.child_width,
+ ogds.child_height
from sd.order_glass_detail as ogds
where ogds.order_id = #{orderId}
- GROUP BY order_id, order_number, ogds.glass_child,process) as ogdss
+ GROUP BY order_id, order_number, ogds.glass_child,process,ogds.child_width,ogds.child_height) as ogdss
on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
where fc.order_id = #{orderId}
- GROUP BY fc.process_id, ogdss.concatenated_glass_child,ogdss.processed_part
+ GROUP BY fc.process_id, ogdss.concatenated_glass_child,ogdss.processed_part,ogdss.child_width,ogdss.child_height
order by fc.process_id, ogdss.technology_number)
UNION
@@ -639,7 +641,7 @@
<select id="getDetailList">
select fc.order_number,
concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
- od.quantity,
+ fc.quantity,
round(ogd.total_area, 2) as total_area,
od.perimeter,
od.bend_radius,
@@ -656,10 +658,12 @@
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
+ left join flow_card_sort as fcs on fcs.process_id = fc.process_id and fcs.order_number = fc.order_number and fcs.technology_number = fc.technology_number
+ and fcs.process=#{process}
where fc.process_id = #{processId}
and position(fc.technology_number in #{technologyNumber})
- group by fc.process_id, fc.order_number
- order by IF(sort != NULL || sort != '', sort, fc.order_number)
+ group by fc.process_id, fc.order_number,fc.technology_number
+ order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
<select id="getProcessList">
@@ -767,7 +771,7 @@
where fc.process_id = #{processId}
and position(fc.technology_number in #{technologyNumber})
- order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
+ order by IF(fc.sort != NULL or fc.sort != '', fc.sort, fc.order_number)
</select>
<update id="printSortMp">
@@ -879,7 +883,7 @@
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by od.order_number, width, height
- order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
+ order by fc.process_id
</select>
<select id="selectReplenishPrintMp">
@@ -972,7 +976,7 @@
and pl.technology_number = #{technologyNumber}
and pl.reporting_work_id = #{reportingWorkId}
group by od.order_number, width, height
- order by IF(fc.sort != NULL || fc.sort != '', fc.sort, pl.order_sort)
+ order by IF(fc.sort != NULL or fc.sort != '', fc.sort, pl.order_sort)
</select>
<select id="getGlassNumber">
@@ -981,7 +985,7 @@
left join flow_card as fc on od.order_id = fc.order_id and od.order_number = fc.order_number
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
- order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
+ order by IF(fc.sort != NULL or fc.sort != '', fc.sort, fc.order_number)
</select>
<update id="updatePrintStateMp">
@@ -1009,7 +1013,7 @@
AND fc.technology_number = ogd.technology_number
left join sd.order_detail as od on fc.order_id = od.order_id and fc.order_number = od.order_number
where fc.order_id = #{orderId}
- order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.technology_number)
+ order by IF(fc.sort != NULL or fc.sort != '', fc.sort, fc.technology_number)
</select>
<update id="printOrderSortMp">
@@ -1033,7 +1037,8 @@
round(SUM(ogd.total_area), 2) as gross_area,
sum(od.weight) as weight,
#{technologyNumber} as technologyNumber,
- concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
+ concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
+ concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks
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
@@ -1101,7 +1106,7 @@
<select id="getDetailListLike">
select fc.order_number,
concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
- od.quantity,
+ fc.quantity,
round(ogd.total_area, 2) as total_area,
od.perimeter,
od.bend_radius,
@@ -1123,7 +1128,7 @@
where fc.process_id = #{processId}
and position(fc.technology_number in #{technologyNumber})
group by fc.process_id, fc.order_number, fc.technology_number
- order by IF(fcs.sort != NULL || fcs.sort != '', fcs.sort, fc.order_number)
+ order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
<select id="getPrimaryListMergeRefund">
@@ -1195,7 +1200,7 @@
and position(fc.technology_number in #{technologyNumber})
and pl.reporting_work_id = #{reportingWorkId}
group by fc.process_id, fc.order_number, fc.technology_number
- order by IF(sort != NULL || sort != '', sort, fc.order_number)
+ order by IF(sort != NULL and sort != '', sort, fc.order_number)
</select>
<select id="getPrimaryListRefund">
@@ -1215,7 +1220,8 @@
dd.breakage_type,
dd.breakage_reason,
dd.responsible_process,
- dd.responsible_team
+ dd.responsible_team,
+ concat('瀵瑰簲鎴戝徃鍗曞彿',o.batch) AS otherRemarks
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
@@ -1275,7 +1281,7 @@
and position(fc.technology_number in #{technologyNumber})
and pl.reporting_work_id = #{reportingWorkId}
group by fc.process_id, fc.order_number, fc.technology_number
- order by IF(sort != NULL || sort != '', sort, fc.order_number)
+ order by IF(sort != NULL and sort != '', sort, fc.order_number)
</select>
<select id="getPrimaryListRework">
@@ -1346,7 +1352,7 @@
and position(fc.technology_number in #{technologyNumber})
and pl.reporting_work_id = #{reportingWorkId}
group by fc.process_id, fc.order_number, fc.technology_number
- order by IF(sort != NULL || sort != '', sort, fc.order_number)
+ order by IF(sort != NULL and sort != '', sort, fc.order_number)
</select>
<select id="getPrimaryListMergeRework">
@@ -1418,7 +1424,7 @@
and position(fc.technology_number in #{technologyNumber})
and pl.reporting_work_id = #{reportingWorkId}
group by fc.process_id, fc.order_number, fc.technology_number
- order by IF(sort != NULL || sort != '', sort, fc.order_number)
+ order by IF(sort != NULL or sort != '', sort, fc.order_number)
</select>
<select id="getPrintCustomDataSemi">
@@ -1480,7 +1486,7 @@
where fc.process_id = #{processId}
and position(fc.technology_number in #{technologyNumber})
group by od.order_number, ogd.technology_number, ogd.child_width, ogd.child_height
- order by IF(fcs.sort != NULL || fcs.sort != '', fcs.sort, fc.order_number)
+ order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
<select id="selectPrintNotMp">
@@ -1688,7 +1694,7 @@
and pl.technology_number = #{technologyNumber}
and pl.reporting_work_id = #{reportingWorkId}
group by od.order_number, width, height
- order by IF(fc.sort != NULL || fc.sort != '', fc.sort, pl.order_sort)
+ order by IF(fc.sort != NULL or fc.sort != '', fc.sort, pl.order_sort)
</select>
<select id="selectPrintAllMp">
--
Gitblit v1.8.0