修改冲突

sfd

2025-05-13 feddd20a4323e49ef9f424d07e53c12e715203fc

 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,19 +42,20 @@
            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 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'
            <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>
            and where detail.del_flag='0'
        </where>
    </select>

@@ -117,13 +118,15 @@
               require.update_time
        from
             aps_plate_standard_require require
            left join aps_plate_standard_require_bom_order_detail detail on detail.require_id = require.id
            left join aps_plate_standard_require_bom_order_detail detail on detail.require_id = require.id and detail.del_flag = '0'
    </sql>

    <select id="selectApsPlanStandardRequire" parameterType="String" resultMap="ApsPlateStandardRequireResult">
        <include refid="selectApsPlateStandardRequireVo"/>
        <where>
            require.del_flag = '0'
            <if test="workOrderNo != null  and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
            and require.del_flag = '0'
        </where>
    </select>

@@ -139,9 +142,11 @@
            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>
@@ -150,20 +155,20 @@

    <update id="updatePlanDateByBatch" parameterType="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 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>