chen.llin
3 天以前 0a4438e34d8f726b9cf6251a5b447883b0b8da36
堆垛机出库站状态判断
4个文件已修改
93 ■■■■■ 已修改文件
src/main/java/com/zy/core/properties/SlaveProperties.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/service/impl/MainServiceImpl.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-prod.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -31,6 +31,13 @@
    private int groupCount;
    /**
     * 检查堆垛机出库站状态
     * true: 检查出库站状态(默认值)
     * false: 不检查,默认出库站可用
     */
    private boolean checkOutStationStatus = true;
    private List<CrnSlave> crn = new ArrayList<>();
    private List<DevpSlave> devp = new ArrayList<>();
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -678,9 +678,25 @@
//                    continue;
                }
                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                boolean outStationAvailable = true;
                // 是否检查堆垛机出库站状态(true: 检查,false: 不检查)
                if (slaveProperties.isCheckOutStationStatus()) {
                    // 检查出库站状态
                    outStationAvailable =
                            //自动
                            staProtocol.isAutoing()
                            //!有物
                            && !staProtocol.isLoading()
                            //能出
                            && staDetl.getCanouting() != null
                            && staDetl.getCanouting().equals("Y")
                            //工作号
                            && staProtocol.getWorkNo() == 0
                            //可出
                            && staProtocol.isOutEnable();
                }
                // 出库站可用时继续执行
                if (outStationAvailable) {
                    // 堆垛机控制过滤
                    if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
//                        continue;
src/main/resources/application-dev.yml
@@ -44,6 +44,8 @@
  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 是否检查堆垛机出库站状态(true: 检查,false: 不检查)
  checkOutStationStatus: true
  # 堆垛机1
  crn[0]:
@@ -457,27 +459,27 @@
    # 入库口5
    inSta[0]:
      staNo: 1002
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[4].id}
      backSta: 1001
      led: ${wcs-slave.led[5].id}
      led: ${wcs-slave.led[3].id}
    # 出库口5
    outSta[0]:
      staNo: 1001
      led: ${wcs-slave.led[5].id}
      led: ${wcs-slave.led[3].id}
    # 入库口6
    inSta[1]:
      staNo: 1004
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[5].id}
      backSta: 1003
      led: ${wcs-slave.led[5].id}
      led: ${wcs-slave.led[3].id}
    # 出库口6
    outSta[1]:
      staNo: 1003
      led: ${wcs-slave.led[5].id}
      led: ${wcs-slave.led[3].id}
    # 入库口7
    inSta[2]:
      staNo: 1006
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[6].id}
      backSta: 1005
      led: ${wcs-slave.led[4].id}
    # 出库口7
@@ -487,61 +489,61 @@
    # 入库口8
    inSta[3]:
      staNo: 1008
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[7].id}
      backSta: 1007
      led: ${wcs-slave.led[3].id}
      led: ${wcs-slave.led[5].id}
    # 出库口8
    outSta[3]:
      staNo: 1007
      led: ${wcs-slave.led[3].id}
      led: ${wcs-slave.led[5].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 1002
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[4].id}
      backSta: 1001
      led: ${wcs-slave.led[5].id}
      led: ${wcs-slave.led[3].id}
    # 空板入库口2
    emptyInSta[1]:
      staNo: 1004
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[5].id}
      backSta: 1003
      led: ${wcs-slave.led[5].id}
      led: ${wcs-slave.led[3].id}
    # 空板入库口3
    emptyInSta[2]:
      staNo: 1006
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[6].id}
      backSta: 1005
      led: ${wcs-slave.led[4].id}
    # 空板入库口4
    emptyInSta[3]:
      staNo: 1008
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[7].id}
      backSta: 1007
      led: ${wcs-slave.led[3].id}
      led: ${wcs-slave.led[5].id}
    # 拣料入库口1
    pickSta[0]:
      staNo: 1002
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[4].id}
      backSta: 1001
      led: ${wcs-slave.led[5].id}
      led: ${wcs-slave.led[3].id}
    # 拣料入库口2
    pickSta[1]:
      staNo: 1004
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[5].id}
      backSta: 1003
      led: ${wcs-slave.led[5].id}
      led: ${wcs-slave.led[3].id}
    # 拣料入库口3
    pickSta[2]:
      staNo: 1006
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[6].id}
      backSta: 1005
      led: ${wcs-slave.led[4].id}
    # 拣料入库口4
    pickSta[3]:
      staNo: 1008
      barcode: ${wcs-slave.barcode[1].id}
      barcode: ${wcs-slave.barcode[7].id}
      backSta: 1007
      led: ${wcs-slave.led[3].id}
      led: ${wcs-slave.led[5].id}
@@ -589,7 +591,7 @@
  # LED1
  led[0]:
    id: 1
    ip: 10.10.10.160
    ip: 10.10.10.203
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 101
@@ -597,7 +599,7 @@
  # LED2
  led[1]:
    id: 2
    ip: 10.10.10.161
    ip: 10.10.10.204
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 104
@@ -605,7 +607,7 @@
  # LED3
  led[2]:
    id: 3
    ip: 10.10.10.162
    ip: 10.10.10.205
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 106
@@ -613,7 +615,7 @@
  # LED4
  led[3]:
    id: 4
    ip: 10.10.10.163
    ip: 10.10.10.206
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 107
@@ -621,7 +623,7 @@
  # LED5
  led[4]:
    id: 5
    ip: 10.10.10.164
    ip: 10.10.10.207
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 107
@@ -629,7 +631,7 @@
  # LED6
  led[5]:
    id: 6
    ip: 10.10.10.165
    ip: 10.10.10.208
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 107
src/main/resources/application-prod.yml
@@ -44,6 +44,8 @@
  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 是否检查堆垛机出库站状态(true: 检查,false: 不检查)
  checkOutStationStatus: true
  # 堆垛机1
  crn[0]: