pang.jiabao
2025-09-17 1c80f6410a4bd8d2d7cfece250d32b9bbac98ef8
WCS配置完善
4个文件已修改
104 ■■■■■ 已修改文件
src/main/java/com/zy/core/MainProcess.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/console.map.js 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java
@@ -41,7 +41,7 @@
                    }
                    // 拣料、并板、盘点再入库
//                    mainService.stnToCrnStnPick(3);
                    mainService.stnToCrnStnPick(3);
                    // 入库  ===>> 入库站到堆垛机站,根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(); // 组托
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -46,8 +46,7 @@
    private short heartBeatVal = 1;
    private StaError1 staError1;
    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
        add(100);add(101);add(102);add(103);
        add(104);add(105);add(106);add(107);
        add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);
    }};
    public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
src/main/resources/application.yml
@@ -58,14 +58,14 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 103
      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
@@ -82,14 +82,14 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 105
      staNo: 106
      row: 6
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 107
      staNo: 108
      row: 7
      bay: 1
      lev: 1
@@ -103,34 +103,47 @@
    slot: 0
    # 入库口1
    inSta[0]:
      staNo: 103
      staNo: 104
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 102
      backSta: 103
      led: ${wcs-slave.led[1].id}
    # 入库口2
    inSta[1]:
      staNo: 105
      staNo: 106
      barcode: ${wcs-slave.barcode[1].id}
      backSta: 104
      backSta: 105
      led: ${wcs-slave.led[2].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 103
      staNo: 104
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 102
      backSta: 103
      led: ${wcs-slave.led[1].id}
    # 空板入库口2
    emptyInSta[1]:
      staNo: 105
      staNo: 106
      barcode: ${wcs-slave.barcode[1].id}
      backSta: 104
      backSta: 105
      led: ${wcs-slave.led[2].id}
    # 拣料入库口1
    pickSta[0]:
      staNo: 104
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 103
      led: ${wcs-slave.led[1].id}
    # 拣料入库口2
    pickSta[1]:
      staNo: 106
      barcode: ${wcs-slave.barcode[1].id}
      backSta: 105
      led: ${wcs-slave.led[2].id}
    # 出库口1
    outSta[0]:
      staNo: 100
      staNo: 101
      led: ${wcs-slave.led[0].id}
    # 出库口2
    outSta[1]:
      staNo: 106
      staNo: 107
      led: ${wcs-slave.led[3].id}
  # 条码扫描仪1
@@ -150,25 +163,29 @@
    ip: 10.10.10.190
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 100
    staArr: 101
    crnId: 1
  # LED2
  led[1]:
    id: 2
    ip: 10.10.10.191
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 102,103
    staArr: 104
    crnId: 1
  # LED3
  led[2]:
    id: 3
    ip: 10.10.10.192
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 104,105
    staArr: 106
    crnId: 2
  # LED4
  led[3]:
    id: 4
    ip: 10.10.10.192
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 106
    staArr: 107
    crnId: 2
src/main/webapp/static/js/console.map.js
@@ -305,29 +305,20 @@
                "stns": [
                    {
                        "type": "stn",
                        "id": "site-100",
                        "text": "100",
                        "top": 218,
                        "left": 260,
                        "width": 65,
                        "height": 22
                    },
                    {
                        "type": "stn",
                        "id": "site-101",
                        "text": "101",
                        "top": 218,
                        "left": 330,
                        "width": 68,
                        "left": 260,
                        "width": 65,
                        "height": 22
                    },
                    {
                        "type": "stn",
                        "id": "site-102",
                        "text": "102",
                        "top": 284,
                        "left": 260,
                        "width": 65,
                        "top": 218,
                        "left": 330,
                        "width": 68,
                        "height": 22
                    },
                    {
@@ -335,17 +326,17 @@
                        "id": "site-103",
                        "text": "103",
                        "top": 284,
                        "left": 330,
                        "width": 68,
                        "left": 260,
                        "width": 65,
                        "height": 22
                    },
                    {
                        "type": "stn",
                        "id": "site-104",
                        "text": "104",
                        "top": 367,
                        "left": 260,
                        "width": 65,
                        "top": 284,
                        "left": 330,
                        "width": 68,
                        "height": 22
                    },
                    {
@@ -353,14 +344,23 @@
                        "id": "site-105",
                        "text": "105",
                        "top": 367,
                        "left": 330,
                        "width": 68,
                        "left": 260,
                        "width": 65,
                        "height": 22
                    },
                    {
                        "type": "stn",
                        "id": "site-106",
                        "text": "106",
                        "top": 367,
                        "left": 330,
                        "width": 68,
                        "height": 22
                    },
                    {
                        "type": "stn",
                        "id": "site-107",
                        "text": "107",
                        "top": 431,
                        "left": 260,
                        "width": 65,
@@ -368,8 +368,8 @@
                    },
                    {
                        "type": "stn",
                        "id": "site-107",
                        "text": "107",
                        "id": "site-108",
                        "text": "108",
                        "top": 431,
                        "left": 330,
                        "width": 68,