From 1c13bd7a2cd2c8ba69a185da69344c8b59f4e561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 09:29:15 +0800
Subject: [PATCH] 选中求和功能以及还原双击回车才能点击单元格
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 10 ++++++----
1 files changed, 6 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 860046c..0fb3fac 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,
- round(SUM(ogd.child_width*ogd.child_height*od.quantity*p.thickness/1000000*2.5),2) as weight,
+ sum(od.weight) as weight,
#{technologyNumber} as technologyNumber,
concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
from flow_card as fc
@@ -575,14 +575,16 @@
fc.technology_number as technologyNumber,
ogd.glass_child,
c.customer_abbreviation as customer_name,
- ifnull(od.processing_note,'') as processing_note
+ ifnull(od.processing_note,'') as processing_note,
+ bgt.type_name
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
+ 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
- left join sd.order_glass_detail ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
+ left join sd.basic_glass_type bgt on bgt.type_id=pt.type_id
where fc.process_id = #{processId}
and fc.technology_number=#{technologyNumber}
group by od.order_number,od.width,od.height
--
Gitblit v1.8.0