From a8619e7f4ff41d5d9ae2f50cab0f2c0efd648003 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 16 三月 2026 13:39:09 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 4d7b7a0..0e7b477 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -122,7 +122,7 @@
public synchronized void missionTaskEXECUTE() {
try{
List<FlowStepInstance> flowStepInstanceList = flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>()
- .eq(FlowStepInstance::getStatus, 1).in(FlowStepInstance::getStepType,MissionStepType.getTaskISSUE()));
+ .eq(FlowStepInstance::getStatus, (short) 1).in(FlowStepInstance::getStepType,MissionStepType.getTaskISSUE()));
for (FlowStepInstance flowStepInstance : flowStepInstanceList) {
FlowInstance flowInstance = flowInstanceService.getById(flowStepInstance.getFlowInstanceId());
if (Cools.isEmpty(flowInstance)) { continue;}
@@ -201,7 +201,7 @@
flowStepInstanceService.updateById(flowStepInstance);
log.error("浠诲姟涓嬪彂澶辫触,婧愮偣鏈煡璇㈠埌鐩爣鐐规湭鏌ヨ鍒帮紝绛夊緟閲嶈瘯....");
}
- return;
+ continue;
} else {
missionTaskIssueParam.setSourceCode(basStation.getStationName());
}
@@ -226,7 +226,7 @@
flowStepInstanceService.updateById(flowStepInstance);
log.error("浠诲姟涓嬪彂澶辫触,婧愮偣鏈煡璇㈠埌鐩爣鐐规湭鏌ヨ鍒帮紝绛夊緟閲嶈瘯....");
}
- return;
+ continue;
} else {
missionTaskIssueParam.setSourceCode(basStation.getStationName());
}
@@ -252,7 +252,7 @@
flowStepInstanceService.updateById(flowStepInstance);
log.error("浠诲姟涓嬪彂澶辫触,鐩爣鐐规湭鏌ヨ鍒帮紝绛夊緟閲嶈瘯....");
}
- return;
+ continue;
} else {
missionTaskIssueParam.setTargetCode(basStation.getStationName());
}
@@ -278,7 +278,7 @@
flowStepInstanceService.updateById(flowStepInstance);
log.error("浠诲姟涓嬪彂澶辫触,鐩爣鐐规湭鏌ヨ鍒帮紝绛夊緟閲嶈瘯....");
}
- return;
+ continue;
} else {
missionTaskIssueParam.setTargetCode(basStation.getStationName());
}
@@ -455,7 +455,10 @@
|| task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
task.setTaskStatus(TaskStsType.COMPLETE_IN.id);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)){
- if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)){
+ if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)
+ ){
task.setTaskStatus(TaskStsType.AWAIT.id);
} else {
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
@@ -467,9 +470,13 @@
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
- if ((!Cools.isEmpty(task.getResource()) && task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val))
- // 鐩樼偣鍑哄簱鍏堝埌 196(闈炴尝娆�)
- ||task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
+ if ((!Cools.isEmpty(task.getResource())
+ && (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)
+ )
+ )// 鐩樼偣鍑哄簱鍏堝埌 196(闈炴尝娆�)
+ ||task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
) {
task.setTaskStatus(TaskStsType.AWAIT.id);
} else {
--
Gitblit v1.9.1