From a7d5b34a0fa720e5fd3dce1975e9dee94774a78e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 01 九月 2025 09:31:40 +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 74d56c9..6e54c91 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2446,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
@@ -2492,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
@@ -2531,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
@@ -3088,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
--
Gitblit v1.8.0