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

zhanghl

2025-04-23 af2f1450e22d4b65e0013733e08025cdcd075b31

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

@@ -1,5 +1,6 @@
package com.aps.core.domain;

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

import com.aps.common.core.utils.uuid.IdUtils;
@@ -9,6 +10,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import org.apache.poi.hpsf.Decimal;
import org.springframework.data.annotation.Id;

import javax.annotation.processing.Generated;
@@ -80,11 +82,11 @@

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

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

    /** 工序号 */
    @Excel(name = "工序号")
@@ -309,22 +311,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;
    }