1.完善出库任务呼叫agv 2.完善agv任务下发 3.等等

zwl

6 天以前 b6681bc12173c1179d0185805ba461211472ac18

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

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.BasLocStsService;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -80,6 +80,12 @@
    private Integer lev1;

    /**
     * 组
     */
    @ApiModelProperty(value= "组")
    private Integer gro1;

    /**
     * 满板
     */
    @ApiModelProperty(value= "满板")
@@ -90,15 +96,29 @@
    @TableField("loc_type")
    private String locType;

    /**
     * 1.低库位
     * 2.高库位
     *
     */
    @ApiModelProperty(value= "高低类型{0:未知,1:低库位,2:高库位}")
    @TableField("loc_type1")
    private Short locType1;

    @ApiModelProperty(value= "宽窄类型{0:未知,1:窄库位,2:宽库位}")
    /**
     * 1.小托盘
     * 2.大托盘
     */
    @ApiModelProperty(value= "")
    @TableField("loc_type2")
    private Short locType2;

    @ApiModelProperty(value= "轻重类型{0:未知,1:轻库位,2:重库位}")
    /**
     * 滑块和连接器库区分
     * 1.滑块库
     * 2.链接器库
     */
    @ApiModelProperty(value= "")
    @TableField("loc_type3")
    private Short locType3;

@@ -176,12 +196,28 @@
    @TableField("ctn_no")
    private String ctnNo;

    /**
     * 是否冻结
     */
    @ApiModelProperty(value= "是否冻结,0.未冻结，1.已冻结")
    private Integer frozen;

    /**
     * 冻结备注
     */
    @ApiModelProperty(value= "冻结备注")
    @TableField("frozen_memo")
    private String frozenMemo;

    @ApiModelProperty(value= "拍照图片")
    private String pic;


    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = service.selectById(this.whsType);
        if (!Cools.isEmpty(basWhs)){
            return String.valueOf(basWhs.getWhsDesc());
        BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
        BasWhsType basWhsType = service.selectById(this.whsType);
        if (!Cools.isEmpty(basWhsType)){
            return String.valueOf(basWhsType.getWhsDesc());
        }
        return null;
    }
@@ -215,9 +251,9 @@
            case 0:
                return "未知";
            case 1:
                return "小库位";
                return "低库位";
            case 2:
                return "大库位";
                return "高库位";
            default:
                return String.valueOf(this.locType1);
        }
@@ -290,4 +326,16 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
    }

    public String getFrozen$() {
        if (null == this.frozen){ return "未冻结"; }
        switch (this.frozen){
            case 0:
                return "未冻结";
            case 1:
                return "已冻结";
            default:
                return "未冻结";
        }
    }

}