#
whycq
2024-07-05 9b3597b56300ed244a04527481c1b62e520d574b
#
6个文件已修改
833 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/SiteController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/console.map.js 700 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/console.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/crn.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/SiteController.java
@@ -77,6 +77,7 @@
            list.add(vo);
            StaProtocol staProtocol = station.get(devp.getDevNo());
            if (null == staProtocol) { continue; }
            vo.setWorkNo(staProtocol.getWorkNo());
            vo.setAutoing(staProtocol.isAutoing()?"Y":"N");     //  自动
            vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
            vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 可入
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -55,7 +55,8 @@
        add(104);add(105);add(106);add(107);
        add(108);add(109);add(110);add(111);
        add(112);add(113);add(114);add(115);
        add(116);add(117);
        add(116);add(117);add(118);add(119);
        add(120);add(121);add(122);add(123);
    add(200);add(201);add(202);add(203);
    add(204);add(205);add(206);add(207);
@@ -144,7 +145,7 @@
    private void initSite() {
        count ++;
        ArrayList<Integer> staNos = getStaNo();
        if(count > 40) {
        if(count > 48) {
            // 站点编号
            for (Integer siteId : staNos) {
                StaProtocol staProtocol = station.get(siteId);
@@ -198,6 +199,7 @@
        ArrayList<Integer> staNos = getStaNo();
        int staNoSize = staNos.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
        OperateResultExOne<byte[]> result200 = siemensS7Net.Read("DB101.800", (short) (staNoSize*8));
        if (result.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
@@ -207,11 +209,21 @@
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8));     // 工作号
                boolean[] status = null;
                if(i < 24){
                    staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8));     // 工作号
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4));   // 目标站
                    staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4));   // 目标站
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
                    status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
                }else {
                    staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result200.Content, (i-24)*8));     // 工作号
                    staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result200.Content, (i-24)*8 + 4));   // 目标站
                    status = siemensS7Net.getByteTransform().TransBool(result200.Content, (i-24)*8 + 6, 2);
                }
                staProtocol.setAutoing(status[0]);  // 自动
                staProtocol.setLoading(status[1]);  // 有物
                staProtocol.setInEnable(status[2]); // 可入
@@ -226,9 +238,10 @@
                }
            }
        }
        //条码扫描器
        ArrayList<Integer> barcodeList = BarcodeList;
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.1648", (short) (barcodeList.size() * 8));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeList.size(); i++) {
                Integer barcodeId = barcodeList.get(i);
