From 36c6d6b39e2b76080480c5bc90a412d711b76144 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 19 六月 2024 15:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 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 7b2b14d..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;
@@ -55,6 +55,10 @@
//鏇存柊搴撳瓨淇℃伅
@Transactional
public void updateRecordLoc(Task task) {
+ if (task.getRecordLoc() == null) {
+ return;
+ }
+
if (task.getRecordLoc().equals("Y")) {//璁板綍搴撳瓨淇℃伅
//婧愬簱浣� => 绌哄簱
//鐩爣搴撲綅 => 鍦ㄥ簱
@@ -70,6 +74,7 @@
locService.updateById(destLoc);
}
} else if (task.getRecordLoc().equals("record-dest")) {//鍙褰曠洰鏍囧簱浣嶄俊鎭�
+ //鐩爣搴撲綅 => 鍦ㄥ簱
Loc destLoc = locService.selectByLocNo(task.getDestLoc());
if (destLoc != null) {
destLoc.setLocSts(LocStsType.F.val());
@@ -82,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