From 3d191e81842cf3bcd6f841fbe2fc3d451c45ef99 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 13:54:40 +0800
Subject: [PATCH] 钣金计划大表增加“异常状态”字段
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 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 b060b3f..6f64152 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
@@ -4,9 +4,9 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateOrderPlanManagerMapper">
- <resultMap type="ApsPlateOrderPlanManager" id="ApsPlateOrderPlanManagerResult">
+ <resultMap type="com.aps.core.domain.ApsPlateOrderPlanManager" id="ApsPlateOrderPlanManagerResult">
<result property="id" column="id" />
- <result property="require_id" column="requireId" />
+ <result property="requireId" column="require_id" />
<result property="requireTrackId" column="require_track_id" />
<result property="workOrderNo" column="doc_no" />
<result property="deductionAmount" column="deduction_amount" />
@@ -23,10 +23,10 @@
<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="orderCreateTime" column="order_create_time" />
</resultMap>
- <select id="selectApsPlanOrderManager" parameterType="ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
+ <select id="selectApsPlanOrderManager" parameterType="com.aps.core.domain.ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
select
detail.require_id,
detail.require_track_id,
@@ -42,24 +42,23 @@
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
+ require.complete_date,
+ plan.order_create_time
from aps_plate_standard_require_bom_order_detail detail
- 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>
+ left join aps_plate_standard_require require on detail.require_id = require.id and require.del_flag = '0'
+ left join aps_plate_plan plan on detail.doc_no = plan.document_number and plan.del_flag = '0'
+ where detail.del_flag='0' and require.del_flag = '0' and plan.del_flag = '0'
<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>
</select>
- <resultMap type="ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
+ <resultMap type="com.aps.core.domain.ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
<result property="id" column="id" />
<result property="requireTrackId" column="require_track_id" />
<result property="bomLineId" column="bom_line_id" />
@@ -122,12 +121,11 @@
<select id="selectApsPlanStandardRequire" parameterType="String" resultMap="ApsPlateStandardRequireResult">
<include refid="selectApsPlateStandardRequireVo"/>
- <where>
- <if test="workOrderNo != null and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
- </where>
+ where require.del_flag = '0'
+ <if test="workOrderNo != null and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
</select>
- <resultMap type="ApsPlateOrderPlanRequireDate" id="selectPlanRequireIdsResult">
+ <resultMap type="com.aps.core.domain.ApsPlateOrderPlanRequireDate" id="selectPlanRequireIdsResult">
<result property="id" column="id" />
<result property="start" column="start_date" />
<result property="end" column="end_date" />
@@ -139,31 +137,33 @@
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 detail.require_id = require.id
- left join aps_plate_plan plan on detail.doc_no = plan.document_number
- where plan.id in
+ left join aps_plate_standard_require require on detail.require_id = require.id and require.del_flag = '0'
+ left join aps_plate_plan plan on detail.doc_no = plan.document_number and plan.del_flag = '0'
+ where
+ detail.del_flag = '0' and
+ plan.id in
<foreach collection="planIds" item="planId" open="(" separator="," close=")">
#{planId}
</foreach>
group by plan.id
</select>
- <update id="updatePlanDateByBatch" parameterType="ApsPlateOrderPlanRequireDate">
+ <update id="updatePlanDateByBatch" parameterType="com.aps.core.domain.ApsPlateOrderPlanRequireDate">
update aps_plate_plan set
- plan_start_day = #{planRequireDate.start},
- plan_end_day = #{planRequireDate.end},
- update_by = #{planRequireDate.updateBy},
+ plan_start_day = #{start},
+ plan_end_day = #{end},
+ update_by = #{updateBy},
update_time = now()
- where id = #{planRequireDate.id}
+ where id = #{id}
</update>
- <update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
+ <update id="updatePlanDateByCustom" parameterType="com.aps.core.domain.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