Merge remote-tracking branch 'origin/bfwcs6' into bfwcs6

whycq

2023-07-08 f107eaf4d1857d2230a5bc6983e4beb7fb811aa1

 src/main/webapp/views/console.html

@@ -34,10 +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="barcode-1" class="barcode"></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 id="barcode-2" class="barcode"></div>
        </div>
        <!-- 第5列 -->
        <div class="site-row site-row-5">
@@ -1075,7 +1075,6 @@
        getSystemRunningStatus();
        getBarcodeInfo();
        getScaleInfo();
        getInStaBarcodeInfo(1);
    }, 1000);
    setInterval(function () {
        getSitesInfo();
@@ -1207,25 +1206,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);
                }
            }
        })
    }

    // 扫码器实时数据获取
    function getBarcodeInfo(){
@@ -1237,7 +1217,7 @@
                if (res.code === 200){
                    var barcodes = res.data;
                    for (var i = 0; i < barcodes.length; i++){
                        $("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
                        $("#barcode-"+barcodes[i].barcodeId).html(barcodes[i].codeValue ? barcodes[i].codeValue : "--");
                    }
                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";