#新增 1. 添加批次规则信息 2. 物料添加控制属性

skyouc

2025-02-18 cebd9afa05ca5b17ca62b672010c29d115b89d60

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java

@@ -4,6 +4,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;

import com.vincent.rsf.server.manager.service.BatchRegularService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.ShipperService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -36,13 +38,6 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;


    /**
     * 货主ID
     */
    @ApiModelProperty(value= "货主ID")
    private Long shipperId;

    /**
     * 名称
     */
@@ -56,10 +51,22 @@
    private String code;

    /**
     * 分组ID
     * 货主ID
     */
    @ApiModelProperty(value= "分组ID")
    @ApiModelProperty(value= "货主ID")
    private Long shipperId;

    /**
     * 分组ID(*)
     */
    @ApiModelProperty(value= "分组ID(*)")
    private Long groupId;

    /**
     * 规则代码
     */
    @ApiModelProperty(value= "规则代码")
    private Long batchRegularId;

    /**
     * ERP编码
@@ -140,6 +147,48 @@
    private Short isLabelMange;

    /**
     * 安全库存
     */
    @ApiModelProperty(value= "安全库存")
    private Double safetyQty;

    /**
     * 最小库存预警值
     */
    @ApiModelProperty(value= "最小库存预警值")
    private Double minQty;

    /**
     * 最大库存预警值
     */
    @ApiModelProperty(value= "最大库存预警值")
    private Double maxQty;

    /**
     * 停滞天数
     */
    @ApiModelProperty(value= "停滞天数")
    private Integer stagnate;

    /**
     * 保质期天数
     */
    @ApiModelProperty(value= "保质期天数")
    private Integer validity;

    /**
     * 效期预警阈值
     */
    @ApiModelProperty(value= "效期预警阈值")
    private Integer validityWarr;

    /**
     * 是否免检
     */
    @ApiModelProperty(value= "是否免检")
    private Short flagCheck;

    /**
     * 状态 1: 正常  0: 冻结  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 冻结  ")
@@ -192,11 +241,12 @@

    public Matnr() {}

    public Matnr(Long shipperId,String name,String code,Long groupId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.shipperId = shipperId;
    public Matnr(String name,String code,Long shipperId,Long groupId,Long batchRegularId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Double safetyQty,Double minQty,Double maxQty,Integer stagnate,Integer validity,Integer validityWarr,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.name = name;
        this.code = code;
        this.shipperId = shipperId;
        this.groupId = groupId;
        this.batchRegularId = batchRegularId;
        this.erpCode = erpCode;
        this.spec = spec;
        this.model = model;
@@ -210,6 +260,13 @@
        this.stockUnit = stockUnit;
        this.stockLeval = stockLeval;
        this.isLabelMange = isLabelMange;
        this.safetyQty = safetyQty;
        this.minQty = minQty;
        this.maxQty = maxQty;
        this.stagnate = stagnate;
        this.validity = validity;
        this.validityWarr = validityWarr;
        this.flagCheck = flagCheck;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
@@ -221,11 +278,11 @@
    }

//    Matnr matnr = new Matnr(
//            null,    // 标识
//            null,    // 货主ID
//            null,    // 名称
//            null,    // 编码
//            null,    // 分组ID
//            null,    // 货主ID
//            null,    // 分组ID(*)
//            null,    // 规则代码
//            null,    // ERP编码
//            null,    // 规格
//            null,    // 型号
@@ -239,6 +296,13 @@
//            null,    // 库位单位
//            null,    // 出入库优先级别[非空]
//            null,    // 是否标签管理(*)[非空]
//            null,    // 安全库存
//            null,    // 最小库存预警值
//            null,    // 最大库存预警值
//            null,    // 停滞天数
//            null,    // 保质期天数
//            null,    // 效期预警阈值
//            null,    // 是否免检
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
@@ -258,14 +322,23 @@
        return null;
    }

//    public String getGroupId$(){
//        MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
//        MatnrGroup matnrGroup = service.getById(this.groupId);
//        if (!Cools.isEmpty(matnrGroup)){
//            return String.valueOf(matnrGroup.getCode());
//        }
//        return null;
//    }
    public String getGroupId$(){
        MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
        MatnrGroup matnrGroup = service.getById(this.groupId);
        if (!Cools.isEmpty(matnrGroup)){
            return String.valueOf(matnrGroup.getCode());
        }
        return null;
    }

    public String getBatchRegularId$(){
        BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
        BatchRegular batchRegular = service.getById(this.batchRegularId);
        if (!Cools.isEmpty(batchRegular)){
            return String.valueOf(batchRegular.getCode());
        }
        return null;
    }

    public String getStockLeval$(){
        if (null == this.stockLeval){ return null; }