From a7cc9c3be58bccd868bc8c12ed57c2b90fedc6b8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 十二月 2024 17:02:59 +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 | 199 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 198 insertions(+), 1 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 23fc14c..9c02619 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -32,6 +32,62 @@
<!-- </association>-->
</resultMap>
+
+ <resultMap id="optimizeProjectMangeMap" type="com.example.erp.entity.pp.OptimizeProjectMange">
+ <result property="id" column="id"/>
+ <result property="projectNumber" column="project Number"/>
+ <result property="projectName" column="project Name"/>
+ <result property="glassType" column="glass Type"/>
+ <result property="thickness" column="thickness"/>
+ <result property="type" column="type"/>
+ <result property="state" column="state"/>
+ <result property="quantity" column="quantity"/>
+ <result property="area" column="area"/>
+ <result property="processCardQuantity" column="process Card Quantity"/>
+ <result property="usingQuantity" column="using Quantity"/>
+ <result property="temperedLoadingRate" column="tempered loading rate"/>
+ <result property="numberOfTemperingFurnaces" column="number of tempering furnaces"/>
+ <result property="averageCuttingRate" column="average cutting rate"/>
+ <result property="effectiveCuttingRate" column="effective cutting rate"/>
+ <result property="residueGlassCuttingRate" column="residue glass cutting rate"/>
+ <result property="processCardCollection" column="process card collection"/>
+ <result property="averageCuttingRate1" column="average cutting rate1"/>
+ <result property="notes" column="notes"/>
+ <result property="creator" column="creator"/>
+ <result property="createTime" column="create time"/>
+ <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="selectWordOrder" resultMap="wordOrderMap">
select
@@ -105,7 +161,148 @@
on fcss.process_id = fc.process_id and fcss.order_number = fc.order_number
where position(#{optionVal} in ogd.glass_child)
GROUP BY fc.process_id, fc.technology_number
- ORDER BY fc.process_id,fc.technology_number
+ 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`,
+ p.`project_name` AS `Project Name`,
+ p.`glass_type` AS `Glass Type`,
+ p.`glass_thickness` AS `Thickness`,
+ p.`type` AS `Type`,
+ p.`state` AS `State`,
+ p.`glass_total` AS `Quantity`,
+ p.`glass_total_area` AS `Area`,
+ p.`process_qty` AS `Process Card Quantity`,
+ p.`raw_stock_qty` AS `Using Quantity`,
+ concat((`p`.`load_rate` * 100), ' %') AS `Tempered loading rate`,
+ `p`.`furnaces_qty` AS `Number of tempering furnaces`,
+ concat(`p`.`avg_cut_pct`, ' %') AS `Average cutting rate`,
+ concat(`p`.`valid_cut_pct`, ' %') AS `Effective cutting rate`,
+ concat(`p`.`last_cut_pct`, ' %') AS `Residue glass cutting rate`,
+ `p`.`process_cards` AS `Process card collection`,
+ `p`.`frist_stock_qty` AS `Amount of original glass usage 1`,
+ concat(`p`.`frist_cut_pct`, ' %') AS `Average cutting rate 1`,
+ `p`.`remark` AS `Notes`,
+ `a`.`name` AS `Creator`,
+ `p`.`create_time` AS `Create time`,
+ `p`.`update_time` AS `Modify time`
+ from pp.optimize_project as p
+ left join pp.optimize_admin as a on p.creater = a.Id
+ where (`p`.`state` > -(1))
+ 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
+ p.id,
+ p.project_no,
+ p.project_name,
+ p.glass_type,
+ p.glass_thickness,
+ p.type,
+ p.state,
+ p.glass_total,
+ p.glass_total_area,
+ p.process_qty,
+ p.process_cards,
+ p.remark,
+ a.name,
+ p.create_time,
+ p.update_time
+ FROM
+ (
+ pp.optimize_project p
+ LEFT JOIN pp.optimize_admin a ON ((
+ p.creater = a.Id
+ )))
+ WHERE
+ ( p.state = 1 )
+ ORDER BY
+ p.create_time DESC,
+ 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