#

whycq

2022-08-27 527a602078136dd15e29d414490e548a8698283b

#

 src/main/resources/application.yml

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://10.10.10.210:1433;databasename=hylyasrs
    url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
    username: sa
    password: sa@123
  mvc:
@@ -143,7 +143,37 @@
      row: 10
      bay: 1
      lev: 1

  # 堆垛机4
  crn[3]:
    id: 4
    ip: 10.10.10.121
    port: 102
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 401
      row: 14
      bay: 1
      lev: 1
    # 堆垛机入库站点
    crnInStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 401
      row: 14
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 401
      row: 14
      bay: 1
      lev: 1
  # 输送线
  devp[0]:
    id: 1
@@ -163,6 +193,10 @@
    inSta[2]:
      staNo: 305
      barcode: ${wcs-slave.barcode[2].id}
    # 入库口4
    inSta[3]:
      staNo: 401
      barcode: ${wcs-slave.barcode[3].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 103
@@ -172,6 +206,9 @@
    # 空板入库口3
    emptyInSta[2]:
      staNo: 305
    # 空板入库口3
    emptyInSta[3]:
      staNo: 401
    # 出库口1
    outSta[0]:
      staNo: 102
@@ -181,6 +218,9 @@
    # 出库口3
    outSta[2]:
      staNo: 303
    # 出库口4
    outSta[3]:
      staNo: 402
    # 拣料入库口1
    pickSta[0]:
      staNo: 102
@@ -193,6 +233,10 @@
    pickSta[2]:
      staNo: 303
      barcode: ${wcs-slave.barcode[2].id}
    # 拣料入库口4
    pickSta[3]:
      staNo: 401
      barcode: ${wcs-slave.barcode[3].id}
  # 条码扫描仪
  barcode[0]:
    id: 1
@@ -204,6 +248,10 @@
    port: 51236
  barcode[2]:
    id: 3
    ip: 10.10.10.52
    port: 51236
  barcode[3]:
    id: 4
    ip: 10.10.10.52
    port: 51236
   # LED1
@@ -247,4 +295,11 @@
    ip: 10.10.10.206
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 305
    staArr: 305
  # LED6
  led[6]:
    id: 7
    ip: 10.10.10.207
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 402

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

@@ -127,153 +127,268 @@
            "minBayNo": 2,
            "maxBayNo": 64
        },
        {
            "type": "rack",
            "id": "rack13",
            "top": 512,
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 23
        },
        {
            "type": "rack",
            "id": "rack14",
            "top": 538,
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 23
        },
        {
            "type": "rack",
            "id": "rack15",
            "top": 610,
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 23
        },
        {
            "type": "rack",
            "id": "rack16",
            "top": 636,
            "left": 430,
            "width": 1020,
            "height": 24,
            "minBayNo": 1,
            "maxBayNo": 23
        },
    ],
    "rackDescs": [{
        "type": "rackDescs",
        "id": "lb_desc12",
        "text": "#12",
        "top": 485,
        "left": 1530,
        "width": 41,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc11",
        "text": "#11",
        "top": 460,
        "left": 1530,
        "width": 38,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc10",
        "text": "#10",
        "top": 399,
        "left": 1530,
        "width": 42,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc9",
        "text": "#9",
        "top": 375,
        "left": 1530,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc8",
        "text": "#8",
        "top": 349,
        "left": 1530,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc7",
        "text": "#7",
        "top": 321,
        "left": 1530,
        "width": 32,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc6",
        "text": "#6",
        "top": 264,
        "left": 1530,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc5",
        "text": "#5",
        "top": 235,
        "left": 1530,
        "width": 32,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc4",
        "text": "#4",
        "top": 206,
        "left": 1460,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc3",
        "text": "#3",
        "top": 179,
        "left": 1460,
        "width": 32,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc2",
        "text": "#2",
        "top": 123,
        "left": 1460,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc1",
        "text": "#1",
        "top": 95,
        "left": 1460,
        "width": 30,
        "height": 23
    }],
    "crns": [{
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 153,
        "left": 500,
        "width": 93,
        "height": 22
    }, {
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 291,
        "left": 500,
        "width": 93,
        "height": 22
    }, {
        "type": "crane",
        "id": "crn-3",
        "text": "3",
        "top": 428,
        "left": 500,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 300,
        "left": 405,
        "width": 1130,
        "height": 2
    }, {
        "type": "track",
        "id": "lb_track3",
        "text": "",
        "top": 438,
        "left": 405,
        "width": 1130,
        "height": 2
    }, {
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 164,
        "left": 405,
        "width": 1060,
        "height": 2
    }],
    "rackDescs": [
        {
            "type": "rackDescs",
            "id": "lb_desc1",
            "text": "#1",
            "top": 95,
            "left": 1460,
            "width": 30,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc2",
            "text": "#2",
            "top": 123,
            "left": 1460,
            "width": 33,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc3",
            "text": "#3",
            "top": 179,
            "left": 1460,
            "width": 32,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc4",
            "text": "#4",
            "top": 206,
            "left": 1460,
            "width": 33,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc5",
            "text": "#5",
            "top": 235,
            "left": 1530,
            "width": 32,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc6",
            "text": "#6",
            "top": 264,
            "left": 1530,
            "width": 33,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc7",
            "text": "#7",
            "top": 321,
            "left": 1530,
            "width": 32,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc8",
            "text": "#8",
            "top": 349,
            "left": 1530,
            "width": 33,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc9",
            "text": "#9",
            "top": 375,
            "left": 1530,
            "width": 33,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc10",
            "text": "#10",
            "top": 399,
            "left": 1530,
            "width": 42,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc11",
            "text": "#11",
            "top": 460,
            "left": 1530,
            "width": 38,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc12",
            "text": "#12",
            "top": 485,
            "left": 1530,
            "width": 41,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc13",
            "text": "#13",
            "top": 514,
            "left": 1460,
            "width": 41,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc14",
            "text": "#14",
            "top": 540,
            "left": 1460,
            "width": 41,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc15",
            "text": "#15",
            "top": 610,
            "left": 1460,
            "width": 41,
            "height": 23
        },
        {
            "type": "rackDescs",
            "id": "lb_desc16",
            "text": "#16",
            "top": 636,
            "left": 1460,
            "width": 41,
            "height": 23
        },
    ],
    "crns": [
        {
            "type": "crane",
            "id": "crn-1",
            "text": "1",
            "top": 153,
            "left": 500,
            "width": 93,
            "height": 22
        },
        {
            "type": "crane",
            "id": "crn-2",
            "text": "2",
            "top": 291,
            "left": 500,
            "width": 93,
            "height": 22
        },
        {
            "type": "crane",
            "id": "crn-3",
            "text": "3",
            "top": 428,
            "left": 500,
            "width": 93,
            "height": 22
        },
        {
            "type": "crane",
            "id": "crn-4",
            "text": "4",
            "top": 574,
            "left": 500,
            "width": 93,
            "height": 22
        },
        {
            "type": "track",
            "id": "lb_track1",
            "text": "",
            "top": 164,
            "left": 405,
            "width": 1060,
            "height": 2
        },
        {
            "type": "track",
            "id": "lb_track2",
            "text": "",
            "top": 300,
            "left": 405,
            "width": 1130,
            "height": 2
        },
        {
            "type": "track",
            "id": "lb_track3",
            "text": "",
            "top": 438,
            "left": 405,
            "width": 1130,
            "height": 2
        },
        {
            "type": "track",
            "id": "lb_track4",
            "text": "",
            "top": 586,
            "left": 405,
            "width": 1130,
            "height": 2
        },

        ],
    "stns": [{
        "type": "stn",
        "id": "site-306",
@@ -518,6 +633,24 @@
                            "left": 225,
                            "width": 100,
                            "height": 24
                        },
                        {
                            "type": "stn",
                            "id": "site-401",
                            "text": "401",
                            "top": 538,
                            "left": 326,
                            "width": 100,
                            "height": 24
                        },
                        {
                            "type": "stn",
                            "id": "site-402",
                            "text": "402",
                            "top": 538,
                            "left": 224,
                            "width": 100,
                            "height": 24
                        }
                    ]
                }