From ce7315f883bd198a5b7054f8afed741c9cbb560e Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期五, 25 七月 2025 15:21:00 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/板材仓/StackerCraneJob_BC.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/StackerCraneJob_BC.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/StackerCraneJob_BC.cs"
index 601467a..5574504 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/StackerCraneJob_BC.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\235\277\346\235\220\344\273\223/StackerCraneJob_BC.cs"
@@ -354,7 +354,14 @@
{
return existTask;
}
- else if (existTask != null && existTask.TaskState != (int)TaskStatusEnum.SC_Execute)
+ else if (existTask != null && existTask.TaskState == (int)TaskStatusEnum.MesPending) //鍒ゆ柇鎸傝捣
+ {
+ existTask.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
+ task.TaskState=TaskStatusEnum.MesPending.ObjToInt();
+ _taskRepository.UpdateData(existTask);
+ _taskRepository.UpdateData(task);
+ }
+ else if (existTask != null && existTask.TaskState != (int)TaskStatusEnum.SC_Execute && existTask.TaskState != (int)TaskStatusEnum.MesPending)
{
return null;
}
--
Gitblit v1.9.3