#

zjj

1 天以前 e06745fc25abbc3ad0d3a23592d516b2392f3d3f

#

 src/main/resources/application.yml

@@ -202,7 +202,44 @@
      row: 6
      bay: 1
      lev: 3

  # 堆垛机3
  crn[2]:
    id: 3
    ip: 10.200.51.189
    port: 102
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=2
    offset: 0
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 1033
      row: 11
      bay: 47
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 1031
      row: 10
      bay: 47
      lev: 1
    # 堆垛机入库站点
    crnInStn[1]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 2008
      row: 11
      bay: 47
      lev: 2
    # 堆垛机出库站点
    crnOutStn[1]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 2008
      row: 10
      bay: 47
      lev: 2
  # 输送线1
  devp[0]:
    id: 1

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

@@ -78,6 +78,42 @@
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }, {
        "type": "rack",
        "id": "rack8",
        "top": 393,
        "left": 529,
        "width": 1000,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }, {
        "type": "rack",
        "id": "rack7",
        "top": 415,
        "left": 529,
        "width": 1000,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }, {
        "type": "rack",
        "id": "rack6",
        "top": 460,
        "left": 529,
        "width": 1000,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }, {
        "type": "rack",
        "id": "rack5",
        "top": 482,
        "left": 529,
        "width": 1000,
        "height": 22,
        "minBayNo": 1,
        "maxBayNo": 47
    }],
    "rackDescs": [{
        "type": "rackDescs",
@@ -125,6 +161,22 @@
        "id": "crn-2",
        "text": "2",
        "top": 325,
        "left": 490,
        "width": 93,
        "height": 22
    },{
        "type": "track",
        "id": "lb_track3",
        "text": "",
        "top": 450,
        "left": 490,
        "width": 1050,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-3",
        "text": "3",
        "top": 440,
        "left": 490,
        "width": 93,
        "height": 22
@@ -482,46 +534,9 @@
                    "top": 749,
                    "left": 470,
                    "width": 80,
                    "height": 20
                },
                {
                    "type": "barcode",
                    "id": "barcode-2",
                    "text": "",
                    "top": 684,
                    "left": 470,
                    "width": 80,
                    "height": 20
                } ,
                {
                    "type": "barcode",
                    "id": "barcode-3",
                    "text": "",
                    "top": 64.5,
                    "left": 470,
                    "width": 80,
                    "height": 20
                    "height": 0
                }
                ,
                {
                    "type": "barcode",
                    "id": "barcode-4",
                    "text": "",
                    "top": 749,
                    "left": 560,
                    "width": 150,
                    "height": 20
                }
                ,
                {
                    "type": "barcode",
                    "id": "barcode-5",
                    "text": "",
                    "top": 684,
                    "left": 560,
                    "width": 150,
                    "height": 20
                }

            ]
        },{
            "type": "floor",
@@ -705,7 +720,7 @@
                    "top": 749,
                    "left": 470,
                    "width": 80,
                    "height": 20
                    "height": 0
                },

            ]
@@ -808,7 +823,7 @@
                    "top": 749,
                    "left": 470,
                    "width": 80,
                    "height": 20
                    "height": 0
                },

            ]

 src/main/webapp/views/console.html

@@ -608,18 +608,10 @@
                            case 1:
                            case 2:
                            case 3:
                                unit = 35;
                                unit = 20;
                                offSet = 500;
                                break;
                            case 5:
                                unit = 124;
                                offSet = 550;
                                break;
                            case 4:
                            case 6:
                                unit = 62;
                                offSet = 550;
                                break;

                        }

                        if(crns[i].bay === 1){