From ac4f0d8e61c545c74f287563765179696b51b856 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 五月 2025 17:21:49 +0800
Subject: [PATCH] 增加排班删除功能
---
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 6d5d8a8..a57b77b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -23,6 +23,8 @@
<result property="outputNumber" column="output_number" jdbcType="INTEGER"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager"/>
+ <association property="proType" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
<association property="creatorName" column="creator" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager"/>
<association property="batchNo" column="batch_id" javaType="java.lang.Long"
@@ -103,6 +105,12 @@
select name
from pr_assembly_plan
where id = #{id}
+ </select>
+ <select id="selectByBatchId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from pr_assembly_plan
+ where batch_id = #{batchId,jdbcType=BIGINT}
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
@@ -261,8 +269,8 @@
<if test="endDate != null and endDate !=''">end_date,</if>
<if test="deleted != null">deleted,</if>
<if test="content != null and content !=''">content,</if>
- <if test="inputNumber!= null and inputNumber !=''">input_number,</if>
- <if test="outputNumber!= null and outputNumber !=''">output_number,</if>
+ <if test="inputNumber!= null">input_number,</if>
+ <if test="outputNumber!= null">output_number,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
@@ -325,10 +333,10 @@
<if test="content != null and content !=''">
content = #{content,jdbcType=VARCHAR},
</if>
- <if test="inputNumber!= null and inputNumber !=''">
+ <if test="inputNumber!= null">
input_number = #{inputNumber,jdbcType=INTEGER},
</if>
- <if test="outputNumber!= null and outputNumber !=''">
+ <if test="outputNumber!= null">
output_number = #{outputNumber,jdbcType=INTEGER},
</if>
</set>
@@ -415,14 +423,28 @@
</select>
<select id="selectByPlanName" resultType="cn.hutool.json.JSONObject">
- select ap.id planId,ap.name planName,ap.`status`,pn.id nodeId,pn.content from pr_assembly_plan ap
+ select ap.id planId,
+ ap.name planName,
+ ap.`status`,
+ pn.id nodeId,
+ pn.content
+ from pr_assembly_plan ap
left join pr_production_node pn on ap.process_id = pn.process_id
where status != -1
<if test="planName != null and planName!= ''">
and ap.name like concat('%', #{planName}, '%')
</if>
+ order by ap.id desc, pn.id asc
</select>
+ <select id="queryPlanList" resultType="cn.hutool.json.JSONObject">
+ select pp.`name` as pro_name, p.`name` ,p.number,p.input_number, p.output_number, concat(round(((p.output_number/p.number) * 100 ),0), '%') as complete_rate ,p.end_date,
+ TIMESTAMPDIFF(DAY, NOW(),p.end_date) AS days_difference
+ from (SELECT * FROM pr_assembly_plan WHERE STATUS = 1 and deleted = 0) p
+ LEFT JOIN plt_product pp
+ on p.pro_id = pp.id
+ ORDER BY end_date
+ </select>
</mapper>
--
Gitblit v1.8.0