菜单

chen.llin

2 天以前 d6d25613f504d8fc4c6ffa8a1854beb4dac044d0

 src/main/java/com/zy/asrs/task/AgvScheduler.java

@@ -146,6 +146,7 @@
            
            Date now = new Date();
            int completedCount = 0;
            List<Task> completedTasks = new ArrayList<>();
            
            for (WrkMast wrkMast : completedWrkMasts) {
                // 查找对应的AGV任务（优先通过wrk_no查询）
@@ -173,11 +174,22 @@
                        agvTask.setWrkSts(9L);
                        agvTask.setModiTime(now);
                        if (taskService.updateById(agvTask)) {
                            completedTasks.add(agvTask);
                            completedCount++;
                            log.info("入库任务工作档已入库成功，完结AGV呼叫单，taskId：{}，wrkNo：{}，barcode：{}", 
                                agvTask.getId(), wrkMast.getWrkNo(), wrkMast.getBarcode());
                        }
                    }
                }
            }
            
            // 立即将完成的AGV任务转移到历史表，不保留在Task表中
            if (!completedTasks.isEmpty()) {
                try {
                    agvHandler.moveTaskToHistory(completedTasks);
                    log.info("入库完成，已将{}个AGV任务转移到历史表（不保留在Task表中）", completedTasks.size());
                } catch (Exception e) {
                    log.error("入库完成，转移AGV任务到历史表失败", e);
                }
            }
            
@@ -213,6 +225,7 @@
            
            Date now = new Date();
            int completedCount = 0;
            List<Task> completedTasks = new ArrayList<>();
            
            for (Task agvTask : agvTasks) {
                boolean isCompleted = false;
@@ -288,11 +301,12 @@
                    }
                }
                
                // 如果已完成，更新AGV任务状态
                // 如果已完成，更新AGV任务状态并收集到列表
                if (isCompleted) {
                    agvTask.setWrkSts(9L);
                    agvTask.setModiTime(now);
                    if (taskService.updateById(agvTask)) {
                        completedTasks.add(agvTask);
                        completedCount++;
                        log.info("{}，完结AGV呼叫单，taskId：{}，wrkNo：{}，barcode：{}，站点：{}", 
                            reason, agvTask.getId(), agvTask.getWrkNo(), agvTask.getBarcode(), agvTask.getStaNo());
@@ -300,6 +314,16 @@
                }
            }
            
            // 立即将完成的AGV任务转移到历史表，不保留在Task表中
            if (!completedTasks.isEmpty()) {
                try {
                    agvHandler.moveTaskToHistory(completedTasks);
                    log.info("入库/出库完成，已将{}个AGV任务转移到历史表（不保留在Task表中）", completedTasks.size());
                } catch (Exception e) {
                    log.error("入库/出库完成，转移AGV任务到历史表失败", e);
                }
            }
            
            if (completedCount > 0) {
                log.info("本次检查完结了{}个AGV呼叫单（工作档已完成或已转历史档）", completedCount);
            }