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

sfd

2025-05-14 f306557dbcfc1583a45e26d86fdfe0aa4b446fb4

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

@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
@@ -14,6 +15,7 @@
 * @author zhl
 * @date 2025-04-15
 */
@Data
public class ApsPlateProcessStat extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@@ -71,6 +73,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date computePlanEndDay;

    @Excel(name = "异常状态", width = 50)
    private String exceptionStatus;

    /** 设计工时 */

    private Long designTimes;
@@ -86,185 +91,193 @@

    private Boolean warning;

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

    public String getId() 
    {
        return id;
    }

    public void setWorkOrderNo(String workOrderNo) 
    {
        this.workOrderNo = workOrderNo;
    }

    public String getWorkOrderNo() 
    {
        return workOrderNo;
    }

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

    public String getProcessName() 
    {
        return processName;
    }

    public void setNum(Integer num) 
    {
        this.num = num;
    }

    public Integer getNum() 
    {
        return num;
    }

    public void setRouteProcessNumber(BigDecimal routeProcessNumber) 
    {
        this.routeProcessNumber = routeProcessNumber;
    }

    public BigDecimal getRouteProcessNumber() 
    {
        return routeProcessNumber;
    }

    public void setCurrentProcessNumber(BigDecimal currentProcessNumber) 
    {
        this.currentProcessNumber = currentProcessNumber;
    }

    public BigDecimal getCurrentProcessNumber() 
    {
        return currentProcessNumber;
    }

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

    public BigDecimal getProductionQuantity()
    {
        return productionQuantity;
    }

    public void setStandardTime(BigDecimal standardTime)
    {
        this.standardTime = standardTime;
    }

    public BigDecimal getStandardTime()
    {
        return standardTime;
    }

    public void setProcessTotalTime(BigDecimal processTotalTime)
    {
        this.processTotalTime = processTotalTime;
    }

    public BigDecimal getProcessTotalTime()
    {
        return processTotalTime;
    }

    public void setProcessPlanEndDay(Date processPlanEndDay)
    {
        this.processPlanEndDay = processPlanEndDay;
    }

    public Date getProcessPlanEndDay()
    {
        return processPlanEndDay;
    }

    public void setComputePlanEndDay(Date computePlanEndDay)
    {
        this.computePlanEndDay = computePlanEndDay;
    }

    public Date getComputePlanEndDay()
    {
        return computePlanEndDay;
    }

    public void setDesignTimes(Long designTimes) 
    {
        this.designTimes = designTimes;
    }

    public Long getDesignTimes() 
    {
        return designTimes;
    }

    public void setBatchNumber(String batchNumber) 
    {
        this.batchNumber = batchNumber;
    }

    public String getBatchNumber() 
    {
        return batchNumber;
    }
    public Date getProcessPlanStartDay() {
        return processPlanStartDay;
    }

    public void setProcessPlanStartDay(Date processPlanStartDay) {
        this.processPlanStartDay = processPlanStartDay;
    }

    public Date getOrderPlanEndDay() {
        return orderPlanEndDay;
    }

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

    public String getDelFlag() 
    {
        return delFlag;
    }
    public Boolean getWarning() {
        return warning;
    }

    public void setWarning(Boolean warning) {
        this.warning = warning;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("workOrderNo", getWorkOrderNo())
            .append("processName", getProcessName())
            .append("num", getNum())
            .append("routeProcessNumber", getRouteProcessNumber())
            .append("currentProcessNumber", getCurrentProcessNumber())
            .append("productionQuantity", getProductionQuantity())
            .append("standardTime", getStandardTime())
            .append("processTotalTime", getProcessTotalTime())
            .append("processPlanEndDay", getProcessPlanEndDay())
            .append("computePlanEndDay", getComputePlanEndDay())
            .append("designTimes", getDesignTimes())
            .append("batchNumber", getBatchNumber())
            .append("createBy", getCreateBy())
            .append("delFlag", getDelFlag())
            .toString();
    }
