From d39c0479c9ddd38dc36b3c2e29a4e5a3b24fd3d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 02 七月 2024 17:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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..83e2b61 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -483,7 +483,7 @@
fc.process_id,
SUM(od.quantity) as quantity,
round(SUM(ogd.total_area), 2) as gross_area,
- SUM(od.weight) as weight,
+ round(SUM(ogd.child_width*ogd.child_height*od.quantity*p.thickness/1000000*2.5),2) as weight,
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
from flow_card as fc
@@ -492,6 +492,7 @@
fc.technology_number = ogd.technology_number
left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
left join sd.`order` as o on o.order_id = fc.order_id
+ left join sd.product as p on p.id=od.product_id
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by fc.process_id, fc.technology_number
@@ -563,6 +564,30 @@
order by opd.stock_id
</select>
+ <select id="getPrintLabel1">
+ select o.order_id ,
+ o.project,
+ o.customer_id ,
+ od.width,
+ od.height,
+ od.quantity,
+ od.order_number as orderNumber,
+ fc.technology_number as technologyNumber,
+ ogd.glass_child,
+ c.customer_abbreviation as customer_name,
+ ifnull(od.processing_note,'') as processing_note
+ from sd.order as o
+ left join sd.order_detail as od on o.order_id = od.order_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
+ left join pp.flow_card as fc on o.order_id = fc.order_id and
+ od.order_number = fc.order_number and fc.technology_number=ogd.technology_number
+ left join sd.product pt on pt.id=od.product_id
+ left join sd.customer c on c.id=o.customer_id
+ where fc.process_id = #{processId}
+ and fc.technology_number=#{technologyNumber}
+ group by od.order_number,od.width,od.height
+ </select>
+
<select id="printFlowCardDetailsMp">
SELECT fc.process_id,
fc.order_number,
@@ -571,13 +596,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 +661,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 +682,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