From 8f82164ccc074676e995f762a56036face7186fc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 24 九月 2024 15:00:12 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
index 456e4d9..a64b3a9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -7,6 +7,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
+import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.system.entity.Dict;
import com.zy.asrs.wms.system.service.DictService;
@@ -40,6 +41,8 @@
private OrderDetlService orderDetlService;
@Autowired
private DictService dictService;
+ @Autowired
+ private WaveService waveService;
@Scheduled(cron = "0/3 * * * * ? ")
@Transactional
@@ -47,7 +50,7 @@
InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
try {
//鑾峰彇鍏ュ簱瀹屾垚浠诲姟
- List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 100));
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.UPDATED_IN.id));
if (list.isEmpty()) {
return;
}
@@ -161,7 +164,7 @@
try {
//鑾峰彇鍑哄簱瀹屾垚浠诲姟
List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskSts, 200)
+ .eq(Task::getTaskSts, TaskStsType.UPDATED_OUT.id)
.in(Task::getTaskType, 101, 53, 57));
if (list.isEmpty()) {
return;
@@ -180,6 +183,30 @@
Long hostId = task.getHostId();
+ //淇濆瓨浠诲姟鏄庣粏鍘嗗彶妗�
+ List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
+ if (taskDetls.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦�");
+ }
+
+ boolean flag = false;
+ for (TaskDetl taskDetl : taskDetls) {
+ if (taskDetl.getWaveId() == null) {
+ continue;
+ }
+
+ Wave wave = waveService.getById(taskDetl.getWaveId());
+ if (wave != null) {
+ flag = true;//娉㈡鏈畬鎴�
+ break;
+ }
+ }
+
+ if (flag) {
+ continue;
+ }
+
+
//淇濆瓨浠诲姟鍘嗗彶妗�
TaskLog taskLog = new TaskLog();
taskLog.sync(task);
@@ -193,11 +220,6 @@
throw new CoolException("鍒犻櫎浠诲姟妗ｅけ璐�");
}
- //淇濆瓨浠诲姟鏄庣粏鍘嗗彶妗�
- List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
- if (taskDetls.isEmpty()) {
- throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦�");
- }
for (TaskDetl taskDetl : taskDetls) {
TaskDetlLog taskDetlLog = new TaskDetlLog();
taskDetlLog.sync(taskDetl);
--
Gitblit v1.9.1