From 862b5a105254850ea60be99452a658f7f4beb2d8 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 三月 2026 15:24:39 +0800
Subject: [PATCH] 任务管理完结-9999修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 15 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 68a4b56..3a89c44 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -33,6 +33,8 @@
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.system.entity.Config;
import com.vincent.rsf.server.system.service.ConfigService;
+import com.vincent.rsf.server.system.entity.FlowStepInstance;
+import com.vincent.rsf.server.system.service.FlowStepInstanceService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import lombok.Synchronized;
@@ -120,6 +122,10 @@
private RestTemplate restTemplate;
@Autowired
private RemotesInfoProperties.RcsApi rcsApi;
+ @Autowired
+ private FlowStepInstanceService flowStepInstanceService;
+ @Autowired
+ private RemotesInfoProperties.WmsOpenApi wmsOpenApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -806,27 +812,105 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Task operateComplete(Long id, Long loginUserId) {
- List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
- .eq(Task::getId, id)
- .in(Task::getTaskStatus, longs));
-
+ Task task = getById(id);
if (Objects.isNull(task)) {
- throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶄换鍔′笉鍙墽琛屽畬缁撴搷浣滐紒锛�");
+ throw new CoolException("鏁版嵁閿欒锛氫换鍔′笉瀛樺湪锛侊紒");
}
-
+ if (task.getTaskStatus() != null && TERMINAL_OR_WAITING_STATUS.contains(task.getTaskStatus())) {
+ throw new CoolException("浠诲姟宸插浜庣粓鎬佹垨绛夊緟搴撳瓨鏇存柊锛屾棤闇�瀹岀粨");
+ }
+ List<FlowStepInstance> steps = flowStepInstanceService.list(
+ new LambdaQueryWrapper<FlowStepInstance>()
+ .eq(FlowStepInstance::getTaskNo, task.getTaskCode())
+ .orderByAsc(FlowStepInstance::getStepOrder));
+ int maxCompletedOrder = steps.stream()
+ .filter(s -> s.getStepOrder() != null && s.getStatus() != null && s.getStatus() == 3)
+ .mapToInt(FlowStepInstance::getStepOrder)
+ .max().orElse(-1);
+ for (FlowStepInstance step : steps) {
+ if (step.getStepOrder() != null && step.getStepOrder() > maxCompletedOrder) {
+ step.setStatus((short) 5);
+ flowStepInstanceService.updateById(step);
+ }
+ }
modiftyTaskSort(task, loginUserId);
- //
-// if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
-// task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
-// } else {
- task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : task.getTaskType()==101? TaskStsType.COMPLETE_OUT.id:TaskStsType.AWAIT.id);
-// }
- if (!this.updateById(task)) {
- throw new CoolException("瀹屾垚浠诲姟澶辫触");
+ applyTransferEndStatus(task);
+ // applyTransferEndStatus 鏈尮閰嶅埌鐨勪换鍔＄被鍨嬶紙鏈疆涓� 98/196/198/9999锛夋椂鍏滃簳缃粓鎬�
+ if (task.getTaskStatus() == null || (!task.getTaskStatus().equals(TaskStsType.COMPLETE_IN.id)
+ && !task.getTaskStatus().equals(TaskStsType.AWAIT.id)
+ && !task.getTaskStatus().equals(TaskStsType.COMPLETE_OUT.id)
+ && !task.getTaskStatus().equals(TaskStsType.MISSION_TRANSFER.id))) {
+ task.setTaskStatus(task.getTaskType() != null && task.getTaskType() < 100
+ ? TaskStsType.COMPLETE_IN.id
+ : Integer.valueOf(101).equals(task.getTaskType()) ? TaskStsType.COMPLETE_OUT.id : TaskStsType.AWAIT.id);
+ updateById(task);
}
return task;
}
+ @Override
+ public void applyTransferEndStatus(Task task) {
+ if (TaskType.TASK_TYPE_IN.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_PICK_IN.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_CHECK_IN.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_EMPTY_IN.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_MERGE_IN.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_LOC_MOVE.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_OUT.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_PICK_AGAIN_OUT.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_MERGE_OUT.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_CHECK_OUT.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type.equals(task.getTaskType())
+ || TaskType.TASK_TYPE_EMPTY_OUT.type.equals(task.getTaskType())) {
+ task.setTaskStatus(TaskStsType.MISSION_TRANSFER.id);
+ } else {
+ return;
+ }
+ updateById(task);
+ }
+
+ /** 缁堟�佹垨绛夊緟瀹氭椂浠诲姟鏇存柊搴撳瓨鐨勭姸鎬併��9999锛屼笉灞曠ず瀹岀粨鎸夐挳 */
+ private static final Set<Integer> TERMINAL_OR_WAITING_STATUS = new HashSet<>(Arrays.asList(
+ TaskStsType.COMPLETE_IN.id, TaskStsType.REPORT_IN.id, TaskStsType.UPDATED_IN.id,
+ TaskStsType.COMPLETE_OUT.id, TaskStsType.WAVE_SEED.id, TaskStsType.UPDATED_OUT.id,
+ TaskStsType.MISSION_TRANSFER.id, TaskStsType.MISSION_TRANSFER_END.id));
+
+ /** 缁堟��/9999 鏃犳寜閽紱鐘舵�佸湪姝ラ涓壘涓嶅埌鎴栨棤涓嬩竴姝ワ紙鏈�鍚庝竴姝ワ級鍒欐棤瀹岀粨鎸夐挳 */
+ @Override
+ public void fillCanComplete(List<Task> tasks) {
+ if (tasks == null || tasks.isEmpty()) {
+ return;
+ }
+ Set<Integer> terminalSet = TERMINAL_OR_WAITING_STATUS;
+ List<String> codes = tasks.stream().map(Task::getTaskCode).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ if (codes.isEmpty()) {
+ tasks.forEach(t -> t.setCanComplete(Boolean.FALSE));
+ return;
+ }
+ List<FlowStepInstance> steps = codes.size() == 1
+ ? flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>().eq(FlowStepInstance::getTaskNo, codes.get(0)).orderByAsc(FlowStepInstance::getStepOrder))
+ : flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>().in(FlowStepInstance::getTaskNo, codes).orderByAsc(FlowStepInstance::getStepOrder));
+ Map<String, List<FlowStepInstance>> stepsByTaskNo = steps.stream().collect(Collectors.groupingBy(FlowStepInstance::getTaskNo));
+ for (Task task : tasks) {
+ if (task.getTaskStatus() != null && terminalSet.contains(task.getTaskStatus())) {
+ task.setCanComplete(Boolean.FALSE);
+ continue;
+ }
+ List<FlowStepInstance> taskSteps = stepsByTaskNo.get(task.getTaskCode());
+ if (taskSteps == null || taskSteps.isEmpty()) {
+ task.setCanComplete(Boolean.FALSE);
+ continue;
+ }
+ FlowStepInstance match = taskSteps.stream()
+ .filter(s -> s.getWmsNowTaskStatus() != null && s.getWmsNowTaskStatus().equals(task.getTaskStatus()))
+ .findFirst().orElse(null);
+ if (match == null) {
+ task.setCanComplete(Boolean.FALSE);
+ continue;
+ }
+ boolean isLastStep = match.getWmsNextTaskStatus() == null || match.getWmsNextTaskStatus().equals(TaskStsType.MISSION_TRANSFER.id);
+ task.setCanComplete(!isLastStep);
+ }
+ }
/**
* 淇敼浠诲姟浼樺厛绾�
--
Gitblit v1.9.1