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

zhanghl

2025-04-27 3880de9f96b068dfa8b1f35fcac0060f3d4ad604

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

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

import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -50,7 +51,7 @@

    /** 最早可提前生产天数 */
    @Excel(name = "最早可提前生产天数")
    private String advanceProductionDays;
    private BigDecimal advanceProductionDays;

    /** 拆分批量 */
    @Excel(name = "拆分批量")
@@ -163,12 +164,12 @@
        return versionNumber;
    }

    public void setAdvanceProductionDays(String advanceProductionDays) 
    public void setAdvanceProductionDays(BigDecimal advanceProductionDays)
    {
        this.advanceProductionDays = advanceProductionDays;
    }

    public String getAdvanceProductionDays() 
    public BigDecimal getAdvanceProductionDays()
    {
        return advanceProductionDays;
    }