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

zhanghl

2025-05-23 687c9b21d0c8aedbd0c3f2d64b11cfaad5e38e85

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

@@ -1,14 +1,12 @@
package com.aps.core.domain;

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
import org.springframework.data.annotation.Id;

/**
@@ -31,7 +29,7 @@
    /**
     * 适用工厂  参考 aps_factory
     */
    @Excel(name = "适用工厂  参考 aps_factory")
    @Excel(name = "适用工厂")
    @Schema(description = "适用工厂  参考 aps_factory")
    private String factory;

@@ -45,20 +43,26 @@
    /**
     * 专业 参考   aps_domain
     */
    @Excel(name = "专业 参考   aps_domain")
    @Excel(name = "专业归属")
    @Schema(description = "专业 参考   aps_domain")
    private String domain;

    /**
     * 是否为主阶 是/否
     */
    @Excel(name = "是否为主阶 是/否")
    @Excel(name = "是否主阶料号")
    @Schema(description = "是否为主阶 是/否")
    private String isMain;

    @JsonIgnore
    @TableField(exist = false)
    private String key;
    /**
     * 料号类别 制造件/采购件
     */
    @Excel(name = "料号类别")
    @Schema(description = "料号类别 制造件/采购件")
    private String materialType;

    @JsonIgnore
    public String getKey() {
@@ -66,76 +70,5 @@
            key = getFactory() + "##" + getMaterialCode();
        }
        return key;
    }

    /**
     * 料号类别 制造件/采购件
     */
    @Excel(name = "料号类别 制造件/采购件")
    @Schema(description = "料号类别 制造件/采购件")
    private String materialType;

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

    public Long getId() {
        return id;
    }

    public void setFactory(String factory) {
        this.factory = factory;
    }

    public String getFactory() {
        return factory;
    }

    public void setMaterialCode(String materialCode) {
        this.materialCode = materialCode;
    }

    public String getMaterialCode() {
        return materialCode;
    }

    public void setDomain(String domain) {
        this.domain = domain;
    }

    public String getDomain() {
        return domain;
    }

    public void setIsMain(String isMain) {
        this.isMain = isMain;
    }

    public String getIsMain() {
        return isMain;
    }

    public void setMaterialType(String materialType) {
        this.materialType = materialType;
    }

    public String getMaterialType() {
        return materialType;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("factory", getFactory())
                .append("materialCode", getMaterialCode())
                .append("domain", getDomain())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("isMain", getIsMain())
                .append("materialType", getMaterialType())
                .toString();
    }
}