From 09fde94b4790b90dccf35a24f6d3d1d2171b59dd Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 六月 2024 10:26:40 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
index 0b065ac..19c3150 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -2,14 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.wcs.core.entity.Loc;
-import com.zy.asrs.wcs.core.entity.Task;
-import com.zy.asrs.wcs.core.entity.TaskLog;
+import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.LocStsType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
-import com.zy.asrs.wcs.core.service.LocService;
-import com.zy.asrs.wcs.core.service.TaskLogService;
-import com.zy.asrs.wcs.core.service.TaskService;
+import com.zy.asrs.wcs.core.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -28,6 +24,10 @@
private TaskService taskService;
@Autowired
private TaskLogService taskLogService;
+ @Autowired
+ private MotionService motionService;
+ @Autowired
+ private MotionLogService motionLogService;
@Autowired
private LocService locService;
@@ -87,16 +87,24 @@
@Transactional
public void saveTaskLog(Task task) {
//鍒涘缓鍘嗗彶妗�
- Date date = new Date();
TaskLog taskLog = new TaskLog();
- taskLog.setTaskNo(task.getTaskNo());
- taskLog.setTaskData(JSON.toJSONString(task));
- taskLog.setCreateTime(date);
- taskLog.setUpdateTime(date);
+ taskLog.sync(task);
+ taskLog.setUpdateTime(new Date());
taskLogService.save(taskLog);
+
+ List<Motion> motions = motionService.list(new LambdaQueryWrapper<Motion>().eq(Motion::getTaskNo, task.getTaskNo()).eq(Motion::getHostId, task.getHostId()));
+ for (Motion motion : motions) {
+ //鍒涘缓鍔ㄤ綔鍘嗗彶妗�
+ MotionLog motionLog = new MotionLog();
+ motionLog.sync(motion);
+ motionLog.setUpdateTime(new Date());
+ motionLogService.save(motionLog);
+ }
//鍒犻櫎婧愪换鍔�
taskService.removeById(task.getId());
+ //鍒犻櫎鍔ㄤ綔
+ motionService.remove(new LambdaQueryWrapper<Motion>().eq(Motion::getTaskNo, task.getTaskNo()).eq(Motion::getHostId, task.getHostId()));
}
}
--
Gitblit v1.9.1