#

18516761980

2022-06-13 dcdb99bd17b1bf2f1f25c557d63c31a8519dec91

#

 pom.xml

@@ -185,7 +185,7 @@
    </dependencies>

    <build>
        <finalName>klswcs</finalName>
        <finalName>lywcs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/resources/application.yml

@@ -42,7 +42,7 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12
  doubleLocs: 1,4,5,8,9,12,13,16
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 堆垛机1
@@ -56,14 +56,14 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 106
      staNo: 104
      row: 3
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 101
      staNo: 102
      row: 2
      bay: 1
      lev: 1
@@ -78,14 +78,14 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 120
      staNo: 108
      row: 7
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 113
      staNo: 106
      row: 6
      bay: 1
      lev: 1
@@ -100,15 +100,15 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 133
      staNo: 112
      row: 11
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 10
      row: 11
      staNo: 110
      row: 10
      bay: 1
      lev: 1

@@ -128,26 +128,34 @@
      staNo: 104
    # 出库口1
    outSta[0]:
      staNo: 110
      staNo: 101
    # 拣料入库口1
    pickSta[0]:
      staNo: 117
      staNo: 104
      barcode: ${wcs-slave.barcode[0].id}
    # 拣料入库口2
    pickSta[1]:
      staNo: 124
      staNo: 108
      barcode: ${wcs-slave.barcode[0].id}
    # 拣料入库口3
    pickSta[2]:
      staNo: 131
      staNo: 112
      barcode: ${wcs-slave.barcode[0].id}
    # 拣料入库口4
    pickSta[3]:
      staNo: 136
      staNo: 114
      barcode: ${wcs-slave.barcode[0].id}
  # 条码扫描仪
  barcode[0]:
    id: 1
    ip: 10.10.10.52
    port: 51236
  barcode[1]:
    id: 2
    ip: 10.10.10.52
    port: 51236
  barcode[2]:
    id: 3
    ip: 10.10.10.52
    port: 51236
   # LED1
@@ -184,4 +192,11 @@
    ip: 10.10.10.61
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 136
  # LED6
  led[5]:
    id: 5
    ip: 10.10.10.61
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 136

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/klswcs";
var baseUrl = "/lywcs";

