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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 889e130..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
@@ -415,16 +423,22 @@
</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.output_number, concat(round(((p.output_number/p.number) * 100 ),0), '%') as complete_rate ,p.end_date,
+ 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
--
Gitblit v1.8.0