#优化 1. dom文件引用优化 2. 接口文档代码优化

skyouc

2025-02-20 2f79f04bac437c6a09b3ebf4d0458522c3d413d8

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

@@ -1,18 +1,18 @@
package com.vincent.rsf.server.manager.entity;

import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.*;

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;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,9 +22,11 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

@Data
@TableName("man_matnr")
@ApiModel(value = "Matnr", description = "物料所有基础属性")
public class Matnr implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -35,18 +37,6 @@
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 标识
     */
    @ApiModelProperty(value= "标识")
    private String uuid;

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

    /**
     * 名称
@@ -61,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编码
@@ -106,7 +108,7 @@
     * 描述
     */
    @ApiModelProperty(value= "描述")
    private String desc;
    private String describle;

    /**
     * 标包数量
@@ -142,7 +144,55 @@
     * 是否标签管理(*) 0:  否   1:  是  
     */
    @ApiModelProperty(value= "是否标签管理(*) 0:  否   1:  是  ")
    private Short isLabelMange;
    private Short flagLabelMange;

    /**
     * 安全库存
     */
    @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 String barcode;

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

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

    /**
     * 状态 1: 正常  0: 冻结  
@@ -195,27 +245,41 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 备注
     */
    @ApiModelProperty(value= "分类列表")
    @TableField(exist = false)
    private List<Matnr> children;

    public Matnr() {}

    public Matnr(String uuid,Long shipperId,String name,String code,Long groupId,String erpCode,String spec,String model,Double weight,String color,String size,String desc,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.uuid = uuid;
        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 flagLabelMange,Double safetyQty,Double minQty,Double maxQty,Integer stagnate,Integer validity,Integer validityWarn,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;
        this.weight = weight;
        this.color = color;
        this.size = size;
        this.desc = desc;
        this.describle = describle;
        this.nromNum = nromNum;
        this.unit = unit;
        this.purchaseUnit = purchaseUnit;
        this.stockUnit = stockUnit;
        this.stockLeval = stockLeval;
        this.isLabelMange = isLabelMange;
        this.flagLabelMange = flagLabelMange;
        this.safetyQty = safetyQty;
        this.minQty = minQty;
        this.maxQty = maxQty;
        this.stagnate = stagnate;
        this.validity = validity;
        this.validityWarn = validityWarn;
        this.flagCheck = flagCheck;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
@@ -227,11 +291,11 @@
    }

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

    public String getIsLabelMange$(){
        if (null == this.isLabelMange){ return null; }
        switch (this.isLabelMange){
        if (null == this.flagLabelMange){ return null; }
        switch (this.flagLabelMange){
            case 0:
                return " 否";
            case  1:
                return " 是";
            default:
                return String.valueOf(this.isLabelMange);
                return String.valueOf(this.flagLabelMange);
        }
    }