*

lsh

8 天以前 0970ed5ac8c8fd31d08fb5bc9f98ae01d0d6fbd4

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

@@ -55,7 +55,7 @@
     */
    @ApiModelProperty(value= "绑定标记")
    @TableField("binding_tags")
    private Integer bindingTags;
    private Long bindingTags;

    /**
     * 优先级
@@ -118,9 +118,16 @@
    @TableField("arm_msg")
    private String armMsg;

    /**
     * 异常信息
     */
    @ApiModelProperty(value= "条码")
    @TableField("barcode")
    private String barcode;

    public BasArmMastLog() {}

    public BasArmMastLog(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Integer bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
    public BasArmMastLog(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Long bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
        this.armNo = armNo;
        this.armDirection = armDirection;
        this.staNo = staNo;
@@ -138,6 +145,26 @@
        this.createTime = createTime;
        this.armError = armError;
        this.armMsg = armMsg;
    }
    public BasArmMastLog(BasArmMast basArmMast) {
        this.armNo = basArmMast.getArmNo();
        this.armDirection = basArmMast.getArmDirection();
        this.staNo = basArmMast.getStaNo();
        this.sortingLine = basArmMast.getSortingLine();
        this.bindingTags = basArmMast.getBindingTags();
        this.priority = basArmMast.getPriority();
        this.status = basArmMast.getStatus();
        this.matnr = basArmMast.getMatnr();
        this.sku = basArmMast.getSku();
        this.po = basArmMast.getPo();
        this.upc = basArmMast.getUpc();
        this.supplier = basArmMast.getSupplier();
        this.orderNo = basArmMast.getOrderNo();
        this.ctns = basArmMast.getCtns();
        this.createTime = basArmMast.getCreateTime();
        this.armError = basArmMast.getArmError();
        this.armMsg = basArmMast.getArmMsg();
        this.barcode = basArmMast.getBarcode();
    }

//    BasArmMastLog basArmMastLog = new BasArmMastLog(
@@ -161,4 +188,25 @@
//    );


    public String getStatus$() {
        if (Cools.isEmpty(status)) {return "未知异常";}
        switch (status){
            case 0:
                return "0.等待下发至机械臂";
            case 1:
                return "1.机械臂作业中";
            case 2:
                return "2.单码完成等待托盘完成";
            case 3:
                return "3.自动组托中";
            case 4:
                return "4.自动组托成功";
            case 5:
                return "5.等待机械臂订单完成";
            case 6:
                return "6.完结";
            default:
                return "未知异常";
        }
    }
}