物流日志打印

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java

@@ -126,6 +126,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
         }
 
         // 4. 保存更新后的任务记录
+        log.info("agv回调接口位置记录,任务单号{}：起点位置{}，终点位置{}",agvCallBack.getTaskCode(),taskExecuteRecord.getStartPos(),taskExecuteRecord.getEndPos()) ;
         boolean updateResult = updateById(taskExecuteRecord);
         if (!updateResult) {
             log.error("AGV回调失败：任务单号{}的执行记录更新保存失败", agvCallBack.getTaskCode());
@@ -136,11 +137,29 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
         if (method.equals(TaskExecuteRecord.STATUS_END)) {
             log.info("任务单号{}已完成，准备调用东哥接口", agvCallBack.getTaskCode());
 
-            //判断是否需要调用ctu接口
+            Long taskId = taskExecuteRecord.getTaskId();
-            containerToCtu(agvCallBack.getTaskCode());
+            if(null == taskId){
+                return R.fail("任务TaskId不存在"+taskId);
+            }
+
+            Task task = taskService.getById(taskId);
+            if(null == task){
+                return R.fail("任务Task不存在");
+            }
+
+            //状态为暂存 需要调用
+            if(Task.STATUS_TEMPORARY_STORAGE.equals(task.getTaskStatus())){
+
+            }
+            log.info("当前Task状态为{}，任务TaskCode为{}", task.getTaskStatus(),agvCallBack.getTaskCode());
 
             //判断是否需要调用agv接口
             containerToAgv(agvCallBack.getTaskCode());
+
+            //判断是否需要调用ctu接口
+            containerToCtu(agvCallBack.getTaskCode());
+
+
         }
 
         // 回调处理成功
@@ -267,6 +286,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
             return false;
         }
 
+        log.info("新增执行记录，taskCode：{}，起始位置：{}，终点位置：{}", agvSchedulingTaskVO.getTaskCode(), agvSchedulingTaskVO.getStartPos(),agvSchedulingTaskVO.getEndPos());
         TaskExecuteRecord taskExecuteRecord = new TaskExecuteRecord();
         taskExecuteRecord.setTaskId(task.getId());
         taskExecuteRecord.setTaskCode(agvSchedulingTaskVO.getTaskCode());