【UPDATE】1.修改获取U9工单数据实体字段新增op_status, next_op_name 2.对应钣金、零件、气柜管路实体

huangjiayang

2025-04-27 0f4b1ef7db5b361f38ca62ee75c31eca07b191aa

【UPDATE】1.修改获取U9工单数据实体字段新增op_status, next_op_name 2.对应钣金、零件、气柜管路实体

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java

@@ -162,6 +162,30 @@
    @Excel(name = "风险标识")
    private Integer hasRisk;

    /** 当前工序状态 */
    @Excel(name = "当前工序状态")
    private String opStatus;

    /** 下一工序名称 */
    @Excel(name = "下一工序名称")
    private String nextOpName;

    public String getOpStatus() {
        return opStatus;
    }

    public void setOpStatus(String opStatus) {
        this.opStatus = opStatus;
    }

    public String getNextOpName() {
        return nextOpName;
    }

    public void setNextOpName(String nextOpName) {
        this.nextOpName = nextOpName;
    }

    public String getPlanType() {
        return planType;
    }
@@ -571,6 +595,8 @@
                .append("isStockComplete", getIsStockComplete())
                .append("hasTurnback", getHasTurnback())
                .append("hasRisk", getHasRisk())
                .append("opStatus", getOpStatus())
                .append("nextOpName", getNextOpName())
                .toString();
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java

