Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

tzsk

10 天以前 6fd6fd0b4e90a816989632506934bdfdb431f47f

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

@@ -34,10 +34,16 @@
    private Date ioTime;

    /**
     * 数量
     * 作业数量
     */
    @ApiModelProperty(value= "数量")
    @ApiModelProperty(value= "作业数量")
    private Double anfme;

    /**
     * 总库存
     */
    @ApiModelProperty(value= "总库存")
    private Double stock;

    /**
     * 托盘条码
@@ -48,7 +54,7 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**
@@ -268,6 +274,26 @@
    @ApiModelProperty(value= "备注")
    private String memo;


    @ApiModelProperty(value= "生产日期")
    @TableField("proddate")
    private Date proddate;
    @ApiModelProperty(value= "到期日期")
    @TableField("deadline")
    private Date deadline;
    public String getProddate$(){
        if (Cools.isEmpty(this.proddate)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd").format(this.proddate);
    }
    public String getDeadline$(){
        if (Cools.isEmpty(this.deadline)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd").format(this.deadline);
    }

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";