From 9eb61cbf0da06bb41c4f8f3e9a53ae48b77cdb5e Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期五, 09 八月 2024 12:20:33 +0800
Subject: [PATCH] 测试
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 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 cd39524..efc9339 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -656,10 +656,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)
+ order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
<select id="getProcessList">
@@ -755,15 +757,19 @@
ogd.child_height,
fc.quantity,
ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
- fc.sort,
- ogd.glass_child
+ ifnull(fcs.sort,'') as sort,
+ ogd.glass_child,
+ #{process} as process
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 fc.technology_number = 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})
- 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">
@@ -875,7 +881,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">
@@ -968,7 +974,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">
@@ -977,7 +983,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">
@@ -1005,7 +1011,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">
@@ -1029,7 +1035,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
@@ -1114,10 +1121,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, fc.technology_number
- order by IF(sort != NULL || sort != '', sort, fc.order_number)
+ order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
<select id="getPrimaryListMergeRefund">
@@ -1189,7 +1198,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">
@@ -1209,7 +1218,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
@@ -1269,7 +1279,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">
@@ -1340,7 +1350,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">
@@ -1412,7 +1422,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">
@@ -1469,10 +1479,12 @@
left join sd.order_glass_detail ogd
on ogd.order_id = o.order_id and ogd.order_number = od.order_number and
ogd.technology_number = fc.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 fc.technology_number = #{technologyNumber}
+ and position(fc.technology_number in #{technologyNumber})
group by od.order_number, ogd.technology_number, ogd.child_width, ogd.child_height
- order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
+ order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
<select id="selectPrintNotMp">
@@ -1680,7 +1692,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">
@@ -1797,4 +1809,26 @@
and process != ""
GROUP BY order_id,process_id,technology_number,process
</select>
+
+ <insert id="printAddSortMp">
+ insert into flow_card_sort (process_id,order_number,technology_number,process,sort,create_time)
+ values (#{processId},#{orderNumber},#{technologyNumber},#{process},#{sort},now())
+ </insert>
+ <select id="printAddSortCountMp">
+ select
+ count(*)
+ from flow_card_sort
+ where process_id = #{processId}
+ and order_number = #{orderNumber}
+ and technology_number = #{technologyNumber}
+ and process = #{process}
+ </select>
+ <update id="printUpdateSortMp">
+ update flow_card_sort
+ set sort = #{sort}
+ where process_id = #{processId}
+ and order_number = #{orderNumber}
+ and technology_number = #{technologyNumber}
+ and process = #{process}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0