输送线、堆垛机位置调整

zjj

2023-05-13 b9233584fbecccc0d4d4339f7cad410fdddfb6cd

输送线、堆垛机位置调整

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

@@ -180,9 +180,9 @@
//        updateIoMode();
        ArrayList<Integer> staNos = getStaNo();
        int staNoSize = staNos.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*2));
        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
        if (result.IsSuccess && result4.IsSuccess) {
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
//        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
        if (result.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                StaProtocol staProtocol = station.get(siteId);
@@ -191,9 +191,9 @@
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 工作号
                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 工作号

                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result4.Content, i*2));   // 目标站
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4+2));   // 目标站
            }
        }
//        Thread.sleep(200);
@@ -212,27 +212,18 @@
//        }
        //条码扫描器
        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize/2*8));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)(8));
        if (result2.IsSuccess) {
            if (slave.getId()==1){
                for (int i = 0; i < barcodeSize/2; i++) {
                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
                    if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
//                            && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
                        barcodeThread.setBarcode(barcode);
                    }
                }
            }else if (slave.getId()==2){
                for (int i = barcodeSize/2; i < barcodeSize; i++) {
                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-barcodeSize/2)*8,8, "UTF-8");
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                    if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
//                            && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
                        barcodeThread.setBarcode(barcode);
                    }
                }

            }

        }

        Thread.sleep(200);
@@ -300,6 +291,25 @@
            }
        }


        //RGV台车位置
        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.1",(short)2);
        if (result3.IsSuccess) {
                Integer siteId = 13; // 站点编号
                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(result3.Content, 0)));
//                String aa = staProtocol.getNearbySta();
//                System.out.println(siteId + "===>>" + staProtocol.getNearbySta());

        }


//        //RGV小车
//        Thread.sleep(200);
//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);

 src/main/webapp/static/js/console.map.js

@@ -169,7 +169,7 @@
                            "top": 157,
                            "left": 283,
                            "width": 4,
                            "height": 245
                            "height": 267
                        },
                        {
                            "type": "track",
@@ -178,7 +178,7 @@
                            "top": 157,
                            "left": 330,
                            "width": 4,
                            "height": 245
                            "height": 267
                        },
                        {
                            "type": "stn",

 src/main/webapp/views/console.html

@@ -568,10 +568,15 @@
                            siteEl.html(sites[i].siteId);
                        }

                        if (sites[i].siteId === '16' || sites[i].siteId === '016') {

                        // RGV位置
                        if(sites[i].siteId === '13' || sites[i].siteId === '013'){
                            carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                        }

                        // if (sites[i].siteId === '16' || sites[i].siteId === '016') {
                        //
                        //     carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                        // }
                    }
                } else if (res.code === 403) {
                    parent.location.href = baseUrl + "/login";
@@ -601,25 +606,15 @@
                            crns[i].bay = 1
                        }
                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
                        // crns[i].bay = 15;
                        crns[i].bay = 8;
                        var offSet = 0;
                        switch (i) {
                            case 0:
                            case 1:
                            case 2:
                            case 3:
                                unit = 35;
                                offSet = 500;
                                unit = 30;
                                offSet = 380;
                                break;
                            case 5:
                                unit = 124;
                                offSet = 550;
                                break;
                            case 4:
                            case 6:
                                unit = 62;
                                offSet = 550;
                                break;

                        }

                        if(crns[i].bay === 1){
@@ -715,38 +710,24 @@
    function carAnimate(id, target) {
        // debugger
        var targetTop = 0;
        if (id === 16 || id === '16' || id === '016') {
        if (id === 13 || id === '13' || id === '013') {
            switch (target) {
                case 1:
                    targetTop += 827;
                    targetTop += 168;
                    break;
                case 2:
                    targetTop += 765;
                    targetTop += 226;
                    break;
                case 3:
                    targetTop += 651;
                    targetTop += 305;
                    break;
                case 4:
                    targetTop += 589;
                    targetTop += 363;
                    break;
                case 5:
                    targetTop += 505;
                    targetTop += 389;
                    break;
                case 6:
                    targetTop += 443;
                    break;
                case 7:
                    targetTop += 362;
                    break;
                case 8:
                    targetTop += 297;
                    break;
                case 9:
                    targetTop += 243;
                    break;
                case 10:
                    targetTop += 129;
                    break;

                default:
                    return;
            }