// 赋值
function setVal(el, val) {

 src/main/webapp/views/render.html

@@ -590,17 +590,33 @@
                    for (var i = 0; i < crns.length; i++) {
                        var crnEl = $("#crn-" + crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        var unit = 17;//($('.item').eq(0).width() + 13) / 2;
                        var unit = 0;//($('.item').eq(0).width() + 13) / 2;
                        if (crns[i].bay < 0) {
                            crns[i].bay = 0
                            crns[i].bay = 1
                        }
                        // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
                        // crns[i].bay = 52;
                        // crns[i].bay = 1;

                        var offSet = 0;
                        switch (i) {
                            case 0:
                                unit = 34;
                                offSet = 260;
                                break;
                            case 1:
                                unit = 50;
                                offSet = 310;
                                break;
                            case 2:
                                unit = 17.2;
                                offSet = 315;
                                break;
                        }

                        if(crns[i].bay === 1){
                            crnEl.animate({left: 1150 + 'px'}, 1000);
                            crnEl.animate({left: offSet + 'px'}, 1000);
                        } else {
                            crnEl.animate({left: (1150 - (crns[i].bay * unit)) + 'px'}, 1000);
                            crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
                        }

                    }

 src/main/webapp/views/render.js

@@ -1,554 +1,462 @@
data = {
    "mapName": "KLSWCS",
    "rackCount": 12,
    "crnCount": 3,
    "stbCount": 36,
    "hpPosition": 1,
    "mapName": "HYLYWCS",
    "rackCount": 16,
    "crnCount": 4,
    "stbCount": 14,
    "hpPosition": 0,
    "minBayNo": 2,
    "floors": 1,
    "racks": [{
        "type": "rack",
        "id": "rack12",
        "top": 646,
        "left": 324,
        "width": 887,
        "height": 30,
        "id": "rack16",
        "top": 650,
        "left": 412,
        "width": 1046,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 52
        "maxBayNo": 24
    }, {
        "type": "rack",
        "id": "rack15",
        "top": 624,
        "left": 412,
        "width": 1046,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 24
    }, {
        "type": "rack",
        "id": "rack14",
        "top": 569,
        "left": 412,
        "width": 1046,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 24
    }, {
        "type": "rack",
        "id": "rack13",
        "top": 543,
        "left": 412,
        "width": 1046,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 24
    }, {
        "type": "rack",
        "id": "rack12",
        "top": 484,
        "left": 412,
        "width": 1099,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 64
    }, {
        "type": "rack",
        "id": "rack11",
        "top": 613,
        "left": 324,
        "width": 887,
        "height": 30,
        "top": 458,
        "left": 412,
        "width": 1099,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 52
        "maxBayNo": 64
    }, {
        "type": "rack",
        "id": "rack10",
        "top": 516,
        "left": 324,
        "width": 887,
        "height": 30,
        "top": 399,
        "left": 412,
        "width": 1099,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 52
        "maxBayNo": 64
    }, {
        "type": "rack",
        "id": "rack9",
        "top": 483,
        "left": 324,
        "width": 887,
        "height": 30,
        "top": 373,
        "left": 412,
        "width": 1099,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 52
        "maxBayNo": 64
    }, {
        "type": "rack",
        "id": "rack8",
        "top": 451,
        "left": 324,
        "width": 887,
        "height": 30,
        "top": 344,
        "left": 405,
        "width": 979,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 52
        "maxBayNo": 16
    }, {
        "type": "rack",
        "id": "rack7",
        "top": 418,
        "left": 324,
        "width": 887,
        "height": 30,
        "top": 318,
        "left": 405,
        "width": 979,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 52
        "maxBayNo": 16
    }, {
        "type": "rack",
        "id": "rack6",
        "top": 323,
        "left": 324,
        "width": 887,
        "height": 30,
        "top": 263,
        "left": 405,
        "width": 979,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 52
        "maxBayNo": 16
    }, {
        "type": "rack",
        "id": "rack5",
        "top": 290,
        "left": 324,
        "width": 887,
        "height": 30,
        "top": 237,
        "left": 405,
        "width": 979,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 52
        "maxBayNo": 16
    }, {
        "type": "rack",
        "id": "rack3",
        "top": 225,
        "left": 188,
        "width": 1023,
        "height": 30,
        "top": 180,
        "left": 357,
        "width": 1027,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 60
        "maxBayNo": 31
    }, {
        "type": "rack",
        "id": "rack1",
        "top": 97,
        "left": 188,
        "width": 1023,
        "height": 30,
        "left": 357,
        "width": 1027,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 60
        "maxBayNo": 31
    }, {
        "type": "rack",
        "id": "rack4",
        "top": 257,
        "left": 188,
        "width": 1023,
        "height": 30,
        "top": 207,
        "left": 357,
        "width": 1027,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 60
        "maxBayNo": 31
    }, {
        "type": "rack",
        "id": "rack2",
        "top": 129,
        "left": 188,
        "width": 1023,
        "height": 30,
        "top": 123,
        "left": 357,
        "width": 1027,
        "height": 24,
        "minBayNo": 2,
        "maxBayNo": 60
        "maxBayNo": 31
    }],
    "rackDescs": [{
        "type": "rackDescs",
        "id": "lb_desc16",
        "text": "#16",
        "top": 651,
        "left": 1471,
        "width": 41,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc15",
        "text": "#15",
        "top": 626,
        "left": 1472,
        "width": 40,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc14",
        "text": "#14",
        "top": 565,
        "left": 1469,
        "width": 41,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc13",
        "text": "#13",
        "top": 541,
        "left": 1472,
        "width": 40,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc12",
        "text": "#12",
        "top": 646,
        "left": 260,
        "width": 47,
        "height": 27
        "top": 485,
        "left": 1517,
        "width": 41,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc11",
        "text": "#11",
        "top": 618,
        "left": 260,
        "width": 44,
        "height": 27
        "top": 460,
        "left": 1518,
        "width": 38,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc10",
        "text": "#10",
        "top": 516,
        "left": 257,
        "width": 49,
        "height": 27
        "top": 399,
        "left": 1515,
        "width": 42,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc9",
        "text": "#9",
        "top": 488,
        "left": 257,
        "width": 38,
        "height": 27
        "top": 375,
        "left": 1518,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc8",
        "text": "#8",
        "top": 449,
        "left": 260,
        "width": 39,
        "height": 27
        "top": 349,
        "left": 1389,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc7",
        "text": "#7",
        "top": 421,
        "left": 260,
        "width": 37,
        "height": 27
        "top": 321,
        "left": 1389,
        "width": 32,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc6",
        "text": "#6",
        "top": 327,
        "left": 260,
        "width": 38,
        "height": 27
        "top": 264,
        "left": 1387,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc5",
        "text": "#5",
        "top": 291,
        "left": 261,
        "width": 38,
        "height": 27
        "top": 235,
        "left": 1388,
        "width": 32,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc4",
        "text": "#4",
        "top": 253,
        "left": 145,
        "width": 38,
        "height": 27
        "top": 206,
        "left": 1388,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc3",
        "text": "#3",
        "top": 225,
        "left": 145,
        "width": 38,
        "height": 27
        "top": 179,
        "left": 1389,
        "width": 32,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc2",
        "text": "#2",
        "top": 128,
        "left": 145,
        "width": 38,
        "height": 27
        "top": 123,
        "left": 1389,
        "width": 33,
        "height": 23
    }, {
        "type": "rackDescs",
        "id": "lb_desc1",
        "text": "#1",
        "top": 100,
        "left": 145,
        "width": 35,
        "height": 27
        "top": 95,
        "left": 1389,
        "width": 30,
        "height": 23
    }],
    "crns": [{
        "type": "crane",
        "id": "crn-4",
        "text": "4",
        "top": 597,
        "left": 500,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track4",
        "text": "",
        "top": 606,
        "left": 366,
        "width": 1150,
        "height": 2
    }, {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 184,
        "left": 777,
        "top": 153,
        "left": 500,
        "width": 93,
        "height": 22
    }, {
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 378,
        "left": 777,
        "top": 291,
        "left": 500,
        "width": 93,
        "height": 22
    }, {
        "type": "crane",
        "id": "crn-3",
        "text": "3",
        "top": 572,
        "left": 777,
        "top": 428,
        "left": 500,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 387,
        "left": 146,
        "width": 1112,
        "top": 300,
        "left": 359,
        "width": 1066,
        "height": 2
    }, {
        "type": "track",
        "id": "lb_track3",
        "text": "",
        "top": 582,
        "left": 146,
        "width": 1112,
        "top": 438,
        "left": 359,
        "width": 1200,
        "height": 2
    }, {
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 195,
        "left": 146,
        "top": 164,
        "left": 315,
        "width": 1112,
        "height": 2
    }],
    "stns": [{
        "type": "stn",
        "id": "site-132",
        "text": "132",
        "top": 547,
        "left": 1399,
        "width": 60,
        "height": 63
    }, {
        "type": "stn",
        "id": "site-126",
        "text": "126",
        "top": 450,
        "left": 1461,
        "width": 60,
        "height": 63
    }, {
        "type": "stn",
        "id": "site-125",
        "text": "125",
        "top": 450,
        "left": 1399,
        "width": 60,
        "height": 63
    }, {
        "type": "stn",
        "id": "site-119",
        "text": "119",
        "top": 353,
        "left": 1461,
        "width": 60,
        "height": 63
    }, {
        "type": "stn",
        "id": "site-118",
        "text": "118",
        "top": 353,
        "left": 1399,
        "width": 60,
        "height": 63
    }, {
        "type": "stn",
        "id": "site-136",
        "text": "136",
        "top": 611,
        "left": 1461,
        "width": 120,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-135",
        "text": "135",
        "top": 611,
        "left": 1399,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-134",
        "text": "134",
        "top": 611,
        "left": 1337,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-133",
        "text": "133",
        "top": 611,
        "left": 1215,
        "width": 120,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-130",
        "text": "130",
        "top": 515,
        "left": 1461,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-129",
        "text": "129",
        "top": 515,
        "left": 1399,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-128",
        "text": "128",
        "top": 515,
        "left": 1337,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-127",
        "text": "127",
        "top": 515,
        "left": 1215,
        "width": 120,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-131",
        "text": "131",
        "top": 515,
        "left": 1522,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-123",
        "text": "123",
        "top": 418,
        "left": 1461,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-122",
        "text": "122",
        "top": 418,
        "left": 1399,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-121",
        "text": "121",
        "top": 418,
        "left": 1337,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-120",
        "text": "120",
        "top": 418,
        "left": 1215,
        "width": 120,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-124",
        "text": "124",
        "top": 418,
        "left": 1522,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-112",
        "text": "112",
        "top": 256,
        "left": 1461,
        "width": 60,
        "height": 63
        "top": 458,
        "left": 311,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-111",
        "text": "111",
        "top": 256,
        "left": 1399,
        "width": 60,
        "height": 63
    }, {
        "type": "stn",
        "id": "site-116",
        "text": "116",
        "top": 321,
        "left": 1461,
        "width": 60,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-115",
        "text": "115",
        "top": 321,
        "left": 1399,
        "width": 60,
        "height": 30
        "top": 458,
        "left": 209,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-114",
        "text": "114",
        "top": 321,
        "left": 1337,
        "width": 60,
        "height": 30
        "top": 568,
        "left": 311,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-113",
        "text": "113",
        "top": 321,
        "left": 1215,
        "width": 120,
        "height": 30
    }, {
        "type": "stn",
        "id": "site-117",
        "text": "117",
        "top": 321,
        "left": 1522,
        "width": 60,
        "height": 30
        "top": 568,
        "left": 209,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-105",
        "text": "105",
        "top": 159,
        "left": 1399,
        "width": 60,
        "height": 63
        "top": 262,
        "left": 201,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-109",
        "text": "109",
        "top": 224,
        "left": 1461,
        "width": 60,
        "height": 30
        "top": 399,
        "left": 208,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-108",
        "text": "108",
        "top": 224,
        "left": 1399,
        "width": 60,
        "height": 30
        "top": 318,
        "left": 303,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-107",
        "text": "107",
        "top": 224,
        "left": 1337,
        "width": 60,
        "height": 30
        "top": 318,
        "left": 201,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-106",
        "text": "106",
        "top": 224,
        "left": 1215,
        "width": 120,
        "height": 30
        "top": 262,
        "left": 303,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-104",
        "text": "104",
        "top": 128,
        "left": 1461,
        "width": 120,
        "height": 30
        "top": 180,
        "left": 255,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-103",
        "text": "103",
        "top": 128,
        "left": 1399,
        "width": 60,
        "height": 30
        "top": 180,
        "left": 153,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-102",
        "text": "102",
        "top": 128,
        "left": 1337,
        "width": 60,
        "height": 30
        "top": 122,
        "left": 255,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-101",
        "text": "101",
        "top": 128,
        "left": 1215,
        "width": 120,
        "height": 30
        "top": 122,
        "left": 153,
        "width": 100,
        "height": 24
    }, {
        "type": "stn",
        "id": "site-110",
        "text": "110",
        "top": 224,
        "left": 1522,
        "width": 60,
        "height": 30
        "top": 399,
        "left": 310,
        "width": 100,
        "height": 24
    }]
}

@@ -587,8 +495,13 @@
                // maxBayNo = maxBayNo - minBayNo;
            }
        }else {
            // if(i===13) debugger
            for (let j = 0;j < bLen; j++) {
                btn = "<button class='item' style='width: " + width + "px'>" + bayNo + "</button>"
                if(bayNo >= maxBayNo){
                    btn = "<button class='item' style='width: " + width/2 + "px'>" + bayNo + "</button>"
                } else {
                    btn = "<button class='item' style='width: " + width + "px'>" + bayNo + "</button>"
                }
                btns = btns + btn
                bayNo = bayNo + 2;
                if(bayNo > maxBayNo) {