#

18516761980

2022-08-16 ca02d097a870ebee2935215f6c187d34fe08c8a9

#

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

@@ -107,6 +107,7 @@
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vo.setNearbySta(staProtocol.getNearbySta());  //RGV位置
            vos.add(vo);
        }
        return R.ok().add(vos);

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -52,6 +52,9 @@
    // 入库暂存数
    private Short inQty;

    // 隔壁站点（台车位置）
    private String nearbySta;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
        basDevp.setDevNo(siteId);

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -141,20 +141,7 @@
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 目标站
            }
        }
//        Thread.sleep(200);
//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
//        if (result0.IsSuccess) {
//            for (int i = 0; i < 93; i++) {
//                Integer siteId = staNos.get(i); // 站点编号
//                StaProtocol staProtocol = station.get(siteId);
//                if (null == staProtocol) {
//                    staProtocol = new StaProtocol();
//                    staProtocol.setSiteId(siteId);
//                    station.put(siteId, staProtocol);
//                }
//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 目标站
//            }
//        }

        Thread.sleep(200);
        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize));
        if (result1.IsSuccess) {
@@ -177,8 +164,9 @@
            }
        }

        //条码
        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.150",(short)(barcodeSize*8));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.160",(short)4);
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
@@ -190,6 +178,22 @@

        }

        //RGV台车位置
        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.150",(short)(barcodeSize*8));
        if (result3.IsSuccess) {
            for (int i = 0; i < 2; i++) {
                Integer siteId = i==0 ? 112 : 212; // 站点编号
                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2)));
            }
        }

//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
//        if (result2.IsSuccess) {
//            this.ioMode = IoModeType.get(result2.Content);

 src/main/webapp/views/console.html

@@ -344,7 +344,7 @@
            url: baseUrl + '/console/barcode/output/site',
            method: 'GET',
            success: function (res) {
                console.log(res)
                // console.log(res)
                if (res.code === 200) {
                    tData = eval(res.data);
                    if (tData.length <= 5) {
@@ -552,6 +552,7 @@

    // 输送设备实时数据获取
    function getSitesInfo() {
        // carAnimate(112,4);
        $.ajax({
            url: baseUrl + "/console/latest/data/site",
            headers: {'token': localStorage.getItem('token')},
@@ -567,8 +568,9 @@
                        } else {
                            siteEl.html(sites[i].siteId);
                        }
                        if (i + 1 === 8) {
                            carAnimate(i + 1, Number(sites[i].nearbySta));
                        // RGV位置
                        if(sites[i].siteId === '112' || sites[i].siteId === '212'){
                            carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                        }
                    }
                } else if (res.code === 403) {
@@ -707,23 +709,47 @@

    // 小车偏移动画
    function carAnimate(id, target) {
        var targetTop = 122;
        if (id === 8) {
        var targetTop = 0;
        if (id === 112) {
            switch (target) {
                case 1:
                    targetTop += 160;
                    targetTop += 313;
                    break;
                case 2:
                    targetTop += 140;
                    targetTop += 313;
                    break;
                case 3:
                    targetTop += 80;
                    targetTop += 256;
                    break;
                case 4:
                    targetTop += 40;
                    targetTop += 226;
                    break;
                case 7:
                    targetTop += 0;
                case 5:
                    targetTop += 168;
                case 6:
                    targetTop += 168;
                    break;
                default:
                    return;
            }
        } else if (id === 212) {
            switch (target) {
                case 1:
                    targetTop += 313;
                    break;
                case 2:
                    targetTop += 313;
                    break;
                case 3:
                    targetTop += 256;
                    break;
                case 4:
                    targetTop += 226;
                    break;
                case 5:
                    targetTop += 168;
                case 6:
                    targetTop += 168;
                    break;
                default:
                    return;