no message

skyouc

8 天以前 ce0f9490376709fdd96ce6b864bd105ac64f086c

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

@@ -5,10 +5,13 @@
import java.text.SimpleDateFormat;
import java.util.*;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.BatchRegularService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.ShipperService;
import com.vincent.rsf.server.system.entity.SerialRule;
import com.vincent.rsf.server.system.service.SerialRuleService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -221,7 +224,6 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    @ApiModelProperty("动态扩展字段")
@@ -245,6 +247,7 @@
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    private Date createTime;

    /**
@@ -258,6 +261,7 @@
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    private Date updateTime;

    /**
@@ -364,15 +368,14 @@
        }
        return null;
    }

    public String getRglarId$(){
        BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
        BatchRegular batchRegular = service.getById(this.rglarId);
        if (!Cools.isEmpty(batchRegular)){
            return String.valueOf(batchRegular.getCode());
        }
        return null;
    }
//    public String getRglarId$(){
//        SerialRuleService service = SpringUtils.getBean(SerialRuleService.class);
//        SerialRule batchRegular = service.getById(this.rglarId);
//        if (!Cools.isEmpty(batchRegular)){
//            return String.valueOf(batchRegular.getCode());
//        }
//        return null;
//    }

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