From 81a7e447d470981ec8a660cae362d732c5175f8c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 29 十一月 2023 15:16:57 +0800
Subject: [PATCH] #指令更新
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index d547639..d467c61 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,9 +1,9 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.TaskWrkService;
@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -35,14 +37,14 @@
public void execute() {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
- if (taskWrk.getStatus()==3){
+ if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {//瀹屾垚
taskStatusFeedbackParam.setTaskStatus("done");
new PostMesDataUtils().postMesData("瀹屾垚涓婃姤",wmsUrl,movePath,taskWrk);
- }else {
+ } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
taskStatusFeedbackParam.setTaskStatus("cancelled");
new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
-
}
+
if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
//浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
commandInfoService.saveToHistory(taskWrk.getTaskNo());
@@ -55,4 +57,15 @@
}
}
+ //娓呯悊鎵嬪姩鍛戒护
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void ManualCommandClean() {
+ List<CommandInfo> commandInfos = commandInfoService.selectCompleteManualCommand();
+ for (CommandInfo commandInfo : commandInfos) {
+ //鎸囦护杞棩蹇�
+ commandInfoService.saveToHistory(commandInfo.getId());
+ }
+
+ }
+
}
--
Gitblit v1.9.1