From fae57b1efd6ebb3d9e92558480c0aed4ba2ad525 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 09 九月 2025 14:37:44 +0800
Subject: [PATCH] 提交相关参数
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 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 44696eb..8966a9f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -279,6 +279,8 @@
od.order_number AS 'orderNumber',
od.width,
od.height,
+ GREATEST(od.width, od.height) AS longSide, -- 闀胯竟
+ LEAST(od.width, od.height) AS shortSide, -- 鐭竟
od.shape,
od.quantity,
od.compute_gross_area,
@@ -1253,6 +1255,8 @@
fc.order_number,
ogd.technology_number,
ogd.glass_address,
+ ogd.child_width,
+ ogd.child_height,
pl.patch_num,
pl.patch_area,
pl.responsible_team,
@@ -1266,7 +1270,8 @@
fc.print_status,
pl.reporting_work_id,
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
- pl.patch_id
+ pl.patch_id,
+ date(pl.create_time) as create_time
from flow_card as fc
left join sd.order_glass_detail as ogd
@@ -1680,7 +1685,7 @@
<select id="getDetailListRefund">
select fc.order_number,
- concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
+ concat(IF(ROUND(ogd.child_width, 1) = FLOOR(ogd.child_width), FLOOR(ogd.child_width), ROUND(ogd.child_width, 1)), "*", IF(ROUND(child_height, 1) = FLOOR(child_height), FLOOR(child_height), ROUND(child_height, 1))) as child_width,
sum(pl.patch_num) as quantity,
round(ogd.total_area, 2) as total_area,
od.perimeter,
@@ -1772,7 +1777,7 @@
<select id="getDetailListLikeRefund">
select fc.order_number,
- concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
+ concat(IF(ROUND(ogd.child_width, 1) = FLOOR(ogd.child_width), FLOOR(ogd.child_width), ROUND(ogd.child_width, 1)), "*", IF(ROUND(child_height, 1) = FLOOR(child_height), FLOOR(child_height), ROUND(child_height, 1))) as child_width,
pl.patch_num as quantity,
round(ogd.total_area, 2) as total_area,
od.perimeter,
@@ -1982,7 +1987,7 @@
od.processing_note as processingNote,
ogd.child_width as width,
ogd.child_height as height,
- fc.quantity,
+ #{printQuantity} as quantity,
CONCAT(ogd.child_width , ' X ', ogd.child_height ,' = ',fc.quantity ) as size,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
@@ -2441,7 +2446,8 @@
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
concat('瀵瑰簲鎴戝徃鍗曞彿', o.batch) AS otherRemarks,
- fc.technology_number as qrcode
+ fc.technology_number as qrcode,
+ o.other_remarks
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
@@ -2487,7 +2493,8 @@
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber,
od.order_number,
od.width,
- od.height
+ od.height,
+ od.building_number
from flow_card as fc
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -2526,7 +2533,8 @@
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS S02,
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S03')) AS S03,
JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')) AS S04,
- JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS S05
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS S05,
+ od.building_number
from flow_card as fc
left join sd.order_glass_detail as ogd
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -3083,7 +3091,9 @@
a.quantity as 'baiscQuantity',
#{glassThickness} as 'thickness',
IF(a.height >= a.width, a.height, a.width) as 'long',
- IF(a.height < a.width, a.height, a.width) as 'short'
+ IF(a.height < a.width, a.height, a.width) as 'short',
+ IF(a.height >= a.width, a.height, a.width) as 'longSide',
+ IF(a.height < a.width, a.height, a.width) as 'shortSide'
from sd.order_detail as a
left join sd.order_glass_detail as b
on a.order_id = b.order_id and a.order_number = b.order_number
@@ -3555,4 +3565,33 @@
SELECT max(reporting_work_num) FROM sd.`order_process_detail`
where process_id=#{processId} and order_number=#{orderNumber} and process=#{interceptProcess}
</select>
+
+ <select id="getProcessOk">
+ SELECT
+ GROUP_CONCAT(process ORDER BY id SEPARATOR '->') AS processes
+ FROM sd.order_process_detail
+ WHERE process_id = #{processId}
+ AND order_number = #{orderNumber}
+ AND technology_number = #{technologyNumber}
+ AND reporting_work_num_count > 0;
+ </select>
+
+ <select id="getProcessDetail">
+ SELECT *
+ FROM sd.order_process_detail
+ WHERE process_id = #{processId}
+ AND order_number = #{orderNumber}
+ AND technology_number = #{technologyNumber}
+ AND reporting_work_num_count > 0
+ AND process = #{process}
+ </select>
+
+ <update id="updateOrderProcessDetail">
+ UPDATE sd.order_process_detail
+ set reporting_work_num_count = #{reportingWorkNumCount},
+ reporting_work_num = #{reportingWorkNum},
+ broken_num = #{brokenNum}
+ 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