From b97e00dae4fa017c8273e41fb0f24cf7c7c69a33 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 25 十一月 2024 13:28:35 +0800
Subject: [PATCH] 工程打印标签调整
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 100 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..a09957e 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,31 @@
<!-- </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="selectWordOrder" resultMap="wordOrderMap">
select
@@ -105,7 +130,81 @@
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 `p`.`create_time` > #{startSelectTime}
+ and `p`.`create_time` < #{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>
+
+ <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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0