From 7b0d59dbd16a0f90eec1ad35eff64cf40d3b97e7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 10 十二月 2024 11:34:23 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 140 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 138 insertions(+), 2 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 bac5933..c72d362 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,66 @@
<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,
+ op.project_name
+ 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="materialStoreMp">
+ SELECT
+ i.id AS id,
+ i.producer AS producer,
+ i.available_quantity AS available_quantity,
+ JSON_EXTRACT(s.json, '$.width') AS width,
+ JSON_EXTRACT(s.json, '$.height') AS height,
+ JSON_EXTRACT(s.json, '$.thickness') AS thickness,
+ JSON_EXTRACT(s.json, '$.name') AS name,
+ JSON_EXTRACT(s.json, '$.model') AS model
+ FROM mm.material_inventory as `i`
+ LEFT JOIN mm.material_store as s ON (
+ (
+ `i`.`material_code` = `s`.`id`
+ )
+ )
+ WHERE
+ (
+ (`s`.`type` = '鍘熺墖')
+ AND (`i`.`optimize_state` = 1)
+ AND (`i`.`available_quantity` > 0)
+ AND JSON_EXTRACT(s.json, '$.thickness') = #{thickness}
+ AND JSON_EXTRACT(s.json, '$.model') = #{model}
+ )
+ ORDER BY
+ `i`.`available_quantity` DESC ;
+ </select>
+
<select id="selectWordOrder" resultMap="wordOrderMap">
select
o.order_id,
@@ -133,6 +193,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`,
@@ -160,13 +221,27 @@
from pp.optimize_project as p
left join pp.optimize_admin as a on p.creater = a.Id
where (`p`.`state` > -(1))
- and `p`.`create_time` > #{startSelectTime}
- and `p`.`create_time` < #{endSelectTime}
+ and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
<if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
and p.project_no regexp #{optimizeProjectMange.projectNumber}
</if>
+ <if test="optimizeProjectMange.state!= null">
+ and p.state = #{optimizeProjectMange.state}
+ </if>
order by `p`.`create_time` desc, `p`.`project_no`
</select>
+ <!--淇敼宸ョ▼鐘舵��-->
+ <update id="updateProjectStateMp">
+ update pp.optimize_project as p
+ set p.state = #{state}
+ where p.project_no = #{projectNumber}
+ </update>
+
+ <!--鍒犻櫎宸ョ▼-->
+ <delete id="deleteProjectMp">
+ delete from pp.optimize_project
+ where project_no = #{projectNumber}
+ </delete>
<select id="getProjectListMp">
SELECT
@@ -198,4 +273,65 @@
p.project_no
</select>
+ <!--妯℃嫙璁＄畻鏌ヨ娴佺▼鍗�-->
+ <select id="selectProjectComputeMp">
+ SELECT
+ fc.process_id,
+ fc.technology_number,
+ fc.project_no,
+ fcss.TotalFloors,
+ COUNT(fc.order_number) AS TotalNumber,
+ SUM(fc.quantity) AS quantity,
+ ROUND(SUM(od.width * od.height * fc.quantity / 1000000), 2) AS area,
+ o.project,
+ ogd.glass_child,
+ od.shape
+ FROM
+ pp.flow_card AS fc
+ LEFT JOIN sd.`order` AS o ON fc.order_id = o.order_id
+ LEFT JOIN sd.order_detail AS od ON od.order_id = fc.order_id AND od.order_number = fc.order_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
+ LEFT JOIN (
+ SELECT
+ fcs.process_id,
+ fcs.order_number,
+ COUNT(DISTINCT fcs.technology_number) AS TotalFloors
+ FROM
+ pp.flow_card AS fcs
+ GROUP BY
+ fcs.process_id, fcs.order_number
+ ) AS fcss
+ ON fcss.process_id = fc.process_id AND fcss.order_number = fc.order_number
+ WHERE
+ fc.project_no = #{projectNo}
+ GROUP BY
+ fc.process_id, fc.technology_number
+ ORDER BY
+ fc.process_id, fc.technology_number;
+ </select>
+
+ <!--妯℃嫙璁＄畻娴佺▼鍗¤鎯�-->
+ <select id="selectComputeDetailMp">
+ SELECT
+ d.width AS width,
+ d.height AS height,
+ f.quantity AS quantity,
+ d.building_number AS `Storey Number`,
+ d.shape AS shape,
+ round(g.area * f.quantity, 4) AS area,
+ g.icon AS `Label type`
+ FROM
+ pp.flow_card f
+ LEFT JOIN pp.optimize_project p ON f.project_no = p.project_no
+ LEFT JOIN sd.order o ON f.order_id = o.order_id
+ LEFT JOIN sd.order_detail d ON f.order_id = d.order_id AND f.order_number = d.order_number
+ LEFT JOIN sd.order_glass_detail g ON f.order_id = g.order_id AND f.order_number = g.order_number AND f.technology_number = g.technology_number
+ LEFT JOIN sd.product_detail p2 ON d.product_id = p2.prod_id AND f.technology_number = p2.glass_sort
+ LEFT JOIN pp.optimize_project j ON f.project_no = j.project_no
+ WHERE
+ p.state IN (1, 2)
+ AND f.process_id = #{processId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0