From a8557c74bba5f4f7ff9b2f3c9d84db5d24bb43cd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 十二月 2024 10:33:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 5168b02..753a1c4 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -58,6 +58,36 @@
<result property="modifyTime" column="modify time"/>
</resultMap>
+ <!--宸ョ▼淇℃伅-->
+ <select id="projectInfoMp">
+ SELECT
+ f.order_number,
+ g.child_width ,
+ g.child_height ,
+ f.quantity ,
+ d.shape ,
+ op.process_cards ,
+ d.product_name ,
+ op.remark ,
+ d.building_number ,
+ round(((`g`.`child_width` + g.child_height) * 2 * `f`.`quantity`),2) as perimeter ,
+ round((`g`.`area` * `f`.`quantity`),4) AS area,
+ f.technology_number ,
+ g.glass_child ,
+ g.icon
+ FROM
+ ((pp.flow_card AS f
+ LEFT JOIN sd.order_detail AS d ON (((f.order_id = d.order_id) AND (f.order_number = d.order_number))))
+ LEFT JOIN sd.order_glass_detail AS g ON (((f.order_id = g.order_id) AND (f.order_number = g.order_number) AND (f.technology_number = g.technology_number))))
+ INNER JOIN pp.optimize_project AS op ON op.project_no = f.project_no
+ WHERE
+ f.project_no = #{projectNo}
+ GROUP BY
+ f.order_id,
+ f.technology_number,
+ f.order_number;
+ </select>
+
<select id="selectWordOrder" resultMap="wordOrderMap">
select
o.order_id,
@@ -133,6 +163,7 @@
ORDER BY fc.process_id, fc.technology_number
</select>
+ <!--宸ョ▼绠＄悊-->
<select id="optimizeProjectMangeMp" resultMap="optimizeProjectMangeMap">
select p.`id` AS `id`,
p.`project_no` AS `Project Number`,
--
Gitblit v1.8.0