Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-09 71eed1baf6de1de2545f88482839d9051ac86f5a

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

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

@@ -141,16 +141,44 @@
    @Excel(name = "下一工序名称")
    private String nextOpName;

    /**
     * 低阶码
     */
    /** 低阶码 */
    @JsonProperty("LowLevelCode")
    private String lowOrderCode;

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

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

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

    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;
    }

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

@@ -41,6 +41,8 @@
        <result property="nextOpName"    column="next_op_name"    />
        <result property="lowOrderCode"    column="low_order_code"    />
        <result property="orderCreateTime"    column="order_create_time"    />
        <result property="approveOn"    column="approve_on"    />
        <result property="startWorkDate"    column="start_work_date"    />
    </resultMap>

    <sql id="selectApsWorkOrderJobVo">
@@ -48,7 +50,7 @@
               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,
               low_order_code, order_create_time
               low_order_code, order_create_time, approve_on, start_work_date
        from aps_work_order_job
    </sql>

@@ -295,7 +297,9 @@
            op_status,
            next_op_name,
            low_order_code,
            order_create_time
            order_create_time,
            approve_on,
            start_work_date
        </trim>
        values
        <foreach collection="list" item="job" separator=",">
@@ -336,7 +340,9 @@
            #{job.opStatus},
            #{job.nextOpName},
            #{job.lowOrderCode},
            #{job.orderCreateTime}
            #{job.orderCreateTime},
            #{job.approveOn},
            #{job.startWorkDate}
            )
        </foreach>
    </insert>