From 39b565ab0ea5e98a2bb0eb5c78b3c23247dbc2fe Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 01 七月 2024 15:22:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/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 ec2c559..3720314 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -571,13 +571,15 @@
ogd.child_width,
ogd.child_height,
fc.quantity,
- ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area
+ ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
+ fc.sort
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
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
+ order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
</select>
<update id="printSortMp">
@@ -634,7 +636,7 @@
select o.order_id as orderId,
project,
customer_id as customerId,
- customer_name as customerName,
+ o.customer_name as customerName,
order_type as orderType,
order_classify as orderClassify,
batch,
@@ -655,12 +657,15 @@
fc.technology_number as technologyNumber,
od.building_number as buildingNumber,
od.product_name as productName,
- od.edging_type as edgingType
-
+ od.edging_type as edgingType,
+ p.remarks,
+ c.customer_abbreviation as customerAbbreviation
from sd.order as o
left join sd.order_detail as od on o.order_id = od.order_id
left join flow_card as fc on o.order_id = fc.order_id and
od.order_number = fc.order_number
+ left join sd.product as p on p.id=od.product_id
+ left join sd.customer as c on c.id = o.customer_id
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by od.order_number, width, height
--
Gitblit v1.8.0