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

zhanghl

2025-05-12 088a46dc697ef5b719f1ab62c9988f96a21e5e0c

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

@@ -89,6 +89,9 @@
    /** 删除标志（0代表存在 2代表删除） */
    private String delFlag;

    /** 工作中心 */
    private String workCenter;

    public void setId(String id)
    {
        this.id = id;
@@ -209,28 +212,6 @@
        return delFlag;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("itemNo", getItemNo())
                .append("workOrderNo", getWorkOrderNo())
                .append("processNumber", getProcessNumber())
                .append("processName", getProcessName())
                .append("processPlanStartDay", getProcessPlanStartDay())
                .append("processPlanEndDay", getProcessPlanEndDay())
                .append("notStartWorkCount", getNotStartWorkCount())
                .append("completedCount", getCompletedCount())
                .append("integrationDay", getIntegrationDay())
                .append("plant", getPlant())
                .append("delFlag", getDelFlag())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .toString();
    }

    public BigDecimal getDiscardCount() {
        return discardCount;
    }
@@ -286,4 +267,37 @@
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }

    public String getWorkCenter() {
        return workCenter;
    }

    public void setWorkCenter(String workCenter) {
        this.workCenter = workCenter;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("itemNo", getItemNo())
                .append("workOrderNo", getWorkOrderNo())
                .append("processNumber", getProcessNumber())
                .append("processName", getProcessName())
                .append("processPlanStartDay", getProcessPlanStartDay())
                .append("processPlanEndDay", getProcessPlanEndDay())
                .append("notStartWorkCount", getNotStartWorkCount())
                .append("completedCount", getCompletedCount())
                .append("integrationDay", getIntegrationDay())
                .append("plant", getPlant())
                .append("delFlag", getDelFlag())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("workCenter", getWorkCenter())
                .toString();
    }


}