*

lsh

2025-06-14 cc885fe7e9629fa922a369c3938a748ec7f7e246

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

@@ -515,7 +515,7 @@
                    log.error("{}号RGV尚未在数据库进行维护！", rgvSlave.getId());
                    continue;
                }
                if (rgvProtocol.getStatusType() == RgvStatusType.WAITING) {
                if (rgvProtocol.getStatusType() == RgvStatusType.WAITING || rgvProtocol.getStatusType() == RgvStatusType.WAITING101) {
                    log.info("{}号小车等待wcs确认，状态{}，参数{}", rgvProtocol.getRgvNo(), rgvProtocol.getStatusType(), rgvProtocol);
                }
                // 只有当RGV等待WCS确认、自动
@@ -576,6 +576,15 @@
                        }
                    } catch (Exception e){}
                    wrkMastService.updateById(wrkMast);
                } else if (rgvProtocol.getStatusType() == RgvStatusType.WAITING101
                        && rgvProtocol.getModeType() == RgvModeType.AUTO
                        && rgvProtocol.getTaskNo1() != 0
                ){
                    boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
                    if (!rgvComplete) {
                        log.error("小车复位失败，小车号{}！", rgvProtocol.getRgvNo());
                        break;
                    }
                }
            } catch (Exception e) {
                log.error("小车复位线程报错！" + e);
@@ -613,7 +622,7 @@
                    rgvCommand.setDestinationStaNo1((short)-1);   //工位1目标站点
                    rgvCommand.setCommand((short) 1);   //工位1任务确认
                    rgvCommand.setRgvSome((short) 1);
                    if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(2, rgvCommand))) {
                    if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4, rgvCommand))) {
                        //
                        log.error("RGV取消命令下发失败，RGV号={}，任务数据={}", rgvProtocol.getRgvNo(), JSON.toJSON(rgvCommand));
                        wrkMast.setLogErrTime(new Date());