12

zc

7 天以前 beefbed078b351ef097614c3b6961be78eeb7444

12

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

@@ -300,10 +300,6 @@
                    staProtocol = staProtocol.clone();
                }

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

                // 判断是否满足入库条件
                if (!staProtocol.isLoading()) {
@@ -705,7 +701,11 @@
                        }

                        // 更新工作档状态为14失败
                        if(crnStn.getStaNo()==1035){
                            wrkMast.setWrkSts(107L);
                        }else {
                        wrkMast.setWrkSts(14L);
                        }
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
@@ -1061,7 +1061,8 @@
                if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                ) {
                    if (slave.getId() == 1 || slave.getId() == 2) {
                        if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0 || !staProtocol.isOutEnable()) {
                        if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0 ) {
                            //if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0 || !staProtocol.isOutEnable()) {
                            continue;
                        }
                    }

 src/main/resources/application.yml

@@ -158,6 +158,9 @@
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 1123
      led: ${wcs-slave.led[3].id}
    # 入库口1
    inSta[4]:
      staNo: 1131

    outSta[0]:
      staNo: 1111
@@ -171,6 +174,8 @@
    outSta[3]:
      staNo: 1123
      led: ${wcs-slave.led[3].id}
    outSta[4]:
      staNo: 1135


  # 条码扫描仪1