From 4a9dc7790df8f4572201cd32f1359f5d6415ce18 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 13 五月 2025 16:10:44 +0800
Subject: [PATCH] 钣金工单计划管理：完善 工单创建时间、需求数量
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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 be04d19..d2104b0 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,
@@ -45,21 +45,20 @@
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 detail.require_id = require.id
+ 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>
+ where detail.del_flag='0'
<if test="workOrderNo != null and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</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>
- and where detail.del_flag='0'
- </where>
+ <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>
</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,13 +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>
- and require.del_flag = '0'
- </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" />
@@ -149,7 +146,7 @@
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 = #{start},
plan_end_day = #{end},
@@ -158,7 +155,7 @@
where id = #{id}
</update>
- <update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
+ <update id="updatePlanDateByCustom" parameterType="com.aps.core.domain.ApsPlateOrderPlanDate">
update aps_plate_plan set
plan_end_day = #{customDate},
update_by = #{updateBy},
--
Gitblit v1.9.3