From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..74d56c9 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,
--
Gitblit v1.8.0