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

hongjli

2025-05-23 67e4ad9f17200a6a7ef361714534eaec5bf9e7da

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

@@ -14,14 +14,13 @@

/**
 * 标准工序对象 aps_standard_process
 * 
 *
 * @author hjy
 * @date 2025-04-23
 */

@Schema(description = "标准工序实体")
public class ApsStandardProcess extends BaseEntity
{
public class ApsStandardProcess extends BaseEntity {
    private static final long serialVersionUID = 1L;

    @Id
@@ -32,75 +31,102 @@
    @Schema(description = "主键id", type = "Long")
    private Long id;

    /** 工序编码 */
    /**
     * 工序编码
     */
    @Schema(description = "工序编码", type = "String")
    @Excel(name = "工序编码")
    private String processNumber;

    /** 工序名称 */
    /**
     * 工序名称
     */
    @Schema(description = "工序名称", type = "String")
    @Excel(name = "工序名称")
    private String processName;

    /** 资源组 */
    /**
     * 资源组
     */
    @Schema(description = "资源组", type = "String")
    @Excel(name = "资源组")
    private String resourceGroupName;
    /** 专业 */
    /**
     * 专业
     */
    @Schema(description = "专业", type = "String")
    @Excel(name = "专业")
    private String major;

    /** 产能模型: 独占/合批 */
    /**
     * 产能模型: 独占/合批
     */
    @Schema(description = "产能模型", type = "String")
    @Excel(name = "产能模型")
    private String model;

    /** 设计产能 */
    /**
     * 设计产能
     */
    @Schema(description = "设计产能", type = "String")
    @Excel(name = "设计产能")
    private BigDecimal designCapacity;

    /** 工厂Id */
    /**
     * 工厂Id
     */
    @Schema(description = "工厂Id", type = "String")
//    @Excel(name = "工厂Id")
    private String plantId;

    /** 工厂 */
    /**
     * 工厂
     */
    @Schema(description = "适用工厂", type = "String")
    @Excel(name = "适用工厂")
    private String plant;

    /** 车间Id */
    /**
     * 车间Id
     */
    @Schema(description = "车间Id", type = "String")
//    @Excel(name = "车间Id")
    private String workShopId;

    /** 车间 */
    /**
     * 车间
     */
    @Schema(description = "适用车间", type = "String")
    @Excel(name = "适用车间")
    private String workShop;

    /** 日历Id */
    /**
     * 日历Id
     */
    @Schema(description = "日历Id", type = "Long")
//    @Excel(name = "日历Id")
    private Long workCalenderId;

    /** 日历描述 */
    /**
     * 日历描述
     */
    @Schema(description = "日历描述", type = "String")
    @Excel(name = "日历描述")
    private String workCalender;

    /** 产能模型Id */
    /**
     * 产能模型Id
     */
    @Schema(description = "产能模型Id", type = "Long")
//    @Excel(name = "产能模型Id")
    private Long modelId;


    /** 删除标志（0代表存在 2代表删除） */
    /**
     * 删除标志（0代表存在 2代表删除）
     */
    @Schema(description = "删除标志（0代表存在 2代表删除）", type = "String")
    private String delFlag;



    public String getMajor() {
@@ -111,168 +137,140 @@
        this.major = major;
    }

    public void setId(Long id) 
    {
    public void setId(Long id) {
        this.id = id;
    }

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

    public void setProcessNumber(String processNumber) 
    {
    public void setProcessNumber(String processNumber) {
        this.processNumber = processNumber;
    }

    public String getProcessNumber() 
    {
    public String getProcessNumber() {
        return processNumber;
    }

    public void setProcessName(String processName) 
    {
    public void setProcessName(String processName) {
        this.processName = processName;
    }

    public String getProcessName() 
    {
    public String getProcessName() {
        return processName;
    }

    public void setResourceGroupName(String resourceGroupName) 
    {
    public void setResourceGroupName(String resourceGroupName) {
        this.resourceGroupName = resourceGroupName;
    }

    public String getResourceGroupName() 
    {
    public String getResourceGroupName() {
        return resourceGroupName;
    }

    public void setModel(String model) 
    {
    public void setModel(String model) {
        this.model = model;
    }

    public String getModel() 
    {
    public String getModel() {
        return model;
    }

    public void setDesignCapacity(BigDecimal designCapacity)
    {
    public void setDesignCapacity(BigDecimal designCapacity) {
        this.designCapacity = designCapacity;
    }

    public BigDecimal getDesignCapacity()
    {
    public BigDecimal getDesignCapacity() {
        return designCapacity;
    }

    public void setPlantId(String plantId) 
    {
    public void setPlantId(String plantId) {
        this.plantId = plantId;
    }

    public String getPlantId() 
    {
    public String getPlantId() {
        return plantId;
    }

    public void setPlant(String plant) 
    {
    public void setPlant(String plant) {
        this.plant = plant;
    }

    public String getPlant() 
    {
    public String getPlant() {
        return plant;
    }

    public void setWorkShopId(String workShopId) 
    {
    public void setWorkShopId(String workShopId) {
        this.workShopId = workShopId;
    }

    public String getWorkShopId() 
    {
    public String getWorkShopId() {
        return workShopId;
    }

    public void setWorkShop(String workShop) 
    {
    public void setWorkShop(String workShop) {
        this.workShop = workShop;
    }

    public String getWorkShop() 
    {
    public String getWorkShop() {
        return workShop;
    }

    public void setWorkCalenderId(Long workCalenderId) 
    {
    public void setWorkCalenderId(Long workCalenderId) {
        this.workCalenderId = workCalenderId;
    }

    public Long getWorkCalenderId() 
    {
    public Long getWorkCalenderId() {
        return workCalenderId;
    }

    public void setDelFlag(String delFlag) 
    {
    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }

    public String getDelFlag() 
    {
    public String getDelFlag() {
        return delFlag;
    }

    public void setModelId(Long modelId) 
    {
    public void setModelId(Long modelId) {
        this.modelId = modelId;
    }

    public Long getModelId() 
    {
    public Long getModelId() {
        return modelId;
    }

    public void setWorkCalender(String workCalender) 
    {
    public void setWorkCalender(String workCalender) {
        this.workCalender = workCalender;
    }

    public String getWorkCalender() 
    {
    public String getWorkCalender() {
        return workCalender;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("processNumber", getProcessNumber())
            .append("processName", getProcessName())
            .append("resourceGroupName", getResourceGroupName())
            .append("model", getModel())
            .append("designCapacity", getDesignCapacity())
            .append("plantId", getPlantId())
            .append("plant", getPlant())
            .append("workShopId", getWorkShopId())
            .append("workShop", getWorkShop())
            .append("workCalenderId", getWorkCalenderId())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("modelId", getModelId())
            .append("workCalender", getWorkCalender())
            .append("major", getMajor())
            .toString();
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("processNumber", getProcessNumber())
                .append("processName", getProcessName())
                .append("resourceGroupName", getResourceGroupName())
                .append("model", getModel())
                .append("designCapacity", getDesignCapacity())
                .append("plantId", getPlantId())
                .append("plant", getPlant())
                .append("workShopId", getWorkShopId())
                .append("workShop", getWorkShop())
                .append("workCalenderId", getWorkCalenderId())
                .append("delFlag", getDelFlag())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("modelId", getModelId())
                .append("workCalender", getWorkCalender())
                .append("major", getMajor())
                .toString();
    }
}