#检测站点到位信号

Junjie

16 小时以前 03003f7fc3a601f7078ff01d2d04d93996adeef0

 src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java

@@ -126,7 +126,7 @@
                            loadGuardState
                    );
                    if (stationDispatchLoadSupport.isDispatchBlocked(limitConfig, currentStationTaskCountRef[0], loadGuardState, loopHitResult.isThroughLoop())) {
                        return;
                        continue;
                    }

                    StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationId, targetStationId, 0);
@@ -185,9 +185,13 @@
                    stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
                    if (stationThread != null) {
                        Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
                        StationProtocol stationProtocol = statusMap.get(basStation.getStationId());
                        if (stationProtocol != null && wrkNo.equals(stationProtocol.getTaskNo())) {
                        StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
                        boolean arrived = stationProtocol != null && wrkNo.equals(stationProtocol.getTaskNo());
                        if (arrived || stationThread.hasRecentArrival(basStation.getStationId(), wrkNo)) {
                            complete = true;
                            if (!arrived) {
                                News.info("输送站点出库到达判定使用最近到站补偿，工作号={}，目标站={}", wrkNo, targetStaNo);
                            }
                        }
                    }
                }