#

1

2 天以前 328089b0ba2fc98e0f35dc5cab7578408b7daa60

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

@@ -1,9 +1,12 @@
package com.zy.asrs.entity;

import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.ToStringSerializer;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.zy.asrs.entity.param.TaskArmReportParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -70,16 +73,16 @@
    @ApiModelProperty(value= "状态")
    private Integer status;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "matnr")
    private String matnr;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "po")
    private String po;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "upc")
    private String upc;

    /**
@@ -88,7 +91,7 @@
    @ApiModelProperty(value= "货源")
    private String supplier;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "订单号")
    @TableField("order_no")
    private String orderNo;

@@ -119,11 +122,18 @@
    @TableField("arm_msg")
    private String armMsg;

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

    public BasArmMast() {}
    public BasArmMast(TaskArmReportParam param) {
        this.orderNo = param.getOrderNo();
        this.sku = param.getSku();
        this.matnr = param.getSku();
        this.matnr = param.getItem();
        this.po = param.getPo();
        this.upc = param.getUpc();
        this.supplier = param.getSupplier();
@@ -173,4 +183,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 "未知异常";
        }
    }
}