czkh
4 天以前 76a7d8ed4bacb29ebc2abdc0fff2007b0fe732eb
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -855,7 +855,7 @@
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getModeType() == CrnModeType.AUTO && crnProtocol.getForkPos() == 0 && crnProtocol.getTaskNo() == 0 && crnProtocol.getTaskNoTwo() == 0) {
                News.warnNoLog("" + mark + " - 0" + " - 开始执行堆垛机入出库作业下发");
                if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 0) {
                    News.error("工位1无物,工位2无物");
                    //News.error("工位1无物,工位2无物");
                    //堆垛机没有物料
                    // 如果最近一次是入库模式
                    if (crnProtocol.getLastIo().equals("I")) {
@@ -881,7 +881,7 @@
                    }
                } else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 1) {
                    News.error("工位1有物,工位2有物");
                    //News.error("工位1有物,工位2有物");
                    // 堆垛机有物料
                    WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 1);
                    if (wrkMast != null) {
@@ -894,7 +894,7 @@
                        log.error("" + mark + " - 1" + " - 有物料无工作档  ===》异常");
                    }
                } else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 0) {
                    News.error("工位1有物,工位2无物");
                    //News.error("工位1有物,工位2无物");
                    // 堆垛机工位1有物料
                    WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 1);
                    if (wrkMast != null) {
@@ -923,7 +923,7 @@
                        log.error("" + mark + " - 1" + " - 有物料无工作档  ===》异常");
                    }
                } else if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 1) {
                    News.error("工位1无物,工位2有物");
                    //News.error("工位1无物,工位2有物");
                    // 堆垛机工位2有物料
                    WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 2);
                    if (wrkMast != null) {