#

lsh

2024-01-15 61379ba6c25f5ad7a26da0bf2a77a0724ee13eff

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -291,7 +291,7 @@
        // 根据输送线plc遍历
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
            for (DevpSlave.Sta inSta : devp.getInSta()) {
            for (DevpSlave.Sta inSta : devp.getInWmsSta()) {
                // 获取入库站信息
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
@@ -302,9 +302,9 @@
                }

//                // 入出库模式判断
                if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) {
                    continue;
                }
//                if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) {
//                    continue;
//                }

                // 判断是否满足入库条件
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()

 src/main/java/com/zy/core/MainProcess.java

@@ -55,7 +55,7 @@
                    mainService.generateStoreWrkFile(); // 组托
                    // 入库  ===>> 码垛位获取空板条码信息
                    mainService.generateStoreWrkFileFull2LouM(); // 组托
//                    mainService.generateStoreWrkFile0(); // WMS入库
                    mainService.generateStoreWrkFile0(); // WMS入库
                    // 拣料、并板、盘点再入库
                    mainService.stnToCrnStnPick();
                    // 拣料、并板、盘点再入库拆盘区   1楼拆垛位置

 src/main/java/com/zy/core/model/DevpSlave.java

@@ -21,6 +21,7 @@

    private List<Sta> inSta = new ArrayList<>();
    private List<Sta> driveSta = new ArrayList<>();
    private List<Sta> inWmsSta = new ArrayList<>();

    private List<Sta> emptyInSta = new ArrayList<>();


 src/main/resources/application.yml

@@ -43,7 +43,7 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12,13,16
  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 堆垛机1
@@ -342,6 +342,12 @@
    # 入库口1
    inSta[0]:
      staNo: 122
    # WMS入库口1
    inWmsSta[0]:
      staNo: 118
    # WMS入库口1
    inWmsSta[1]:
      staNo: 119
    # 空板入库口1
    emptyInSta[0]:
      staNo: 122
@@ -415,6 +421,9 @@
    inSta[1]:
      staNo: 221
      barcode: ${wcs-slave.barcode[1].id}
    # WMS入库口1
    inWmsSta[0]:
      staNo: 212
    # 空板入库口1
    emptyInSta[0]:
      staNo: 212