修改前端状态显示变更，保持前端实时更新

huang

5 天以前 9dcde5b27b70a4b0c0885347af5405eb2d1ef089

 mes-processes/mes-plcSend/src/main/java/com/mes/task/service/TaskExecutionEngine.java

@@ -992,6 +992,25 @@
                    
                    log.debug("出片大车设备定时器检测到已处理的玻璃信息: taskId={}, deviceId={}, glassCount={}",
                            task.getTaskId(), device.getId(), processedGlassIds.size());

                    // 需等待大理片笼完成全部玻璃的处理后再出片
                    @SuppressWarnings("unchecked")
                    List<String> initialGlassIds = (List<String>) context.getSharedData().get("initialGlassIds");
                    if (!CollectionUtils.isEmpty(initialGlassIds)
                            && !processedGlassIds.containsAll(initialGlassIds)) {
                        // 部分玻璃尚未由大理片笼处理完成，保持等待
                        deviceCoordinationService.syncDeviceStatus(device,
                                DeviceCoordinationService.DeviceStatus.WAITING, context);
                        if (!TaskStepDetail.Status.PENDING.name().equals(step.getStatus())) {
                            step.setStatus(TaskStepDetail.Status.PENDING.name());
                            step.setSuccessMessage("等待大理片笼处理全部玻璃后再出片");
                            taskStepDetailMapper.updateById(step);
                            notificationService.notifyStepUpdate(task.getTaskId(), step);
                        }
                        log.debug("出片大车等待大理片笼完成全部玻璃: taskId={}, deviceId={}, processed={}, initial={}",
                                task.getTaskId(), device.getId(), processedGlassIds.size(), initialGlassIds.size());
                        return;
                    }
                    
                    // 执行出片操作
                    Map<String, Object> checkParams = new HashMap<>();
@@ -1189,7 +1208,17 @@
                    Long processStartTime = getProcessStartTime(context);
                    if (processStartTime == null) {
                        // 第一次检测到玻璃，记录开始处理时间
                        setProcessStartTime(context, System.currentTimeMillis());
                        long now = System.currentTimeMillis();
                        setProcessStartTime(context, now);
                        // 补齐步骤的开始时间与状态，确保前端耗时正常显示
                        if (!TaskStepDetail.Status.RUNNING.name().equals(step.getStatus())) {
                            step.setStatus(TaskStepDetail.Status.RUNNING.name());
                        }
                        if (step.getStartTime() == null) {
                            step.setStartTime(new Date(now));
                        }
                        taskStepDetailMapper.updateById(step);
                        notificationService.notifyStepUpdate(task.getTaskId(), step);
                        log.debug("大理片笼设备开始处理: taskId={}, deviceId={}, glassCount={}, processTime={}s",
                                task.getTaskId(), device.getId(), loadedGlassIds.size(), processTimeSeconds);
                        return;
@@ -1215,6 +1244,17 @@
                    // 更新步骤状态
                    step.setStatus(TaskStepDetail.Status.COMPLETED.name());
                    step.setErrorMessage(null);
                    // 记录结束时间与耗时
                    if (step.getEndTime() == null) {
                        step.setEndTime(new Date());
                    }
                    if (step.getStartTime() == null) {
                        // 如果开始时间缺失，用处理开始时间或结束时间兜底
                        step.setStartTime(new Date(processStartTime));
                    }
                    if (step.getStartTime() != null && step.getEndTime() != null) {
                        step.setDurationMs(step.getEndTime().getTime() - step.getStartTime().getTime());
                    }
                    step.setOutputData(toJson(Collections.singletonMap("glassIds", loadedGlassIds)));
                    taskStepDetailMapper.updateById(step);
                    // 大理片笼完成后尝试自动收尾整个任务