#
pjb
23 小时以前 69d413866c7f646cc74a23d99e33787bbe53b96a
#
3个文件已修改
144 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/constant/AgvSiteConstant.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2124,6 +2124,8 @@
            sourceSite = "c";
        } else if(staNo == 2000 || staNo ==2002) {
            sourceSite = "d";
        }else if (staNo == 1028){
            sourceSite = "f";
        }
        List<ForwardAGVTaskParam.PositionCodePaths> agvTaskParamList = Arrays.asList(
                //起始位
src/main/java/com/zy/common/constant/AgvSiteConstant.java
@@ -207,7 +207,6 @@
        put("d75","840075RB501013");
        put("d76","840076RB501013");
        put("d77","840077EE501013");
        put("1028","900003YB501013");
        put("d78","840078EE501013");
        put("d79","840079EE501013");
        put("d80","840080EE501013");
@@ -218,6 +217,65 @@
        put("d85","840085EE501013");
        put("e1","300000EE501013");
        put("e2","300001EE501013");
        put("e3","300002EE501013");
        put("e4","300003EE501013");
        put("e5","300004EE501013");
        put("e6","300005EE501013");
        put("e7","300006EE501013");
        put("e8","300007EE501013");
        put("e9","300008EE501013");
        put("e10","300009EE501013");
        put("e11","300010EE501013");
        put("e12","300011EE501013");
        put("e13","300012EE501013");
        put("e14","300013EE501013");
        put("e15","300014EE501013");
        put("e16","300015EE501013");
        put("e17","300016EE501013");
        put("e18","300017EE501013");
        put("e19","300018EE501013");
        put("e20","300019EE501013");
        put("e21","300020EE501013");
        put("e22","300021EE501013");
        put("e23","300022EE501013");
        put("e24","300023EE501013");
        put("e25","300024EE501013");
        put("e26","300025EE501013");
        put("e27","300026EE501013");
        put("e28","300027EE501013");
        put("e29","300028EE501013");
        put("e30","300029EE501013");
        put("e31","300030EE501013");
        put("e32","300031EE501013");
        put("e33","300032EE501013");
        put("e34","300033EE501013");
        put("e35","300034EE501013");
        put("e36","300035EE501013");
        put("e37","300036EE501013");
        put("e38","300037EE501013");
        put("e39","300038EE501013");
        put("e40","300039EE501013");
        put("e41","300040EE501013");
        put("e42","300041EE501013");
        put("e43","300042EE501013");
        put("e44","300043EE501013");
        put("e45","300044EE501013");
        put("e46","300045EE501013");
        put("e47","300046EE501013");
        put("1000","900002EB501013");
        put("1028","900003YB501013");
        put("1035","900001EB501013");
        put("a54","700053EB501013");
        put("a55","700054EB501013");
        put("a56","700055EB501013");
        put("a57","700056EB501013");
        put("a58","700057EB501013");
    }};
}
src/main/resources/application.yml
@@ -41,7 +41,7 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8
  doubleLocs: 1,4,5,8,9,12
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 堆垛机1
@@ -205,7 +205,7 @@
  # 堆垛机3
  crn[2]:
    id: 3
    ip: 10.200.51.189
    ip: 10.200.51.200
    port: 102
    rack: 0
    slot: 0
@@ -214,32 +214,74 @@
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[1].id}
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1033
      row: 11
      bay: 47
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[1].id}
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 1031
      row: 10
      bay: 47
      lev: 1
    # 堆垛机入库站点
    crnInStn[1]:
      devpPlcId: ${wcs-slave.devp[1].id}
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 2008
      row: 11
      bay: 47
      lev: 2
    # 堆垛机出库站点
    crnOutStn[1]:
      devpPlcId: ${wcs-slave.devp[1].id}
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 2008
      row: 10
      row: 11
      bay: 47
      lev: 2
    # 堆垛机入库站点
    crnInStn[2]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 1048
      row: 11
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[2]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 1048
      row: 11
      bay: 1
      lev: 1
    # 堆垛机入库站点
    crnInStn[3]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 2018
      row: 11
      bay: 1
      lev: 2
    # 堆垛机出库站点
    crnOutStn[3]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 2018
      row: 11
      bay: 1
      lev: 2
    # 堆垛机入库站点
    crnInStn[4]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 3018
      row: 11
      bay: 1
      lev: 3
    # 堆垛机出库站点
    crnOutStn[4]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 3018
      row: 11
      bay: 1
      lev: 3
  # 输送线1
  devp[0]:
    id: 1
@@ -256,6 +298,10 @@
      staNo: 2001
      backSta: 2000
      led: ${wcs-slave.led[5].id}
    inSta[2]:
      staNo: 1002
      backSta: 1035
      led: ${wcs-slave.led[11].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 1001
@@ -272,6 +318,11 @@
      staNo: 2001
      backSta: 2000
      led: ${wcs-slave.led[5].id}
    # 空板入库口1
    emptyInSta[3]:
      staNo: 1002
      backSta: 1035
      led: ${wcs-slave.led[11].id}
    # 出库口1
    outSta[0]:
      staNo: 1024
@@ -290,6 +341,14 @@
      staNo: 2001
      led: ${wcs-slave.led[5].id}
      backSta: 2000
    pickSta[1]:
      staNo: 1001
      led: ${wcs-slave.led[0].id}
      backSta: 1000
    pickSta[2]:
      staNo: 1002
      led: ${wcs-slave.led[11].id}
      backSta: 1035
  devp[1]:
    id: 2
@@ -450,4 +509,11 @@
    ip: 10.10.10.111
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 3012
    staArr: 3012
  # LED6
  led[11]:
    id: 12
    ip: 10.10.10.111
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1002