From 8bbe2bb92ddfeb1766eb7324a6c39acd5e2b1c5c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 10:21:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 a19381d..b060b3f 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,6 +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" />
</resultMap>
<select id="selectApsPlanOrderManager" parameterType="ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
@@ -41,12 +42,13 @@
plan.plan_start_day,
plan.plan_end_day,
plan.unmatched_quantity,
+ plan.custom_time,
require.has_delay_risk,
plan.id,
require.start_date,
require.complete_date
from aps_plate_standard_require_bom_order_detail detail
- left join aps_plate_standard_require require on on detail.require_id = require.id
+ left join aps_plate_standard_require require on detail.require_id = require.id
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>
@@ -87,7 +89,7 @@
</resultMap>
<sql id="selectApsPlateStandardRequireVo">
- select require.id,
+ select distinct require.id,
require.require_track_id,
require.bom_line_id,
require.bom_line_code,
@@ -137,7 +139,7 @@
min(require.start_date) as start_date,
min(require.complete_date) as end_date
from aps_plate_standard_require_bom_order_detail detail
- left join aps_plate_standard_require require on on detail.require_id = require.id
+ left join aps_plate_standard_require require on detail.require_id = require.id
left join aps_plate_plan plan on detail.doc_no = plan.document_number
where plan.id in
<foreach collection="planIds" item="planId" open="(" separator="," close=")">
@@ -157,7 +159,7 @@
<update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
update aps_plate_plan set
- plan_end_day = #{planRequireDate.customDate},
+ custom_time = #{planRequireDate.customDate},
update_by = #{planRequireDate.updateBy},
update_time = now()
where id in
--
Gitblit v1.9.3