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

zjj

2023-05-31 298285bf63c0cec97fab0c64df4c010c5d2aebe6

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

@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.core.common.SpringUtils;
import com.zy.asrs.service.LocOwnerService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -47,11 +50,17 @@
    private String matnr;

    /**
     * 物料号
     */
    @ApiModelProperty(value= "物料名")
    private String maktx;

    /**
     * 盘点前数量
     */
    @ApiModelProperty(value= "盘点前数量")
    @TableField("origin_anfme")
    private Double originAnfme;
    @TableField("anfme")
    private Double anfme;

    /**
     * 真实数量
@@ -96,21 +105,49 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    public LocCheck() {}
    @ApiModelProperty(value= "差异量")
    @TableField("diff_anfme")
    private Double diffAnfme;

    public LocCheck(Integer type,String locNo,String matnr,Double originAnfme,Double realAnfme,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.type = type;
        this.locNo = locNo;
        this.matnr = matnr;
        this.originAnfme = originAnfme;
        this.realAnfme = realAnfme;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    @ApiModelProperty(value= "单据号")
    @TableField("order_no")
    private String orderNo;

    @ApiModelProperty(value= "审核")
    private Integer examine;

    @ApiModelProperty(value= "拥有者 1: 杰克   ")
    private Integer owner;

    /**
     * 货物形态:0：代采、1：仓储
     */
    @ApiModelProperty(value= "货物形态:0：代采、1：仓储")
    private Integer payment;

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

    public String getPayment$(){
        if (null == this.payment){ return null; }
        switch (this.payment){
            case 1:
                return "仓储";
            case 0:
                return "代采";
            default:
                return String.valueOf(this.payment);
        }
    }



//    LocCheck locCheck = new LocCheck(
//            null,    // 状态
//            null,    // 库位号