From fda672b4fd0ef3bd4f0759e5c58fdca8f243e550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 31 五月 2024 14:58:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 118 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 4a7553f..3cc42a5 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -106,53 +106,56 @@
<!-- 娴佺▼鍗¤繘搴�-->
<select id="processCardProgressMp">
- select
- a.product_name,
- b.glass_child,
- d.order_type,
- concat(c.process_id,'/',c.technology_number) as process_id,
- c.technology_number,
- c.quantity,
- e.reportWorkQuantity,
- e.reportWorkQuantityCount,
- e.broken_num,
- round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
-
- from
- flow_card as c
- left join
- sd.order_detail as a
- on c.order_id = a.order_id
- and c.order_number = a.order_number
- left join sd.order_glass_detail as b
- on c.order_id = b.order_id
- and b.order_number = c.order_number
- and c.technology_number = b.technology_number
- left join sd.`order` as d
- on c.order_id = d.order_id
- left join mm.finished_goods_inventory as f
- on c.order_id = f.order_id and f.order_number = c.order_number
- left join (
- SELECT process_id,
- technology_number,
- sum(a.broken_num) as broken_num,
- concat('{',
- GROUP_CONCAT(concat("\"",process,"\":\"",reporting_work_num,"\"")),
- '}'
- ) as reportWorkQuantity,
- concat('{',
- GROUP_CONCAT(concat("\"",process,"\":\"",reporting_work_num_count,"\"")),
- '}'
- ) as reportWorkQuantityCount
- FROM sd.order_process_detail as a
- where a.order_id=#{orderId}
- GROUP BY process_id,a.technology_number
- ) as e
- on e.process_id = c.process_id
- and e.technology_number = c.technology_number
-
+ select a.product_name,
+ b.glass_child,
+ d.order_type,
+ concat(c.process_id, '/', c.technology_number) as process_id,
+ c.order_number,
+ c.technology_number,
+ c.quantity,
+ e.reportWorkQuantity,
+ e.reportWorkQuantityCount,
+ e.broken_num,
+ ifnull(f.inventory, 0) as inventory,
+ round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
+ ifnull(dd.quantity, 0) as shippedQuantity
+ from flow_card as c
+ left join
+ sd.order_detail as a
+ on c.order_id = a.order_id
+ and c.order_number = a.order_number
+ left join sd.order_glass_detail as b
+ on c.order_id = b.order_id
+ and b.order_number = c.order_number
+ and c.technology_number = b.technology_number
+ left join sd.`order` as d
+ on c.order_id = d.order_id
+ left join mm.finished_goods_inventory as f
+ on c.order_id = f.order_id and f.order_number = c.order_number
+ left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
+ left join (SELECT process_id,
+ order_number,
+ technology_number,
+ sum(a.broken_num) as broken_num,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ '}'
+ ) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
+ '}'
+ ) as reportWorkQuantityCount
+ FROM sd.order_process_detail as a
+ where a.order_id = #{orderId}
+ GROUP BY process_id, a.order_number, a.technology_number) as e
+ on e.process_id = c.process_id
+ and e.technology_number = c.technology_number
+ and e.order_number = c.order_number
where a.order_id = #{orderId}
-
+ group by c.order_number,
+ c.technology_number,
+ c.process_id
+ order by c.process_id, c.order_number, c.technology_number
</select>
<select id="getProcessBreaking" resultMap="damageDetailsTableMap">
@@ -497,13 +500,13 @@
<select id="splittingDetailsOutsideMp">
SELECT
- fc.process_id,
- fc.order_number,
- fc.technology_number,
+ fc.process_id processId,
+ fc.order_number orderNumber,
+ fc.technology_number as technologyNumber,
o.project,
o.batch,
- ogd.child_width,
- ogd.child_height,
+ ogd.child_width as childWidth,
+ ogd.child_height as childHeight,
fc.quantity,
round( ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2 ) as area,
od.shape,
@@ -601,12 +604,12 @@
c.quantity,
c.technology_number,
b.glass_child,
- e.reportWorkQuantity,
- e.reportWorkQuantityCount,
+ ifnull(e.reportWorkQuantity,0) as reportWorkQuantity,
+ ifnull(e.reportWorkQuantityCount,0) as reportWorkQuantityCount,
ifnull(f.inventory,0) as inventoryNum,
round(ifnull(f.inventory,0)*a.area,2) as inventoryArea,
- dd.quantity as shippedQuantity,
- dd.area
+ ifnull(dd.quantity,0) as shippedQuantity,
+ ifnull(dd.area,0) as area
from
flow_card as c
@@ -646,10 +649,10 @@
</select>
<select id="taskCompletionStatusMp">
- select d.customer_name,
+ select d.customer_name as customerName,
d.project,
d.batch,
- c.order_id,
+ c.order_id as orderId,
d.quantity,
d.area,
dd.quantity as shippedQuantity,
@@ -1007,4 +1010,5 @@
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0