@@ -169,6 +169,31 @@
//    @Excel(name = "工厂")
    private String plant;

    /** 当前工序状态 */
    @Excel(name = "当前工序状态")
    private String opStatus;

    /** 下一工序名称 */
    @Excel(name = "下一工序名称")
    private String nextOpName;


    public String getOpStatus() {
        return opStatus;
    }

    public void setOpStatus(String opStatus) {
        this.opStatus = opStatus;
    }

    public String getNextOpName() {
        return nextOpName;
    }

    public void setNextOpName(String nextOpName) {
        this.nextOpName = nextOpName;
    }

    public void setId(String id) 
    {
        this.id = id;
@@ -567,6 +592,8 @@
            .append("hasRisk", getHasRisk())
            .append("plant", getPlant())
            .append("stdOp", getStdOp())
            .append("opStatus", getOpStatus())
            .append("nextOpName", getNextOpName())
            .toString();
    }
    public String getPlant() {

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java

@@ -170,6 +170,30 @@
//    @Excel(name = "工厂")
    private String plant;

    /** 当前工序状态 */
    @Excel(name = "当前工序状态")
    private String opStatus;

    /** 下一工序名称 */
    @Excel(name = "下一工序名称")
    private String nextOpName;

    public String getOpStatus() {
        return opStatus;
    }

    public void setOpStatus(String opStatus) {
        this.opStatus = opStatus;
    }

    public String getNextOpName() {
        return nextOpName;
    }

    public void setNextOpName(String nextOpName) {
        this.nextOpName = nextOpName;
    }

    public void setId(String id) 
    {
        this.id = id;
@@ -568,6 +592,8 @@
            .append("hasRisk", getHasRisk())
            .append("plant", getPlant())
            .append("stdOp", getStdOp())
            .append("opStatus", getOpStatus())
            .append("nextOpName", getNextOpName())
            .toString();
    }
    public String getPlant() {

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

@@ -41,6 +41,8 @@
        <result property="hasTurnback"    column="has_turnback"    />
        <result property="hasRisk"    column="has_risk"    />
        <result property="planType"    column="plan_type"    />
        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
<!--        <collection property="apsProcessRoutes" javaType="java.util.ArrayList" ofType="com.aps.core.domain.ApsProcessRoute">-->
<!--            <result property="id"    column="id"    />-->
<!--            <result property="itemNo"    column="item_no"    />-->
@@ -90,7 +92,7 @@
               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 ,plan_type
               has_turnback, has_risk ,plan_type, op_status, next_op_name
        from aps_gas_piping_plan
    </sql>

@@ -128,6 +130,8 @@
            <if test="hasTurnback != null "> and has_turnback = #{hasTurnback}</if>
            <if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
            <if test="planType != null "> and plan_type = #{planType}</if>
             <if test="opStatus != null "> and op_status = #{opStatus}</if>
              <if test="nextOpName != null "> and next_op_name = #{nextOpName}</if>
           and del_flag ='0'
        </where>
    </select>
@@ -176,6 +180,8 @@
            <if test="hasTurnback != null">has_turnback,</if>
            <if test="hasRisk != null">has_risk,</if>
            <if test="planType != null">plan_type,</if>
            <if test="opStatus != null">op_status,</if>
            <if test="nextOpName != null">next_op_name,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id != ''">#{id},</if>
@@ -214,6 +220,8 @@
            <if test="hasTurnback != null">#{hasTurnback},</if>
            <if test="hasRisk != null">#{hasRisk},</if>
            <if test="planType != null">#{planType},</if>
            <if test="opStatus != null">#{opStatus},</if>
            <if test="nextOpName != null">#{nextOpName},</if>
         </trim>
    </insert>

@@ -255,6 +263,8 @@
            <if test="hasTurnback != null">has_turnback = #{hasTurnback},</if>
            <if test="hasRisk != null">has_risk = #{hasRisk},</if>
            <if test="planType != null">plan_type = #{planType},</if>
            <if test="opStatus != null">op_status = #{opStatus},</if>
            <if test="nextOpName != null">next_op_name = #{nextOpName},</if>
        </trim>
        where id = #{id}
    </update>

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

@@ -41,10 +41,12 @@
        <result property="hasTurnback"    column="has_turnback"    />
        <result property="hasRisk"    column="has_risk"    />
        <result property="stdOp"    column="std_op"    />
        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
    </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, std_op 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, op_status, next_op_name from aps_part_plan
    </sql>

    <select id="selectApsPartPlanList" parameterType="com.aps.core.domain.ApsPartPlan" resultMap="ApsPartPlanResult">
@@ -84,6 +86,8 @@
            <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>
            <if test="opStatus != null  and opStatus != ''"> and op_status = #{opStatus}</if>
            <if test="nextOpName != null  and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
             and del_flag='0'
        </where>
    </select>
@@ -132,6 +136,8 @@
            <if test="hasTurnback != null">has_turnback,</if>
            <if test="hasRisk != null">has_risk,</if>
            <if test="stdOp != null">std_op,</if>
            <if test="opStatus != null">op_status,</if>
            <if test="nextOpName != null">next_op_name,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id != ''">#{id},</if>
@@ -170,6 +176,8 @@
            <if test="hasTurnback != null">#{hasTurnback},</if>
            <if test="hasRisk != null">#{hasRisk},</if>
            <if test="stdOp != null">#{stdOp},</if>
            <if test="opStatus != null">#{opStatus},</if>
            <if test="nextOpName != null">#{nextOpName},</if>
         </trim>
    </insert>

@@ -211,6 +219,8 @@
            <if test="hasTurnback != null">has_turnback = #{hasTurnback},</if>
            <if test="hasRisk != null">has_risk = #{hasRisk},</if>
            <if test="stdOp != null">std_op = #{stdOp},</if>
            <if test="opStatus != null"> op_status= #{opStatus},</if>
            <if test="nextOpName != null"> next_op_name= #{nextOpName},</if>
        </trim>
        where id = #{id}
    </update>
@@ -263,7 +273,9 @@
        has_turnback,
        has_risk,
        plant,
        std_op
        std_op,
        op_status,
        next_op_name
        ) values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.id},#{item.masterPlanner},#{item.weekDay},#{item.weekCycle}
@@ -275,7 +287,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.stdOp})
            ,#{item.isStockComplete},#{item.hasTurnback},#{item.hasRisk},#{item.plant},#{item.stdOp},#{item.opStatus},#{item.nextOpName})
        </foreach>
    </insert>


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

