From 31b07882a70110829c0742407e8288f217327ce9 Mon Sep 17 00:00:00 2001
From: qinchulong <qinchulong@hnkhzn.com>
Date: 星期六, 08 三月 2025 16:54:49 +0800
Subject: [PATCH] 20250308
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 206447e..17d369e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -303,6 +303,24 @@
return task;
}
+ public Dt_Task QueryTasking()
+ {
+ Dt_Task task = new Dt_Task();
+ task = BaseDal.QueryFirst(v=>v.TaskState!=(int)TaskInStatusEnum.InNew
+ && v.TaskState != (int)TaskMoveStatusEnum.OutNewMove
+ && v.TaskState != (int)TaskOutStatusEnum.OutNew
+ && v.TaskState != (int)TaskOutStatusEnum.SC_OutExecuting
+ && v.TaskState != (int)TaskInStatusEnum.Line_Ingrab);
+ if (task!=null)
+ {
+ return task;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
/// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍏ュ簱绫诲瀷鐨勬柊澧炵殑浠诲姟
/// </summary>
@@ -357,7 +375,7 @@
catch (Exception ex)
{
content = WebResponseContent.Instance.Error(ex.Message);
- UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
+ UpdateTaskExceptionMessage(task.TaskId, ex.Message);
}
return content;
}
@@ -378,7 +396,7 @@
catch (Exception ex)
{
content = WebResponseContent.Instance.Error(ex.Message);
- UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
+ UpdateTaskExceptionMessage(task.TaskId, ex.Message);
}
return content;
}
@@ -404,7 +422,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
//if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
//{
@@ -438,7 +456,7 @@
{
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
@@ -447,7 +465,7 @@
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
}
- if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ else if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
}
--
Gitblit v1.9.3