#

zyx

2024-04-07 7ad79ee463adbdbc51e37c12ae025fb8598ab670

 src/main/java/com/zy/asrs/entity/LocInPrintMat.java

@@ -5,6 +5,7 @@
import com.core.common.Cools;import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
import com.zy.asrs.service.LocOwnerService;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -112,6 +113,12 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    /**
     * 商品名称
     */
    @ApiModelProperty(value= "商品名称")
    private Long ownerId;

    public LocInPrintMat() {}

    public LocInPrintMat(String uuid,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,Double anfme,String locNo,String maktx) {
@@ -130,11 +137,11 @@
    }

    public LocInPrintMat(Date now,Long userId,String matnr,String batch,Double anfme,String locNo,String maktx) {
        this.uuid = now.toString();
        this.uuid = String.valueOf(now.getTime());
        this.createTime = now;
        this.createBy = userId;
        this.updateTime = now;
        this.updateBy = userId;
//        this.updateTime = now;
//        this.updateBy = userId;
        this.matnr = matnr;
        this.batch = batch;
        this.anfme = anfme;
@@ -185,6 +192,15 @@
        return null;
    }

    public String getOwner$(){
        LocOwnerService locOwnerService = SpringUtils.getBean(LocOwnerService.class);
        LocOwner locOwner = locOwnerService.selectById(this.ownerId);
        if (!Cools.isEmpty(locOwner)){
            return String.valueOf(locOwner.getOwner());
        }
        return null;
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";