//    public void setId(String id)
//    {
//        this.id = id;
//    }
//
//    public String getId()
//    {
//        return id;
//    }
//
//    public void setWorkOrderNo(String workOrderNo)
//    {
//        this.workOrderNo = workOrderNo;
//    }
//
//    public String getWorkOrderNo()
//    {
//        return workOrderNo;
//    }
//
//    public void setProcessName(String processName)
//    {
//        this.processName = processName;
//    }
//
//    public String getProcessName()
//    {
//        return processName;
//    }
//
//    public void setNum(Integer num)
//    {
//        this.num = num;
//    }
//
//    public Integer getNum()
//    {
//        return num;
//    }
//
//    public void setRouteProcessNumber(BigDecimal routeProcessNumber)
//    {
//        this.routeProcessNumber = routeProcessNumber;
//    }
//
//    public BigDecimal getRouteProcessNumber()
//    {
//        return routeProcessNumber;
//    }
//
//    public void setCurrentProcessNumber(BigDecimal currentProcessNumber)
//    {
//        this.currentProcessNumber = currentProcessNumber;
//    }
//
//    public BigDecimal getCurrentProcessNumber()
//    {
//        return currentProcessNumber;
//    }
//
//    public void setProductionQuantity(BigDecimal productionQuantity)
//    {
//        this.productionQuantity = productionQuantity;
//    }
//
//    public BigDecimal getProductionQuantity()
//    {
//        return productionQuantity;
//    }
//
//    public void setStandardTime(BigDecimal standardTime)
//    {
//        this.standardTime = standardTime;
//    }
//
//    public BigDecimal getStandardTime()
//    {
//        return standardTime;
//    }
//
//    public void setProcessTotalTime(BigDecimal processTotalTime)
//    {
//        this.processTotalTime = processTotalTime;
//    }
//
//    public BigDecimal getProcessTotalTime()
//    {
//        return processTotalTime;
//    }
//
//    public void setProcessPlanEndDay(Date processPlanEndDay)
//    {
//        this.processPlanEndDay = processPlanEndDay;
//    }
//
//    public Date getProcessPlanEndDay()
//    {
//        return processPlanEndDay;
//    }
//
//    public void setComputePlanEndDay(Date computePlanEndDay)
//    {
//        this.computePlanEndDay = computePlanEndDay;
//    }
//
//    public Date getComputePlanEndDay()
//    {
//        return computePlanEndDay;
//    }
//
//    public void setDesignTimes(Long designTimes)
//    {
//        this.designTimes = designTimes;
//    }
//
//    public Long getDesignTimes()
//    {
//        return designTimes;
//    }
//
//    public void setBatchNumber(String batchNumber)
//    {
//        this.batchNumber = batchNumber;
//    }
//
//    public String getBatchNumber()
//    {
//        return batchNumber;
//    }
//    public Date getProcessPlanStartDay() {
//        return processPlanStartDay;
//    }
//
//    public void setProcessPlanStartDay(Date processPlanStartDay) {
//        this.processPlanStartDay = processPlanStartDay;
//    }
//
//    public Date getOrderPlanEndDay() {
//        return orderPlanEndDay;
//    }
//
//    public void setOrderPlanEndDay(Date orderPlanEndDay) {
//        this.orderPlanEndDay = orderPlanEndDay;
//    }
//    public void setDelFlag(String delFlag)
//    {
//        this.delFlag = delFlag;
//    }
//
//    public String getDelFlag()
//    {
//        return delFlag;
//    }
//    public Boolean getWarning() {
//        return warning;
//    }
//
//    public void setWarning(Boolean warning) {
//        this.warning = warning;
//    }
//
//    public String getExceptionStatus() {
//        return exceptionStatus;
//    }
//
//    public void setExceptionStatus(String exceptionStatus) {
//        this.exceptionStatus = exceptionStatus;
//    }
//
//    @Override
//    public String toString() {
//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
//            .append("id", getId())
//            .append("workOrderNo", getWorkOrderNo())
//            .append("processName", getProcessName())
//            .append("num", getNum())
//            .append("routeProcessNumber", getRouteProcessNumber())
//            .append("currentProcessNumber", getCurrentProcessNumber())
//            .append("productionQuantity", getProductionQuantity())
//            .append("standardTime", getStandardTime())
//            .append("processTotalTime", getProcessTotalTime())
//            .append("processPlanEndDay", getProcessPlanEndDay())
//            .append("computePlanEndDay", getComputePlanEndDay())
//            .append("designTimes", getDesignTimes())
//            .append("batchNumber", getBatchNumber())
//            .append("createBy", getCreateBy())
//            .append("delFlag", getDelFlag())
//            .toString();
//    }
}