修改冲突

sfd

2025-05-13 feddd20a4323e49ef9f424d07e53c12e715203fc

修改冲突

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml

@@ -55,6 +55,7 @@
            <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>

@@ -125,6 +126,7 @@
        <where>
            require.del_flag = '0'
            <if test="workOrderNo != null  and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
            and require.del_flag = '0'
        </where>
    </select>


 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireErrorMapper">
    
    <resultMap type="ApsPlateStandardRequireError" id="ApsPlateStandardRequireErrorResult">
    <resultMap type="com.aps.core.domain.ApsPlateStandardRequireError" id="ApsPlateStandardRequireErrorResult">
        <result property="id"    column="id"    />
        <result property="batchNumber"    column="batch_number"    />
        <result property="requireId"    column="require_id"    />
@@ -23,7 +23,7 @@
        select id, batch_number, require_id, doc_num, item_num, org_code, message, del_flag, create_by, create_time, update_by, update_time from aps_plate_standard_require_error
    </sql>

    <select id="selectApsPlateStandardRequireErrorList" parameterType="ApsPlateStandardRequireError" resultMap="ApsPlateStandardRequireErrorResult">
    <select id="selectApsPlateStandardRequireErrorList" parameterType="com.aps.core.domain.ApsPlateStandardRequireError" resultMap="ApsPlateStandardRequireErrorResult">
        <include refid="selectApsPlateStandardRequireErrorVo"/>
        <where>  
            <if test="batchNumber != null  and batchNumber != ''"> and batch_number = #{batchNumber}</if>
@@ -32,7 +32,9 @@
            <if test="itemNum != null  and itemNum != ''"> and item_num = #{itemNum}</if>
            <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>
            <if test="message != null  and message != ''"> and message = #{message}</if>
            and del_flag = '0'
        </where>

    </select>
    
    <select id="selectApsPlateStandardRequireErrorById" parameterType="Long" resultMap="ApsPlateStandardRequireErrorResult">
@@ -40,7 +42,7 @@
        where id = #{id}
    </select>

    <insert id="insertApsPlateStandardRequireError" parameterType="ApsPlateStandardRequireError">
    <insert id="insertApsPlateStandardRequireError" parameterType="com.aps.core.domain.ApsPlateStandardRequireError">
        insert into aps_plate_standard_require_error
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
@@ -72,7 +74,7 @@
         </trim>
    </insert>

    <update id="updateApsPlateStandardRequireError" parameterType="ApsPlateStandardRequireError">
    <update id="updateApsPlateStandardRequireError" parameterType="com.aps.core.domain.ApsPlateStandardRequireError">
        update aps_plate_standard_require_error
        <trim prefix="SET" suffixOverrides=",">
            <if test="batchNumber != null">batch_number = #{batchNumber},</if>

 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java

@@ -304,6 +304,9 @@
                order.setOpStatus(jsonObject.getString("OpStatus"));
                order.setNextOpName(jsonObject.getString("NextOpName"));
                order.setLowOrderCode(jsonObject.getString("LowLevelCode"));
                order.setOrderCreateTime(jsonObject.getDate("CreatedOn"));
                order.setApproveOn(jsonObject.getDate("ApproveOn"));
                order.setStartWorkDate(jsonObject.getDate("StartDatetime"));
                jobs.add(order);
                orderIds.add(order.getOrderId());
            } catch (Exception e) {

 aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml

@@ -407,7 +407,7 @@
            plan_start_day,plan_end_day,next_process_deparment,
            is_suspended,is_outsourcing,account,
            id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,
            professional_affiliation,order_create_time
            professional_affiliation,order_create_time,approve_on,start_work_date
        )
        select
            doc_no,mainitem_code,mainitem_figure,
@@ -419,7 +419,9 @@
            is_hold_release,is_out_source,org_code,
            cast(order_id as bigint) as id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name,
            (case when low_order_code='0' then 'main' else 'sub' end ) as professional_affiliation,
            order_create_time
            order_create_time,
            approve_on,
            start_work_date
        from aps_work_order_job
        where ( doc_status in (0,1,2,4) and is_hold_release='0'
                and (item_code like 'M03%' or item_code like 'M04%'or item_code like 'A75%')