【UPDATE】增加同步气柜管路工单数据字段

huangjiayang

2025-05-15 38c0c64592fa93576d2b76f970ece6327cdcaf99

【UPDATE】增加同步气柜管路工单数据字段

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

@@ -174,6 +174,56 @@
    @Excel(name = "当前工序名称")
    private String stdOp;

    /** 工单创建时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    @Excel(name = "工单创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date orderCreateTime;

    /** 工单审核时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    @Excel(name = "工单审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date approveOn;

    /** 工单开工时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    @Excel(name = "工单开工时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date startWorkDate;

    /** 低阶码*/
    private String lowOrderCode;

    public Date getOrderCreateTime() {
        return orderCreateTime;
    }

    public void setOrderCreateTime(Date orderCreateTime) {
        this.orderCreateTime = orderCreateTime;
    }

    public Date getApproveOn() {
        return approveOn;
    }

    public void setApproveOn(Date approveOn) {
        this.approveOn = approveOn;
    }

    public Date getStartWorkDate() {
        return startWorkDate;
    }

    public void setStartWorkDate(Date startWorkDate) {
        this.startWorkDate = startWorkDate;
    }

    public String getLowOrderCode() {
        return lowOrderCode;
    }

    public void setLowOrderCode(String lowOrderCode) {
        this.lowOrderCode = lowOrderCode;
    }

    public String getStdOp() {
        return stdOp;
    }

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

@@ -43,6 +43,10 @@
        <result property="planType"    column="plan_type"    />
        <result property="opStatus"    column="op_status"    />
        <result property="nextOpName"    column="next_op_name"    />
        <result property="orderCreateTime"    column="order_create_time"    />
        <result property="approveOn"    column="approve_on"    />
        <result property="startWorkDate"    column="start_work_date"    />
        <result property="lowOrderCode"    column="low_order_code"    />
<!--        <collection property="apsProcessRoutes" javaType="java.util.ArrayList" ofType="com.aps.core.domain.ApsProcessRoute">-->
<!--            <result property="id"    column="id"    />-->
<!--            <result property="itemNo"    column="item_no"    />-->
@@ -95,7 +99,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, op_status, next_op_name
               has_turnback, has_risk ,plan_type, op_status, next_op_name, order_create_time, approve_on, start_work_date, low_order_code
        from aps_gas_piping_plan
    </sql>

@@ -185,6 +189,10 @@
            <if test="planType != null">plan_type,</if>
            <if test="opStatus != null">op_status,</if>
            <if test="nextOpName != null">next_op_name,</if>
            <if test="orderCreateTime != null">order_create_time,</if>
            <if test="approveOn != null">approve_on,</if>
            <if test="startWorkDate != null">start_work_date,</if>
            <if test="lowOrderCode != null">low_order_code,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id != ''">#{id},</if>
@@ -225,6 +233,10 @@
            <if test="planType != null">#{planType},</if>
            <if test="opStatus != null">#{opStatus},</if>
            <if test="nextOpName != null">#{nextOpName},</if>
            <if test="orderCreateTime != null">#{orderCreateTime},</if>
            <if test="approveOn != null">#{approveOn},</if>
            <if test="startWorkDate != null">#{startWorkDate},</if>
            <if test="lowOrderCode != null">#{lowOrderCode},</if>
         </trim>
    </insert>

@@ -268,6 +280,10 @@
            <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>
            <if test="orderCreateTime != null">order_create_time = #{orderCreateTime},</if>
            <if test="approveOn != null">approve_on = #{approveOn},</if>
            <if test="startWorkDate != null">start_work_date = #{startWorkDate},</if>
            <if test="lowOrderCode != null">low_order_code = #{lowOrderCode},</if>
        </trim>
        where id = #{id}
    </update>

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

@@ -442,7 +442,11 @@
            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,plan_type
            id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,plan_type,
            order_create_time,
            approve_on,
            start_work_date,
            low_order_code
        )
        select
            doc_no,mainitem_code,mainitem_figure,
@@ -453,7 +457,11 @@
            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,
            case when substr(item_code,0,4)='A65' then 'gas' else  'piping'  end  as  plan_type
            case when substr(item_code,0,4)='A65' then 'gas' else  'piping' end as plan_type,
            order_create_time,
            approve_on,
            start_work_date,
            low_order_code
        from aps_work_order_job
        where ( doc_status in (0,1,2,4) and is_hold_release='0'
            and (item_code like 'A65%' or item_code like 'W%'));