Merge branch 'xgmFlasrs' into xgmFlasrs2 hebing

ZY

2024-09-21 01824c5104590b96a3040faa317969bcd812bcca

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

@@ -32,7 +32,7 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @ApiModelProperty(value= "序列码")
    @ApiModelProperty(value= "批号")
    private String batch;

    @ApiModelProperty(value= "单据编号")
@@ -151,6 +151,22 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 订单号
     */
    @TableField("out_order_no")
    private String outOrderNo;


    /**
     * 工单号
     */
    @TableField("pg_no")
    private String sPgNO;




    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){