@@ -41,10 +41,12 @@
        <result property="hasTurnback"    column="has_turnback"    />
        <result property="hasRisk"    column="has_risk"    />
        <result property="stdOp"    column="std_op"    />
        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
    </resultMap>

    <sql id="selectApsPlatePlanVo">
        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_plate_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, op_status, next_op_name from aps_plate_plan
    </sql>

    <select id="selectApsPlatePlanList" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
@@ -86,6 +88,8 @@
            <if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
            <if test="plant != null "> and plant = #{plant}</if>
            <if test="stdOp != null "> and std_op = #{stdOp}</if>
            <if test="opStatus != null  and opStatus != ''"> and op_status = #{opStatus}</if>
            <if test="nextOpName != null  and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
             and del_flag='0'
        </where>
    </select>
@@ -134,6 +138,8 @@
            <if test="hasTurnback != null">has_turnback,</if>
            <if test="hasRisk != null">has_risk,</if>
            <if test="stdOp != null">std_op,</if>
            <if test="opStatus != null">op_status,</if>
            <if test="nextOpName != null">next_op_name,</if>
            create_time,
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -173,6 +179,8 @@
            <if test="hasTurnback != null">#{hasTurnback},</if>
            <if test="hasRisk != null">#{hasRisk},</if>
            <if test="stdOp != null">#{stdOp},</if>
            <if test="opStatus != null">#{opStatus},</if>
            <if test="nextOpName != null">#{nextOpName},</if>
            #{createTime},
         </trim>
    </insert>
@@ -215,6 +223,8 @@
            <if test="hasTurnback != null">has_turnback = #{hasTurnback},</if>
            <if test="hasRisk != null">has_risk = #{hasRisk},</if>
            <if test="stdOp != null">std_op = #{stdOp},</if>
            <if test="opStatus != null"> op_status= #{opStatus},</if>
            <if test="nextOpName != null"> next_op_name= #{nextOpName},</if>
        </trim>
        where id = #{id}
    </update>
@@ -232,9 +242,9 @@

    <insert id="insertPlatePlanFromTempByBatchNumber" parameterType="String">
        insert into aps_plate_plan(
            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)
            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, op_status, next_op_name)
        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
            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, op_status, next_op_name
        from aps_plate_plan_temp
        where batch_number = #{batch_number}
    </insert>

 aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java

@@ -126,7 +126,16 @@
    @Excel(name = "作业")
    private String stdOp;

    /** 账套编码 */
    private String orgCode;

    /** 当前工序状态 */
    @Excel(name = "当前工序状态")
    private String opStatus;

    /** 下一工序名称 */
    @Excel(name = "下一工序名称")
    private String nextOpName;

    public void setId(Long id) 
    {
@@ -413,6 +422,22 @@
        return stdOp;
    }

    public String getOpStatus() {
        return opStatus;
    }

    public void setOpStatus(String opStatus) {
        this.opStatus = opStatus;
    }

    public String getNextOpName() {
        return nextOpName;
    }

    public void setNextOpName(String nextOpName) {
        this.nextOpName = nextOpName;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -448,6 +473,8 @@
            .append("updateTime", getUpdateTime())
            .append("processStatus", getProcessStatus())
            .append("stdOp", getStdOp())
            .append("opStatus", getOpStatus())
            .append("nextOpName", getNextOpName())
            .toString();
    }
}

 aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java

