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

wang..123

2022-02-18 4901728f970314cddd9fa167cf3d3fb9476208e5

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

@@ -53,7 +53,10 @@
    @ApiModelProperty(value= "颜色")
    private String color;

    @ApiModelProperty(value= "单重")
    @ApiModelProperty(value= "批号")
    private String supplier;

    @ApiModelProperty(value= "每箱重量(KG)")
    private Double weight;

    /**
@@ -138,6 +141,31 @@
    @TableField(exist = false)
    private String locNo;

    /**
     * 总数量
     */
    @ApiModelProperty(value= "总数量")
    @TableField("all_qty")
    private Double allQty;

    /**
     * 总重
     */
    @ApiModelProperty(value= "总重量")
    @TableField("all_weight")
    private Double allWeight;

    @ApiModelProperty(value= "来源")
    @TableField("source")
    private String source;

    @ApiModelProperty(value= "供应商")
    @TableField("vendor")
    private String vendor;

    @ApiModelProperty(value= "每箱数量")
    @TableField("qty_box")
    private Double qtyBox;
    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";