#

lsh

2022-10-15 790cfb225efc0a377c6f602081681b93509cd96b

#

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

@@ -320,6 +320,18 @@
        }
        return R.error();
    }
    @PostMapping("/loc/detail2")
    @ManagerAuth(memo = "0101804库位数据详情")
    public R locDetail2(@RequestParam String locNo) {
        if (Cools.isEmpty(locNo)) {
            return R.parse(CodeRes.EMPTY);
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo));
        LocDetailVo vo = new LocDetailVo();
        vo.setChannel(locMast.getChannel());
        vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
        return R.ok().add(vo);
    }

    @Deprecated
    @PostMapping("/site/update")

 src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java

@@ -27,4 +27,9 @@
    PACK码
     */
    private String zpallet;

    /*
    通道
     */
    private Integer channel;
}

 src/main/webapp/views/index.html

@@ -23,8 +23,8 @@
<div class="sidebar">
    <div class="nav">
        <ul class="cl-effect-4">
            <li><button id="fire" style="background-color: #00FF00;border-radius: 30px">消防</button></li>
            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
            <li><button id="fire" style="border-radius: 30px">消防</button><br>
                <a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
            <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li>
            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>
        </ul>
@@ -52,12 +52,12 @@
        window.location.href = baseUrl + "/login";
    }
    $.ajax({
        url: baseUrl + "/console/crn/detail",
        url: "/ynwcs" + "/console/crn/detail",
        headers: {
            'token': localStorage.getItem('token')
        },
        data: {
            crnNo: id
            crnNo: 1
        },
        method: 'post',
        success: function (res) {
@@ -70,7 +70,26 @@
                }
            }
        }

    })
    $.ajax({
        url: "/ynwcs" + "/console/loc/detail2",
        headers: {
            'token': localStorage.getItem('token')
        },
        data: {
            locNo: "0101804"
        },
        method: 'post',
        success: function (res) {
            console.log(res);
            if (res.code === 200) {
                if (res.data.channel<=10240){
                    $("#fire").attr("style", "background-color: #00FF00;border-radius: 30px");
                }else {
                    $("#fire").attr("style", "background-color: #FD482C;border-radius: 30px");
                }
            }
        }
    })
    // 系统运行状态
    var systemRunning = true;