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

zhanghl

2025-04-24 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2

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

@@ -19,10 +19,11 @@
        <result property="opStatus"    column="op_status"    />
        <result property="org"    column="org"    />
        <result property="org_code"    column="org_code"    />
        <result property="work_center"    column="workCenter"    />
    </resultMap>

    <sql id="selectApsWorkOrderProcessVo">
        select id, item_code, doc_no, op_num, op_id, process_name, standard_time, paln_start_date, plan_complete_date, process_qty, scrap_qty, op_status, org, org_code from aps_work_order_process
        select id, item_code, doc_no, op_num, op_id, process_name, standard_time, paln_start_date, plan_complete_date, process_qty, scrap_qty, op_status, org, org_code, work_center from aps_work_order_process
    </sql>

    <select id="selectApsWorkOrderProcessList" parameterType="ApsWorkOrderProcess" resultMap="ApsWorkOrderProcessResult">
@@ -40,7 +41,8 @@
            <if test="scrapQty != null "> and scrap_qty = #{scrapQty}</if>
            <if test="opStatus != null  and opStatus != ''"> and op_status = #{opStatus}</if>
            <if test="org != null  and org != ''"> and org = #{org}</if>
            <if test="org_code != null  and org_code != ''"> and org_code = #{orgCode}</if>
            <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>
            <if test="workCenter != null  and workCenter != ''"> and work_center = #{workCenter}</if>
        </where>
    </select>
    
@@ -66,6 +68,7 @@
            <if test="opStatus != null">op_status,</if>
            <if test="org != null">org,</if>
            <if test="orgCode != null">org_code,</if>
            <if test="workCenter != null">work_center,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -82,6 +85,7 @@
            <if test="opStatus != null">#{opStatus},</if>
            <if test="org != null">#{org},</if>
            <if test="orgCode != null">#{orgCode},</if>
            <if test="workCenter != null">#{work_center},</if>
         </trim>
    </insert>

@@ -101,6 +105,7 @@
            <if test="opStatus != null">op_status = #{opStatus},</if>
            <if test="org != null">org = #{org},</if>
            <if test="orgCode != null">org_code = #{orgCode},</if>
            <if test="workCenter != null">work_center = #{workCenter},</if>
        </trim>
        where id = #{id}
    </update>
@@ -138,7 +143,8 @@
            scrap_qty = #{item.scrapQty},
            op_status = #{item.opStatus},
            org = #{item.org},
            org_code = #{item.orgCode}
            org_code = #{item.orgCode},
            work_center = #{item.workCenter}
            WHERE id = #{item.id}
        </foreach>
    </update>
@@ -157,7 +163,8 @@
        scrap_qty,
        op_status,
        org,
        org_code
        org_code,
        work_center
        ) VALUES
        <foreach collection="list" item="item" separator=",">
            (
@@ -174,6 +181,7 @@
            #{item.opStatus},
            #{item.org},
            #{item.orgCode}
            #{item.workCenter}
            )
        </foreach>
    </insert>
@@ -194,7 +202,8 @@
            discard_count,
            op_status,
            plant,
            org_code
            org_code,
            work_center
        )
        SELECT
            id,
@@ -210,7 +219,8 @@
            scrap_qty,
            op_status,
            org,
            org_code
            org_code,
            work_center
        FROM aps_work_order_process
    </insert>