zjj
2024-07-22 05142e44912f1d8fd0a64cfd8bc29199f00c474f
#OFFLINE状态复位
2个文件已修改
7 ■■■■ 已修改文件
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -441,7 +441,7 @@
                continue;
            }
            if (!barcodeThread.getBarcode().equals(task.getZpallet())) {
                log.error("解析入库任务退出,条码不符合");
                log.error("解析入库任务退出,条码不符合,任务条码:"+task.getZpallet()+",线程条码:"+barcodeThread.getBarcode());
                continue;
            }
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
@@ -117,6 +117,11 @@
                if (deviceStatus == 255) {
                    //离线
                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
                }else if (deviceStatus == 3) {
                    //就绪状态且离线
                    if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
                        shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
                    }
                }
                if(deviceStatus != 4 || deviceStatus != 6 || deviceStatus != 7 || deviceStatus != 8 || deviceStatus != 255 || deviceStatus != -1) {