Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-04-24 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2

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

@@ -24,10 +24,15 @@
        <result property="updateTime"    column="update_time"    />
        <result property="standardTime"    column="standard_time"    />
        <result property="processOrder"    column="process_order"    />
        <result property="workCenter"    column="work_center"    />
        <result property="processQty"    column="process_qty"    />
        <result property="opStatus"    column="op_status"    />
        <result property="opStatus"    column="op_status"    />
        <result property="orgCode"    column="org_code"    />
    </resultMap>

    <sql id="selectApsProcessRouteVo">
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order from aps_process_route
        select id, item_no, work_order_no, process_number, process_name, process_plan_start_day, process_plan_end_day, not_start_work_count, completed_count, discard_count, integration_day, plant, del_flag, create_by, create_time, update_by, update_time,standard_time,process_order,work_center from aps_process_route
    </sql>

    <select id="selectApsProcessRouteList" parameterType="ApsProcessRoute" resultMap="ApsProcessRouteResult">
@@ -45,6 +50,7 @@
            <if test="params.beginIntegrationDay != null and params.beginIntegrationDay != '' and params.endIntegrationDay != null and params.endIntegrationDay != ''"> and integration_day between #{params.beginIntegrationDay} and #{params.endIntegrationDay}</if>
<!--            <if test="integrationDay != null "> and integration_day = #{integrationDay}</if>-->
            <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
            <if test="workCenter != null  and workCenter != ''"> and work_center = #{workCenter}</if>
        </where>
    </select>

@@ -73,6 +79,7 @@
            <if test="updateTime != null">update_time,</if>
            <if test="standardTime != null">standard_time,</if>
            <if test="processOrder != null">process_order,</if>
            <if test="workCenter != null">work_center,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -94,6 +101,7 @@
            <if test="updateTime != null">#{updateTime},</if>
            <if test="standardTime != null">#{standardTime},</if>
            <if test="processOrder != null">#{processOrder},</if>
            <if test="workCenter != null">#{workCenter},</if>
        </trim>
    </insert>

@@ -118,6 +126,7 @@
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="standardTime != null">standard_time = #{standardTime},</if>
            <if test="processOrder != null">process_order = #{processOrder},</if>
            <if test="workCenter != null">work_center = #{workCenter},</if>
        </trim>
        where id = #{id}
    </update>