From 291067c13bfe8fb9c876e3764a828dc3ddd22f99 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期一, 17 十一月 2025 16:50:12 +0800
Subject: [PATCH] 监控优化，代码功能优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index 4e0d43d..cdaafa7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -121,7 +121,7 @@
{
return WebResponseContent.Instance.Error("鏈壘鍒拌浠诲姟淇℃伅");
}
- if(task.TaskState == TaskStatusEnum.SC_Executing.ObjToInt())
+ if (task.TaskState == TaskStatusEnum.SC_Executing.ObjToInt() || (task.DeviceCode.Contains("SC01")&& task.TaskState == TaskStatusEnum.Pending.ObjToInt()))
{
_taskService.UpdateTask(task, TaskStatusEnum.SC_Execute);
}
@@ -164,5 +164,38 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+ [HttpPost, HttpGet, Route("RecWMSTaskHandCancel"), AllowAnonymous]
+ public WebResponseContent RecWMSTaskHandCancel(int taskNum)
+ {
+ return Service.RecWMSTaskHandCancel(taskNum);
+ }
+
+ //杈呮枡杈撻�佺嚎浠诲姟閲嶅彂
+ [HttpPost, HttpGet, Route("FLconverTaskResending"), AllowAnonymous]
+ public WebResponseContent FLconverTaskResending(int taskNum)
+ {
+ try
+ {
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒拌浠诲姟淇℃伅");
+ }
+ if (task.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && task.DeviceCode.Contains("FL"))
+ {
+ _taskService.UpdateTask(task, TaskStatusEnum.New);
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("闈炶緭閫佺嚎鎵ц涓姸鎬佹垨闈炶緟鏂欎粨浠诲姟");
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
}
}
--
Gitblit v1.9.3