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

zhanghl

2025-04-24 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2

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

@@ -40,10 +40,11 @@
        <result property="isStockComplete"    column="is_stock_complete"    />
        <result property="hasTurnback"    column="has_turnback"    />
        <result property="hasRisk"    column="has_risk"    />
        <result property="stdOp"    column="std_op"    />
    </resultMap>

    <sql id="selectApsPartPlanVo">
        select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk from aps_part_plan
        select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk, std_op from aps_part_plan
    </sql>

    <select id="selectApsPartPlanList" parameterType="com.aps.core.domain.ApsPartPlan" resultMap="ApsPartPlanResult">
@@ -82,6 +83,7 @@
            <if test="isStockComplete != null "> and is_stock_complete = #{isStockComplete}</if>
            <if test="hasTurnback != null "> and has_turnback = #{hasTurnback}</if>
            <if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
            <if test="stdOp != null "> and std_op = #{stdOp}</if>
             and del_flag='0'
        </where>
    </select>
@@ -129,6 +131,7 @@
            <if test="isStockComplete != null">is_stock_complete,</if>
            <if test="hasTurnback != null">has_turnback,</if>
            <if test="hasRisk != null">has_risk,</if>
            <if test="stdOp != null">std_op,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id != ''">#{id},</if>
@@ -166,6 +169,7 @@
            <if test="isStockComplete != null">#{isStockComplete},</if>
            <if test="hasTurnback != null">#{hasTurnback},</if>
            <if test="hasRisk != null">#{hasRisk},</if>
            <if test="stdOp != null">#{stdOp},</if>
         </trim>
    </insert>

@@ -206,6 +210,7 @@
            <if test="isStockComplete != null">is_stock_complete = #{isStockComplete},</if>
            <if test="hasTurnback != null">has_turnback = #{hasTurnback},</if>
            <if test="hasRisk != null">has_risk = #{hasRisk},</if>
            <if test="stdOp != null">std_op = #{stdOp},</if>
        </trim>
        where id = #{id}
    </update>
@@ -257,7 +262,8 @@
        is_stock_complete,
        has_turnback,
        has_risk,
        plant
        plant,
        std_op
        ) values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.id},#{item.masterPlanner},#{item.weekDay},#{item.weekCycle}
@@ -269,7 +275,7 @@
            ,#{item.standbyNumber},#{item.standbyName},#{item.standbyStock},#{item.nextProcessDeparment}
            ,#{item.isSuspended},#{item.isOutsourcing},#{item.account},#{item.advancedMaterials}
            ,#{item.advancedDocumentNumber},#{item.advancedRequirementDay},#{item.isPlanComplete}
            ,#{item.isStockComplete},#{item.hasTurnback},#{item.hasRisk},#{item.plant})
            ,#{item.isStockComplete},#{item.hasTurnback},#{item.hasRisk},#{item.plant}),#{item.stdOp})
        </foreach>
    </insert>