From f1c7702e9fd1aa235523de9767bc96d1838e104f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 27 三月 2024 11:23:28 +0800
Subject: [PATCH] 打包后刷新界面获取不到本地地址问题，工艺审核界面商标打印展示
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 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 703b4fe..43b3c62 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -52,6 +52,52 @@
<!-- 娴佺▼鍗¤繘搴�-->
<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
+
+ where a.order_id = #{orderId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0