From b52ef0a5d89d5c08ea6215810560914215a20d86 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 二月 2026 09:42:38 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 b30c361..955acba 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
@@ -146,6 +146,7 @@
                     if (flowStepInstance.getWmsNextTaskStatus() != 9999) {
                         FlowStepInstance nextFlowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
                                 .eq(FlowStepInstance::getStatus, (short)0)
+                                .eq(FlowStepInstance::getTaskNo, flowStepInstance.getTaskNo())
                                 .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder() + 1)
                                 .eq(FlowStepInstance::getWmsNowTaskStatus, flowStepInstance.getWmsNextTaskStatus()));
                         if (Cools.isEmpty(nextFlowStepInstance)) {
@@ -198,6 +199,7 @@
                             if (flowStepInstance.getWmsNextTaskStatus() != 9999) {
                                 FlowStepInstance nextFlowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
                                         .eq(FlowStepInstance::getStatus, (short)0)
+                                        .eq(FlowStepInstance::getTaskNo, flowStepInstance.getTaskNo())
                                         .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder() + 1)
                                         .eq(FlowStepInstance::getWmsNowTaskStatus, flowStepInstance.getWmsNextTaskStatus()));
                                 if (Cools.isEmpty(nextFlowStepInstance)) {
@@ -242,6 +244,7 @@
         completeInStock();
         complateOutStock();
         completeStock9999();
+        completeStock10000();
     }
 
 
@@ -825,6 +828,8 @@
         tasks.forEach(task -> {
             TaskLog taskLog = new TaskLog();
             BeanUtils.copyProperties(task, taskLog);
+            taskLog.setOrgLoc(task.getOrgLoc())
+                            .setTargLoc(task.getTargLoc());
             taskLog.setTaskId(task.getId())
                     .setId(null);
             if (!taskLogService.save(taskLog)) {

--
Gitblit v1.9.1