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

zhanghl

2025-04-27 3880de9f96b068dfa8b1f35fcac0060f3d4ad604

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

@@ -1,17 +1,13 @@
package com.aps.core.domain;

import java.util.Date;

import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.core.utils.uuid.UUID;
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 org.springframework.data.annotation.Id;

import javax.annotation.processing.Generated;
import java.math.BigDecimal;
import java.util.Date;

/**
 * 零件计划管理对象 aps_part_plan
@@ -80,11 +76,11 @@

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

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

    /** 工序号 */
    @Excel(name = "工序号")
@@ -164,6 +160,10 @@
    /** 风险标识 */
    @Excel(name = "风险标识")
    private Integer hasRisk;

    /** 作业（工序名称） */
    @Excel(name = "作业")
    private String stdOp;

    /** 工厂 */
//    @Excel(name = "工厂")
@@ -309,22 +309,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;
    }
@@ -519,6 +519,14 @@
        return hasRisk;
    }

    public void setStdOp(String stdOp) {
        this.stdOp = stdOp;
    }

    public String getStdOp() {
        return stdOp;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -557,7 +565,8 @@
            .append("isStockComplete", getIsStockComplete())
            .append("hasTurnback", getHasTurnback())
            .append("hasRisk", getHasRisk())
                .append("plant", getPlant())
            .append("plant", getPlant())
            .append("stdOp", getStdOp())
            .toString();
    }
    public String getPlant() {