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

zhanghl

2025-05-08 156dbab600d7727c13790e8b9a677107cfad2387

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

@@ -39,13 +39,16 @@
        <result property="stdOp"    column="std_op"    />
        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
        <result property="lowOrderCode"    column="low_order_code"    />
        <result property="orderCreateTime"    column="order_create_time"    />
    </resultMap>

    <sql id="selectApsWorkOrderJobVo">
        select id, order_id, doc_no, mainitem_code, mainitem_figure, customer_name, business_type, demand_type,
               doc_status, item_code, item_figure, item_figure_version, pruduct_qty, work_qty, op_num, work_center,
               dept, start_date, complete_date, next_dept, is_hold_release, is_out_source, org, page_num, page_index,
               del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name
               del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name,
               low_order_code, order_create_time
        from aps_work_order_job
    </sql>

@@ -290,7 +293,9 @@
            process_status,
            std_op,
            op_status,
            next_op_name
            next_op_name,
            low_order_code,
            order_create_time
        </trim>
        values
        <foreach collection="list" item="job" separator=",">
@@ -329,7 +334,9 @@
            #{job.processStatus},
            #{job.stdOp},
            #{job.opStatus},
            #{job.nextOpName}
            #{job.nextOpName},
            #{job.lowOrderCode},
            #{job.orderCreateTime}
            )
        </foreach>
    </insert>
@@ -393,7 +400,8 @@
            process_number,work_center,department,
            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
            id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,
            professional_affiliation,order_create_time
        )
        select
            doc_no,mainitem_code,mainitem_figure,
@@ -403,7 +411,9 @@
            op_num,work_center,dept,
            start_date,complete_date,next_dept,
            is_hold_release,is_out_source,org_code,
            order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name
            order_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
        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%')