From fa32e887b8fdcd4a2bc3326306cbc558e119a9bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 01 八月 2024 10:00:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 23 ++++++++++++++++++-----
1 files changed, 18 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 8db389c..273513c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -844,14 +844,19 @@
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S07' )) AS remarks4,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S08' )) AS remarks5,
p.remarks as filmNumber,
- od.bend_radius as bendRadius
+ od.bend_radius as bendRadius,
+ od.other_columns,
+ ogd.glass_child as glassChild,
+ ogd.glass_address as glassAddress,
+ JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.color' )) AS color
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
- left join sd.product_detail as pd on pd.prod_id=p.id and pd.sort_num=od.order_number
+ left join sd.product_detail as pd on pd.prod_id=p.id and pd.sort_num=od.order_number and pd.glass_sort=fc.technology_number
+ left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by od.order_number, width, height
@@ -1172,7 +1177,11 @@
round(SUM(ogd.total_area), 2) as gross_area,
sum(od.weight) as weight,
#{technologyNumber} as technologyNumber,
- concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
+ concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
+ dd.breakage_type,
+ dd.breakage_reason,
+ dd.responsible_process,
+ dd.responsible_team
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
@@ -1193,9 +1202,12 @@
GROUP BY order_id, order_number
) as ogdc on ogdc.order_id=ogd.order_id and ogdc.order_number=ogd.order_number and ogdc.technology_number=ogd.technology_number
left join patch_log as pl on pl.process_id=fc.process_id and pl.order_sort=fc.order_number and pl.technology_number=fc.technology_number
+ left join pp.reporting_work as rw on rw.order_id=fc.order_id and rw.process_id=fc.process_id
+ left join pp.damage_details as dd on rw.reporting_work_id=dd.reporting_work_id and dd.order_number=fc.order_number and dd.technology_number=fc.technology_number
where fc.process_id = #{processId}
and fc.order_number = #{orderNumber}
and fc.technology_number = #{technologyNumber}
+ and rw.reporting_work_id=#{reportingWorkId}
group by fc.process_id, fc.technology_number
</select>
@@ -1391,7 +1403,7 @@
p.remarks,
c.customer_abbreviation as customerAbbreviation,
p.product_abbreviation as productAbbreviation,
- fc.process_id as processId,
+ CONCAT(fc.process_id,'/',fc.technology_number) as processId,
o.create_time as createTime,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S02' )) AS figureNumber,
@@ -1404,7 +1416,8 @@
p.remarks as filmNumber,
od.bend_radius as bendRadius,
ogd.glass_child as glassChild,
- ogd.glass_address as glassAddress
+ ogd.glass_address as glassAddress,
+ JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.color' )) AS color
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
--
Gitblit v1.8.0