#
zjj
2025-09-15 a4cfd6abc3e46cfff3170b9bd8d00a29e7c866c7
#
3个文件已修改
18 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -863,15 +863,18 @@
            // 只有当堆垛机空闲 并且 无任务时才继续执行
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
                    && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
                if (crn.getId() == 5){
                    continue;
                }
                // 如果最近一次是入库模式
                if (crnProtocol.getLastIo().equals("I")) {
                    if (basCrnp.getInEnable().equals("Y")) {
                        if (crn.getId() == 5){
                            continue;
                        }
                        log.info("进入入库程序,crn:"+crn.getId());
                        this.crnStnToLoc(crn, crnProtocol); //  入库
                        crnProtocol.setLastIo("O");
                    } else if (basCrnp.getOutEnable().equals("Y")) {
                        log.info("进入出库程序,crn:"+crn.getId());
                        this.locToCrnStn(crn, crnProtocol); //  出库
                        crnProtocol.setLastIo("I");
                    }
@@ -879,13 +882,11 @@
                // 如果最近一次是出库模式
                else if (crnProtocol.getLastIo().equals("O")) {
                    if (basCrnp.getOutEnable().equals("Y")) {
                        log.info("进入出库程序,crn:"+crn.getId());
                        this.locToCrnStn(crn, crnProtocol); //  出库
                        crnProtocol.setLastIo("I");
                    } else if (basCrnp.getInEnable().equals("Y")) {
                        if (crn.getId() == 5){
                            continue;
                        }
                        log.info("进入入库程序,crn:"+crn.getId());
                        this.crnStnToLoc(crn, crnProtocol); //  入库
                        crnProtocol.setLastIo("O");
                    }
src/main/java/com/zy/core/MainProcess.java
@@ -36,7 +36,7 @@
                try {
                    // 间隔
                    Thread.sleep(1000);
                    Thread.sleep(2000);
                    // 系统运行状态判断
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                        continue;
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -67,6 +67,7 @@
                    // 写入数据
                    case 2:
                        write((CrnCommand) task.getData());
                        readStatus();
                        break;
                    // 复位
                    case 3: