From 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
index be61a98..b4358df 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
@@ -23,7 +23,7 @@
<result property="hasDelayRisk" column="has_delay_risk" />
<result property="startDate" column="start_date" />
<result property="completeDate" column="complete_date" />
- <result property="customTime" column="custom_time" />
+<!-- <result property="customTime" column="custom_time" />-->
</resultMap>
<select id="selectApsPlanOrderManager" parameterType="ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
@@ -42,7 +42,6 @@
plan.plan_start_day,
plan.plan_end_day,
plan.unmatched_quantity,
- plan.custom_time,
require.has_delay_risk,
plan.id,
require.start_date,
@@ -52,7 +51,7 @@
left join aps_plate_plan plan on detail.doc_no = plan.document_number
<where>
<if test="workOrderNo != null and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
- <if test="requireId != null and requireId != ''"> and detail.require_id = #{requireId}</if>
+ <if test="requireTrackId != null and requireTrackId != ''"> and detail.require_track_id = #{requireTrackId}</if>
<if test="mainPartNumber != null and mainPartNumber != ''"> and plan.main_part_number = #{mainPartNumber}</if>
<if test="hasDelayRisk != null and hasDelayRisk != ''"> and require.has_delay_risk = #{hasDelayRisk}</if>
</where>
@@ -159,11 +158,11 @@
<update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
update aps_plate_plan set
- custom_time = #{planRequireDate.customDate},
- update_by = #{planRequireDate.updateBy},
+ plan_end_day = #{customDate},
+ update_by = #{updateBy},
update_time = now()
where id in
- <foreach collection="planRequireDate.planIds" item="id" open="(" separator="," close=")">
+ <foreach collection="planIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
--
Gitblit v1.9.3