【UPDATE】修改S1中部分功能实体字段类型为小数

huangjiayang

2025-04-23 c8aa8900258c9f497d6fc5844d8d9cc9e9ef7779

【UPDATE】修改S1中部分功能实体字段类型为小数

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

@@ -1,11 +1,13 @@
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;

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

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

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

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

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

@@ -1,11 +1,13 @@
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;

/**
 * 气体管路计划管理-临时对象 aps_gas_piping_plan_temp
@@ -75,11 +77,11 @@

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

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

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

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

@@ -1,11 +1,13 @@
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;

/**
 * 钣金计划临时表对象 aps_plate_plan_temp
@@ -75,11 +77,11 @@

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

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

    /** 工序号 */
    @Excel(name = "工序号")
@@ -308,22 +310,22 @@
        return versionNumber;
    }

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

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

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

    public Integer getGoodProductsQuantity()
    public BigDecimal getGoodProductsQuantity()
    {
        return goodProductsQuantity;
    }

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

@@ -1,11 +1,13 @@
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;

/**
 * 工艺路线对象 aps_process_route
@@ -55,7 +57,7 @@
    private Long completedCount;
    /** 废弃数量 */
    @Excel(name = "废弃数量")
    private Long discardCount;
    private BigDecimal discardCount;
    /** 集成日期 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "集成日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -64,10 +66,26 @@
    /** 工厂 */
//    @Excel(name = "工厂")
    private String plant;

    @Excel(name = "标准工时")
    private Long standardTime;
    private BigDecimal standardTime;

    @Excel(name = "工序排序")
    private Long processOrder;

    /** 工序ID */
    private String opId;

    /** 加工数量 */
    @Excel(name = "加工数量")
    private BigDecimal processQty;

    /** 工序状态 */
    private String opStatus;

    /** 账套代码 */
    private String orgCode;

    /** 删除标志（0代表存在 2代表删除） */
    private String delFlag;

@@ -213,19 +231,19 @@
                .toString();
    }

    public Long getDiscardCount() {
    public BigDecimal getDiscardCount() {
        return discardCount;
    }

    public void setDiscardCount(Long discardCount) {
    public void setDiscardCount(BigDecimal discardCount) {
        this.discardCount = discardCount;
    }

    public Long getStandardTime() {
    public BigDecimal getStandardTime() {
        return standardTime;
    }

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

@@ -236,4 +254,36 @@
    public void setProcessOrder(Long processOrder) {
        this.processOrder = processOrder;
    }

    public String getOpId() {
        return opId;
    }

    public void setOpId(String opId) {
        this.opId = opId;
    }

    public BigDecimal getProcessQty() {
        return processQty;
    }

    public void setProcessQty(BigDecimal processQty) {
        this.processQty = processQty;
    }

    public String getOpStatus() {
        return opStatus;
    }

    public void setOpStatus(String opStatus) {
        this.opStatus = opStatus;
    }

    public String getOrgCode() {
        return orgCode;
    }

    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
}