@@ -242,9 +255,9 @@
        //外形检测
        ArrayList<Integer> staNoErrs = staNosErrList;
        int staNoErrsSize = staNoErrs.size();
        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (staNoErrsSize*8));
        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.1608", (short) (staNoErrsSize*8));
        if (resultErr.IsSuccess){
            for (int i = 0;i<3;i++){
            for (int i = 0;i<2;i++){
                Integer siteId = staNoErrs.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4+2, 1);
                StaProtocol staProtocol = station.get(siteId);
@@ -259,7 +272,7 @@
        }
        //plc故障
        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.1728", (short) (staNoSize*4));
        if (resultErr2.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
@@ -343,6 +356,11 @@
        }
        ArrayList<Integer> staNos = getStaNo();
        int index = staNos.indexOf(staProtocol.getSiteId());
        if(index >= 24){
            index = 76 + index;
        }
        OperateResult write = null;
        OperateResult write1 = null;
        //任务下发次数
src/main/resources/application.yml
@@ -43,7 +43,7 @@
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12,13,16
  # 一个堆垛机负责的货架排数
  groupCount: 4
  groupCount: 2
  # 堆垛机1
  crn[0]:
    id: 1
@@ -57,30 +57,30 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 103
      row: 1
      staNo: 218
      row: 2
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 106
      row: 2
      staNo: 222
      row: 1
      bay: 1
      lev: 1
    # 堆垛机入库站点
    crnInStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 204
      row: 1
      bay: 41
      staNo: 118
      row: 2
      bay: 42
      lev: 1
    # 堆垛机出库站点
    crnOutStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 208
      row: 2
      bay: 41
      staNo: 122
      row: 1
      bay: 42
      lev: 1
  # 堆垛机2
  crn[1]:
@@ -95,30 +95,30 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 108
      row: 3
      staNo: 211
      row: 4
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 111
      row: 4
      staNo: 215
      row: 3
      bay: 1
      lev: 1
    # 堆垛机入库站点
    crnInStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 211
      row: 3
      bay: 41
      staNo: 111
      row: 4
      bay: 42
      lev: 1
    # 堆垛机出库站点
    crnOutStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 215
      row: 4
      bay: 41
      staNo: 115
      row: 3
      bay: 42
      lev: 1
  # 堆垛机3
  crn[2]:
@@ -133,29 +133,29 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 113
      row: 5
      staNo: 204
      row: 6
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 116
      row: 6
      staNo: 208
      row: 5
      bay: 1
      lev: 1
    # 堆垛机入库站点
    crnInStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 218
      row: 5
      staNo: 104
      row: 6
      bay: 41
      lev: 1
    # 堆垛机出库站点
    crnOutStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 222
      row: 6
      staNo: 108
      row: 5
      bay: 41
      lev: 1
  # 输送线1
@@ -203,18 +203,18 @@
      led: ${wcs-slave.led[1].id}
    # 出库口1
    outSta[0]:
      staNo: 117
      staNo: 123
    outSta[1]:
      staNo: 223
  # 条码扫描仪1
  barcode[0]:
    id: 1
    ip: 10.10.10.121
    ip: 10.10.10.143
    port: 51236
  # 条码扫描仪2
  barcode[1]:
    id: 2
    ip: 10.10.10.122
    ip: 10.10.10.146
    port: 51236
  # LED1
  led[0]:
@@ -229,4 +229,4 @@
    ip: 10.10.10.102
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 106
    staArr: 200
src/main/webapp/static/js/console.map.js
@@ -1,476 +1,540 @@
mapInfo = {
mapInfo ={
    "mapName": "xgmFlwcs",
    "rackCount": 6,
    "crnCount": 6,
    "stbCount": 40,
    "hpPosition": 1,
    "crnCount": 3,
    "stbCount": 48,
    "hpPosition": 0,
    "minBayNo": 2,
    "floors": 1,
    "racks": [{
        "type": "rack",
        "id": "rack6",
        "top": 204,
        "left": 551,
        "width": 800,
        "height": 20,
        "minBayNo": 2,
        "maxBayNo": 40
    }, {
        "type": "rack",
        "id": "rack5",
        "top": 250,
        "left": 551,
        "width": 800,
        "top": 448,
        "left": 447,
        "width": 845,
        "height": 20,
        "minBayNo": 2,
        "maxBayNo": 40
        "maxBayNo": 41
    }, {
        "type": "rack",
        "id": "rack2",
        "top": 355,
        "left": 551,
        "width": 800,
        "id": "rack6",
        "top": 500,
        "left": 447,
        "width": 845,
        "height": 20,
        "minBayNo": 2,
        "maxBayNo": 40
        "maxBayNo": 41
    }, {
        "type": "rack",
        "id": "rack4",
        "top": 277,
        "left": 551,
        "width": 800,
        "top": 427,
        "left": 447,
        "width": 845,
        "height": 20,
        "minBayNo": 2,
        "maxBayNo": 40
        "maxBayNo": 41
    }, {
        "type": "rack",
        "id": "rack1",
        "top": 401,
        "left": 551,
        "width": 800,
        "top": 311,
        "left": 447,
        "width": 845,
        "height": 20,
        "minBayNo": 2,
        "maxBayNo": 40
        "maxBayNo": 41
    }, {
        "type": "rack",
        "id": "rack2",
        "top": 356,
        "left": 447,
        "width": 845,
        "height": 20,
        "minBayNo": 2,
        "maxBayNo": 41
    }, {
        "type": "rack",
        "id": "rack3",
        "top": 324,
        "left": 551,
        "width": 800,
        "top": 377,
        "left": 447,
        "width": 845,
        "height": 20,
        "minBayNo": 2,
        "maxBayNo": 40
        "maxBayNo": 41
    }],
    "rackDescs": [{
        "type": "rackDescs",
        "id": "lb_desc6",
        "text": "#6",
        "top": 180,
        "left": 1300,
        "width": 33,
        "id": "lb_desc1",
        "text": "#1",
        "top": 273,
        "left": 1217,
        "width": 30,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc1",
        "text": "#1",
        "top": 425,
        "left": 1300,
        "width": 30,
        "id": "lb_desc2",
        "text": "#6",
        "top": 551,
        "left": 1218,
        "width": 33,
        "height": 23
    }],
    "crns": [{
        "type": "track",
        "id": "lb_track3",
        "text": "",
        "top": 236,
        "left": 469,
        "width": 933,
        "top": 485,
        "left": 408,
        "width": 900,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-3",
        "text": "1",
        "top": 226,
        "left": 701,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 388,
        "left": 469,
        "width": 933,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 377,
        "left": 701,
        "text": "3",
        "top": 474,
        "left": 866,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 310,
        "left": 469,
        "width": 933,
        "top": 412,
        "left": 408,
        "width": 900,
        "height": 2
    }, {"type": "crane", "id": "crn-2", "text": "1", "top": 299, "left": 701, "width": 93, "height": 22}],
    }, {
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 402,
        "left": 866,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 339,
        "left": 408,
        "width": 900,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 329,
        "left": 866,
        "width": 93,
        "height": 22
    }],
    "areas": [{
        "type": "Control_floor",
        "id": "tabControl_floor1",
        "text": "楼层",
        "top": 66,
        "left": 80,
        "width": 1810,
        "height": 1351,
        "left": 77,
        "width": 1537,
        "height": 598,
        "floors": [{
            "type": "floor",
            "id": "page_floor1",
            "text": "1F",
            "top": 4,
            "left": 22,
            "width": 1784,
            "height": 1343,
            "width": 1511,
            "height": 590,
            "stns": [{
                "type": "stn",
                "id": "site-204",
                "text": "204",
                "top": 401,
                "left": 486,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-208",
                "text": "208",
                "top": 355,
                "left": 486,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-211",
                "text": "211",
                "top": 323,
                "left": 486,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-215",
                "text": "215",
                "top": 277,
                "left": 486,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-218",
                "text": "218",
                "top": 250,
                "left": 486,
                "width": 63,
                "id": "site-221",
                "text": "221",
                "top": 311,
                "left": 284,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-222",
                "text": "222",
                "top": 204,
                "left": 486,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-221",
                "text": "221",
                "top": 204,
                "left": 422,
                "width": 63,
                "top": 311,
                "left": 365,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-217",
                "text": "217",
                "top": 250,
                "left": 422,
                "width": 63,
                "top": 357,
                "left": 284,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-214",
                "text": "214",
                "top": 277,
                "left": 422,
                "width": 63,
                "id": "site-223",
                "text": "223",
                "top": 290,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-210",
                "text": "210",
                "top": 323,
                "left": 422,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-207",
                "text": "207",
                "top": 355,
                "left": 422,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-203",
                "text": "203",
                "top": 401,
                "left": 422,
                "width": 63,
                "id": "site-220",
                "text": "220",
                "top": 311,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-200",
                "text": "200",
                "top": 443,
                "left": 358,
                "width": 63,
                "top": 542,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-201",
                "text": "201",
                "top": 422,
                "left": 358,
                "width": 63,
                "id": "site-214",
                "text": "214",
                "top": 378,
                "left": 284,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-202",
                "text": "202",
                "top": 401,
                "left": 358,
                "width": 63,
                "id": "site-213",
                "text": "213",
                "top": 378,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-205",
                "text": "205",
                "top": 376,
                "left": 358,
                "width": 63,
                "height": 24
            }, {
                "type": "stn",
                "id": "site-219",
                "text": "219",
                "top": 225,
                "left": 358,
                "width": 63,
                "height": 24
            }, {
                "type": "stn",
                "id": "site-223",
                "text": "223",
                "top": 183,
                "left": 358,
                "width": 63,
                "id": "site-215",
                "text": "215",
                "top": 378,
                "left": 365,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-209",
                "text": "209",
                "top": 325,
                "left": 358,
                "width": 63,
                "height": 24
                "id": "site-211",
                "text": "211",
                "top": 427,
                "left": 365,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-220",
                "text": "220",
                "top": 204,
                "left": 358,
                "width": 63,
                "id": "site-210",
                "text": "210",
                "top": 427,
                "left": 284,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-212",
                "text": "212",
                "top": 300,
                "left": 358,
                "width": 63,
                "height": 24
                "top": 399,
                "left": 203,
                "width": 80,
                "height": 27
            }, {
                "type": "stn",
                "id": "site-213",
                "text": "213",
                "top": 275,
                "left": 358,
                "width": 63,
                "id": "site-208",
                "text": "208",
                "top": 448,
                "left": 365,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-207",
                "text": "207",
                "top": 448,
                "left": 284,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-209",
                "text": "209",
                "top": 427,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-205",
                "text": "205",
                "top": 469,
                "left": 203,
                "width": 80,
                "height": 30
            }, {
                "type": "stn",
                "id": "site-204",
                "text": "204",
                "top": 500,
                "left": 365,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-206",
                "text": "206",
                "top": 448,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-202",
                "text": "202",
                "top": 500,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-201",
                "text": "201",
                "top": 521,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-203",
                "text": "203",
                "top": 500,
                "left": 284,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-219",
                "text": "219",
                "top": 332,
                "left": 203,
                "width": 80,
                "height": 24
            }, {
                "type": "stn",
                "id": "site-216",
                "text": "216",
                "top": 250,
                "left": 358,
                "width": 63,
                "height": 24
            }, {
                "type": "stn",
                "id": "site-206",
                "text": "206",
                "top": 351,
                "left": 358,
                "width": 63,
                "height": 24
            }, {
                "type": "stn",
                "id": "site-116",
                "text": "116",
                "top": 204,
                "left": 1353,
                "width": 63,
                "top": 357,
                "left": 203,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-113",
                "text": "113",
                "top": 250,
                "left": 1353,
                "width": 63,
                "id": "site-218",
                "text": "218",
                "top": 357,
                "left": 365,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-111",
                "text": "111",
                "top": 277,
                "left": 1353,
                "width": 63,
                "id": "site-121",
                "text": "121",
                "top": 311,
                "left": 1375,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-108",
                "text": "108",
                "top": 323,
                "left": 1353,
                "width": 63,
                "id": "site-122",
                "text": "122",
                "top": 311,
                "left": 1294,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-106",
                "text": "106",
                "top": 355,
                "left": 1353,
                "width": 63,
                "id": "site-117",
                "text": "117",
                "top": 357,
                "left": 1375,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-103",
                "text": "103",
                "top": 401,
                "left": 1353,
                "width": 63,
                "id": "site-123",
                "text": "123",
                "top": 290,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-120",
                "text": "120",
                "top": 311,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-100",
                "text": "100",
                "top": 443,
                "left": 1417,
                "width": 63,
                "top": 542,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-101",
                "text": "101",
                "top": 422,
                "left": 1417,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-102",
                "text": "102",
                "top": 401,
                "left": 1417,
                "width": 63,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-104",
                "text": "104",
                "top": 376,
                "left": 1417,
                "width": 63,
                "height": 24
            }, {
                "type": "stn",
                "id": "site-114",
                "text": "114",
                "top": 225,
                "left": 1417,
                "width": 63,
                "height": 24
                "top": 378,
                "left": 1375,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-117",
                "text": "117",
                "top": 183,
                "left": 1417,
                "width": 63,
                "id": "site-113",
                "text": "113",
                "top": 378,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-115",
                "text": "115",
                "top": 378,
                "left": 1294,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-111",
                "text": "111",
                "top": 427,
                "left": 1294,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-110",
                "text": "110",
                "top": 427,
                "left": 1375,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-112",
                "text": "112",
                "top": 399,
                "left": 1456,
                "width": 80,
                "height": 27
            }, {
                "type": "stn",
                "id": "site-108",
                "text": "108",
                "top": 448,
                "left": 1294,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-107",
                "text": "107",
                "top": 325,
                "left": 1417,
                "width": 63,
                "height": 24
            }, {
                "type": "stn",
                "id": "site-115",
                "text": "115",
                "top": 204,
                "left": 1417,
                "width": 63,
                "top": 448,
                "left": 1375,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-109",
                "text": "109",
                "top": 300,
                "left": 1417,
                "width": 63,
                "top": 427,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-105",
                "text": "105",
                "top": 469,
                "left": 1456,
                "width": 80,
                "height": 30
            }, {
                "type": "stn",
                "id": "site-104",
                "text": "104",
                "top": 500,
                "left": 1294,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-106",
                "text": "106",
                "top": 448,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-102",
                "text": "102",
                "top": 500,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-101",
                "text": "101",
                "top": 521,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-103",
                "text": "103",
                "top": 500,
                "left": 1375,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-119",
                "text": "119",
                "top": 332,
                "left": 1456,
                "width": 80,
                "height": 24
            }, {
                "type": "stn",
                "id": "site-110",
                "text": "110",
                "top": 275,
                "left": 1417,
                "width": 63,
                "height": 24
                "id": "site-116",
                "text": "116",
                "top": 357,
                "left": 1456,
                "width": 80,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-112",
                "text": "112",
                "top": 250,
                "left": 1417,
                "width": 63,
                "height": 24
            }, {"type": "stn", "id": "site-105", "text": "105", "top": 351, "left": 1417, "width": 63, "height": 24}],
                "id": "site-118",
                "text": "118",
                "top": 357,
                "left": 1294,
                "width": 80,
                "height": 20
            }],
            "barcode":[
                {
                    "type": "barcode",
                    "id": "barcode-1",
                    "text": "",
                    "top": 422,
                    "left": 1335,
                    "top": 522,
                    "left": 1370,
                    "width": 80,
                    "height": 20
                },
@@ -478,12 +542,12 @@
                    "type": "barcode",
                    "id": "barcode-2",
                    "text": "",
                    "top": 422,
                    "left": 422,
                    "top": 522,
                    "left": 285,
                    "width": 80,
                    "height": 20
                }
            ]
        }]
    }]
}
}
src/main/webapp/views/console.html
@@ -698,14 +698,14 @@
                $("#crn-3").animate({left: leftVal + 'px'}, 1000);
                crn3Position = leftVal;
                break;
            case 4:
                $("#crn-4").animate({left: leftVal + 'px'}, 1000);
                crn4Position = leftVal;
                break;
            case 5:
                $("#crn-5").animate({left: leftVal + 'px'}, 1000);
                crn5Position = leftVal;
                break;
            // case 4:
            //     $("#crn-4").animate({left: leftVal + 'px'}, 1000);
            //     crn4Position = leftVal;
            //     break;
            // case 5:
            //     $("#crn-5").animate({left: leftVal + 'px'}, 1000);
            //     crn5Position = leftVal;
            //     break;
            default:
                break
        }
src/main/webapp/views/crn.html
@@ -71,12 +71,12 @@
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn3" disabled="disabled">
                </div>
                <div class="crn-command-item">
                    <label>4#</label>
                    <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
                    <!--            <span>&nbsp;</span>-->
                    <input id="crn4" disabled="disabled">
                </div>
<!--                <div class="crn-command-item">-->
<!--                    <label>4#</label>-->
<!--                    <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
<!--                    &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
<!--                    <input id="crn4" disabled="disabled">-->
<!--                </div>-->
            </div>
            <!-- 堆垛机状态位信息 -->
            <div class="crn-state">
@@ -145,7 +145,7 @@
                        <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="2">&nbsp;2号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="3">&nbsp;3号堆垛机</label>
                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4号堆垛机</label>
<!--                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4号堆垛机</label>-->
                    </div>
                </div>
                <!-- 源站/源库位 选择 -->