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

zhanghl

2025-04-27 3880de9f96b068dfa8b1f35fcac0060f3d4ad604

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

@@ -1,11 +1,14 @@
package com.aps.core.domain;

import java.util.Date;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * 气体管路计划管理对象 aps_gas_piping_plan
@@ -74,11 +77,11 @@

    /** 生产数量 */
    @Excel(name = "生产数量")
    private Long productionQuantity;
    private BigDecimal productionQuantity;

    /** 良品数量 */
    @Excel(name = "良品数量")
    private Long goodProductsQuantity;
    private BigDecimal goodProductsQuantity;

    /** 工序号 */
    @Excel(name = "工序号")
@@ -119,11 +122,9 @@
    private String nextProcessDeparment;

    /** 是否挂起 */
//    @Excel(name = "是否挂起")
    private Integer isSuspended;
    /** 是否挂起 */
    @Excel(name = "是否挂起")
    private String isSuspendedTxt;
    private String isSuspended;

    /** 外协标识 */
    @Excel(name = "外协标识")
    private String isOutsourcing;
@@ -160,7 +161,28 @@
    /** 风险标识 */
    @Excel(name = "风险标识")
    private Integer hasRisk;
    private String plant;

    public String getPlanType() {
        return planType;
    }

    public void setPlanType(String planType) {
        this.planType = planType;
    }

    private String planType;

    /** 工序列表 */
    private List<ApsProcessRoute> apsProcessRoutes;

    public List<ApsProcessRoute> getApsProcessRoutes() {
        return apsProcessRoutes;
    }

    public void setApsProcessRoutes(List<ApsProcessRoute> apsProcessRoutes) {
        this.apsProcessRoutes = apsProcessRoutes;
    }

    public void setId(String id)
    {
        this.id = id;
@@ -301,22 +323,22 @@
        return versionNumber;
    }

    public void setProductionQuantity(Long productionQuantity)
    public void setProductionQuantity(BigDecimal productionQuantity)
    {
        this.productionQuantity = productionQuantity;
    }

    public Long getProductionQuantity()
    public BigDecimal getProductionQuantity()
    {
        return productionQuantity;
    }

    public void setGoodProductsQuantity(Long goodProductsQuantity)
    public void setGoodProductsQuantity(BigDecimal goodProductsQuantity)
    {
        this.goodProductsQuantity = goodProductsQuantity;
    }

    public Long getGoodProductsQuantity()
    public BigDecimal getGoodProductsQuantity()
    {
        return goodProductsQuantity;
    }
@@ -411,12 +433,12 @@
        return nextProcessDeparment;
    }

    public void setIsSuspended(Integer isSuspended)
    public void setIsSuspended(String isSuspended)
    {
        this.isSuspended = isSuspended;
    }

    public Integer getIsSuspended()
    public String getIsSuspended()
    {
        return isSuspended;
    }
@@ -550,21 +572,5 @@
                .append("hasTurnback", getHasTurnback())
                .append("hasRisk", getHasRisk())
                .toString();
    }

    public String getIsSuspendedTxt() {
        return isSuspendedTxt;
    }

    public void setIsSuspendedTxt(String isSuspendedTxt) {
        this.isSuspendedTxt = isSuspendedTxt;
    }

    public String getPlant() {
        return plant;
    }

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