#

Junjie

2 天以前 1c6befe06b8a19dd5da1e34fc667d45be1597bb7

#

 src/main/java/com/zy/asrs/controller/LocMastController.java

@@ -165,6 +165,7 @@
                locMast.setRow1(row);
                locMast.setBay1(bay);
                locMast.setLev1(lev);
                locMast.setStatus(1);

                if (mapNode.getValue() == MapNodeType.NORMAL_PATH.id) {
                    locMast.setLocSts(LocStsType.O.toString());

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

@@ -112,6 +112,10 @@
    @TableField("qr_code_value")
    private String qrCodeValue;

    @ApiModelProperty(value= "")
    @TableField("status")
    private Integer status;

    public String getLocSts$(){
        BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
        BasLocSts basLocSts = service.selectById(this.locSts);

 src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java

@@ -129,7 +129,7 @@
                //当前穿梭车库位号
                String currentLocNo = shuttleProtocol.getCurrentLocNo();
                //当前穿梭车线程到目标地点距离
                List<NavigateNode> currentShuttlePath = navigateUtils.calc(currentLocNo, locNo, new ArrayList<NavigationMapType>(){{add(NavigationMapType.NORMAL);}}, Utils.getShuttlePoints(shuttleNo, Utils.getLev(currentLocNo)), null);//搜索空闲穿梭车，使用正常通道地图
                List<NavigateNode> currentShuttlePath = navigateUtils.calc(currentLocNo, locNo, NavigationMapType.getMapTypes(NavigationMapType.NORMAL), Utils.getShuttlePoints(shuttleNo, Utils.getLev(currentLocNo)), null);//搜索空闲穿梭车，使用正常通道地图
                if (currentShuttlePath == null) {
                    continue;
                }

 src/main/resources/mapper/LocMastMapper.xml

@@ -21,6 +21,7 @@
        <result column="error_time" property="errorTime" />
        <result column="error_memo" property="errorMemo" />
        <result column="qr_code_value" property="qrCodeValue" />
        <result column="status" property="status" />

    </resultMap>