@@ -85,7 +85,7 @@
        this.id = id;
    }

    public Long getId() 
    public Long getId()
    {
        return id;
    }

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
@@ -51,6 +52,9 @@

    @Autowired
    private ApsWorkOrderJobLogMapper jobLogMapper;

    @Autowired
    private Sequence sequence;

    /**
     * 查询工单同步
@@ -292,6 +296,7 @@
                }

                ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
                order.setId(sequence.nextId());
                order.setOrderId(jsonObject.getString("ID"));
                order.setCreateTime(DateUtils.getNowDate());
                order.setPageIndex(i);

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

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import com.aps.common.core.utils.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.domain.ApsWorkOrderProcess;
@@ -57,6 +58,9 @@

    @Autowired
    private ApsWorkOrderJobLogMapper apsWorkOrderJobLogMapper;

    @Autowired
    private Sequence sequence;

    /**
     * 查询工单工序
@@ -193,6 +197,7 @@
                                apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
                                updateList.add(apsWorkOrderProcess);
                            } else {
                                apsWorkOrderProcess.setId(sequence.nextId());
                                apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
                                addList.add(apsWorkOrderProcess);
                            }

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

@@ -37,14 +37,15 @@
        <result property="updateTime"    column="update_time"    />
        <result property="processStatus"    column="process_status"    />
        <result property="stdOp"    column="std_op"    />

        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
    </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
               del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name
        from aps_work_order_job
    </sql>

@@ -78,6 +79,8 @@
            <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>
            <if test="processStatus != null  and processStatus != ''"> and process_status = #{processStatus}</if>
            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
            <if test="opStatus != null  and opStatus != ''"> and op_status = #{opStatus}</if>
            <if test="nextOpName != null  and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
        </where>
    </select>
    
@@ -121,6 +124,8 @@
            <if test="orgCode != null">org_code,</if>
            <if test="processStatus != null">process_status,</if>
            <if test="stdOp != null">std_op,</if>
            <if test="opStatus != null">op_status,</if>
            <if test="nextOpName != null">next_op_name,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="orderId != null">#{orderId},</if>
@@ -155,6 +160,8 @@
            <if test="orgCode != null">#{orgCode},</if>
            <if test="processStatus != null">#{processStatus},</if>
            <if test="stdOp != null">#{stdOp},</if>
            <if test="opStatus != null">#{opStatus},</if>
            <if test="nextOpName != null">#{nextOpName},</if>
         </trim>
    </insert>

@@ -193,6 +200,8 @@
            <if test="orgCode != null"> org_code= #{orgCode},</if>
            <if test="processStatus != null"> process_status= #{processStatus},</if>
            <if test="stdOp != null"> std_op= #{stdOp},</if>
            <if test="opStatus != null"> op_status= #{opStatus},</if>
            <if test="nextOpName != null"> next_op_name= #{nextOpName},</if>
        </trim>
        where id = #{id}
    </update>
@@ -242,7 +251,9 @@
            update_time,
            org_code,
            process_status,
            std_op
            std_op,
            op_status,
            next_op_name
        </trim>
        values
        <foreach collection="list" item="job" separator=",">
@@ -278,7 +289,9 @@
            #{job.updateTime},
            #{job.orgCode},
            #{job.processStatus},
            #{job.stdOp}
            #{job.stdOp},
            #{job.opStatus},
            #{job.nextOpName}
            )
        </foreach>
    </insert>
@@ -311,7 +324,7 @@
            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
            id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name
        )
        select
            doc_no,mainitem_code,mainitem_figure,
@@ -321,7 +334,7 @@
            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
            order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name
        from aps_work_order_job
        where ( doc_status in (0,1,2,4) and is_hold_release='0'
                and (mainitem_code like 'M01%' or mainitem_code like 'M02%'or mainitem_code like 'M05%' or mainitem_code like 'M10%'
@@ -342,7 +355,7 @@
            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
            id,create_time,del_flag,plant,order_status,,std_op,op_status,next_op_name
        )
        select
            doc_no,mainitem_code,mainitem_figure,
@@ -352,7 +365,7 @@
            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
            order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name
        from aps_work_order_job
        where ( doc_status in (0,1,2,4) and is_hold_release='0'
                and (mainitem_code like 'M03%' or mainitem_code like 'M04%'or mainitem_code like 'A75%')
@@ -372,7 +385,7 @@
            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,plan_type
            id,create_time,del_flag,plant,order_status,std_op,plan_type,op_status,next_op_name
        )
        select
            doc_no,mainitem_code,mainitem_figure,
@@ -382,7 +395,7 @@
            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,
            order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name
            case when substr(mainitem_code,3)='A65' then 'gas' else  'piping'  end  as  plan_type
        from aps_work_order_job
        where ( doc_status in (0,1,2,4) and is_hold_release='0'