#
whycq
2023-06-27 759e123c07b3e89550564a3137491e16c300b9f9
#
2个文件已修改
32 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/ConsoleController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/console.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -167,18 +167,6 @@
        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 = "磅秤实时数据")
src/main/webapp/views/console.html
@@ -1075,7 +1075,6 @@
        getSystemRunningStatus();
        getBarcodeInfo();
        getScaleInfo();
        getInStaBarcodeInfo(1);
    }, 1000);
    setInterval(function () {
        getSitesInfo();
@@ -1206,25 +1205,6 @@
                }
            }
        });
    }
    // 入库站扫码器数据实时获取
    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);
                }
            }
        })
    }
    // 扫码器实时数据获取