#

whycq

2023-06-27 fc9d08ef427c4fce72f469edbbb193c92249fd01

#

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

@@ -167,6 +167,19 @@
        return R.ok().add(list);
    }

    @PostMapping("/latest/inSta/data/barcode")
    @ManagerAuth(memo = "条码扫描仪实时数据")
    public R barcodeData(Integer barcodeId){
        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
        if (null == barcodeThread) {
            return R.ok();
        }
        BarcodeDataVo vo = new BarcodeDataVo();
        vo.setBarcodeId(barcodeId);
        vo.setCodeValue(barcodeThread.getBarcode());
        return R.ok().add(vo);
    }

    @PostMapping("/latest/data/scale")
    @ManagerAuth(memo = "磅秤实时数据")
    public R scaleLatestData(){

 src/main/webapp/views/console.html

@@ -34,8 +34,10 @@
        </div>
        <!-- 第4列 -->
        <div class="site-row site-row-4">
<!--            <div id="barcode-103" class="barcode" style="height: 36px;line-height: 36px;">80004175</div>-->
            <div id="site-103" class="site" style="height: 36px;line-height: 36px;">103</div>
            <div id="site-203" class="site" style="height: 30px;line-height: 30px;margin-top: 96px;">203</div>
<!--            <div id="barcode-203" class="barcode" style="height: 30px;line-height: 30px;margin-top: 96px;">80003736</div>-->
        </div>
        <!-- 第5列 -->
        <div class="site-row site-row-5">
@@ -1073,6 +1075,7 @@
        getSystemRunningStatus();
        getBarcodeInfo();
        getScaleInfo();
        getInStaBarcodeInfo(1);
    }, 1000);
    setInterval(function () {
        getSitesInfo();
@@ -1204,6 +1207,25 @@
            }
        });
    }
    // 入库站扫码器数据实时获取
    function getInStaBarcodeInfo(barcodeId) {
        $.ajax({
            url: baseUrl + "/latest/inSta/data/barcode",
            data: {barcodeId:barcodeId},
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            success: function (res) {
                console.log(res)
                if (res.code === 200){

                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";
                }  else {
                    console.log(res.msg);
                }
            }
        })
    }

    // 扫码器实时数据获取
    function getBarcodeInfo(){