From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/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 1dad616..b413693 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -263,7 +263,8 @@
ods.S02,
ods.S03,
ods.S04,
- ods.S05
+ ods.S05,
+ od.building_number
from sd.order_detail as od
left join sd.order_glass_detail as ogd
on od.order_id = ogd.order_id and od.order_number = ogd.order_number
@@ -665,7 +666,8 @@
round(ogd.child_width) as width,
round(ogd.child_height) as height,
pd.separation,
- fc.technology_number
+ fc.technology_number,
+ IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber
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
@@ -1214,7 +1216,8 @@
round(ogd.child_width) as width,
round(ogd.child_height) as height,
pd.separation,
- fc.technology_number
+ fc.technology_number,
+ IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber
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
@@ -2015,6 +2018,7 @@
/*ogd.technology_number,*/
ogd.glass_address,
(fc.quantity) as quantity,
+ (fc.quantity) as printQuantity,
round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
od.product_name,
ogd.glass_child,
@@ -2045,6 +2049,7 @@
ogd.technology_number,
ogd.glass_address,
(fc.quantity) as quantity,
+ (fc.quantity) as printQuantity,
round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
od.product_name,
ogd.glass_child,
@@ -2086,7 +2091,7 @@
od.processing_note as processingNote,
width,
height,
- fc.quantity,
+ #{printQuantity} as quantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
--
Gitblit v1.8.0