From d58196721475e968769d708d9c14f60dd8d5671f Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期四, 13 十一月 2025 22:20:14 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 154 insertions(+), 20 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 538d160..9181cac 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"
@@ -407,7 +407,9 @@
//int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
+
task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
+
task.Dispatchertime = DateTime.Now;
}
else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
@@ -497,7 +499,7 @@
/// </summary>
/// <param name="taskNum">浠诲姟缂栧彿</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent StackCraneTaskCompleted(int taskNum)
+ /*public WebResponseContent StackCraneTaskCompleted(int taskNum)
{
WebResponseContent content = new WebResponseContent();
try
@@ -509,44 +511,31 @@
{
task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
BaseDal.UpdateData(task);
content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
- Console.WriteLine("浠诲姟瀹屾垚锛寃ms鍙嶉淇℃伅锛�"+content.Message);
- //BaseDal.DeleteData(task);
- // _task_HtyService.AddTaskHty(task); 闇�瑕佹坊鍔犵Щ鍏ュ巻鍙�
- //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍑哄簱瀹屾垚");
}
else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
{
task.TaskState = (int)TaskInStatusEnum.InFinish;
BaseDal.UpdateData(task);
-
content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
-
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
BaseDal.DeleteData(task);
// _task_HtyService.AddTaskHty(task); 闇�瑕佹坊鍔犵Щ鍏ュ巻鍙�
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍏ュ簱瀹屾垚");
-
}
else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
{
task.TaskState = (int)TaskRelocationStatusEnum.SC_RelocationFinish;
- BaseDal.UpdateData(task);
-
- content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
-
-
task.ModifyDate = DateTime.Now;
- BaseDal.DeleteData(task);
- // _task_HtyService.AddTaskHty(task); 闇�瑕佹坊鍔犵Щ鍏ュ巻鍙�
+ BaseDal.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"绉诲簱瀹屾垚");
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup)
- {
-
+ BaseDal.DeleteData(task);
+ content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
+ // _task_HtyService.AddTaskHty(task); 闇�瑕佹坊鍔犵Щ鍏ュ巻鍙�
}
else
{
@@ -559,6 +548,145 @@
content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆戯紝鍘熷洜锛歿ex.Message}");
}
return content;
+ }*/
+
+
+ public bool StackCraneTaskCompleted(int taskNum)
+ {
+ bool res;
+
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return false;
+
+ // 楠岃瘉浠诲姟鐘舵�佹槸鍚﹀厑璁稿畬鎴�
+ if (!IsTaskStateValidForCompletion(task))return false;
+
+ // 鏍规嵁浠诲姟绫诲瀷澶勭悊
+ res = ProcessTaskCompletion(task);
+ }
+ catch (Exception ex)
+ {
+ res = false;
+ }
+
+ return res;
+ }
+
+ /// <summary>
+ /// 楠岃瘉浠诲姟鐘舵�佹槸鍚﹀厑璁稿畬鎴�
+ /// </summary>
+ private bool IsTaskStateValidForCompletion(Dt_Task task)
+ {
+ return task.TaskType switch
+ {
+ (int)TaskOutboundTypeEnum.Outbound => task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting,
+ (int)TaskInboundTypeEnum.Inbound => task.TaskState == (int)TaskInStatusEnum.SC_InExecuting,
+ (int)TaskRelocationTypeEnum.Relocation => true, // 绉诲簱浠诲姟娌℃湁鐗瑰畾鐘舵�佽姹�
+ _ => false
+ };
+ }
+
+ /// <summary>
+ /// 澶勭悊浠诲姟瀹屾垚閫昏緫
+ /// </summary>
+ private bool ProcessTaskCompletion(Dt_Task task)
+ {
+ // 鏇存柊浠诲姟鍩虹淇℃伅
+ UpdateTaskBaseInfo(task);
+
+ bool result = task.TaskType switch
+ {
+ (int)TaskOutboundTypeEnum.Outbound => ProcessOutboundTask(task),
+ (int)TaskInboundTypeEnum.Inbound => ProcessInboundTask(task),
+ (int)TaskRelocationTypeEnum.Relocation => ProcessRelocationTask(task),
+ _ => throw new Exception($"鏈煡鐨勪换鍔＄被鍨�:銆恵task.TaskType}銆�")
+ };
+
+ // 閫氱煡浠诲姟瀹屾垚
+ if (result == true)
+ {
+ NotifyTaskCompleted(task.TaskNum);
+ }
+
+ return result;
+ }
+
+ /// <summary>
+ /// 鏇存柊浠诲姟鍩虹淇℃伅
+ /// </summary>
+ private void UpdateTaskBaseInfo(Dt_Task task)
+ {
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ }
+
+ /// <summary>
+ /// 澶勭悊鍑哄簱浠诲姟
+ /// </summary>
+ private bool ProcessOutboundTask(Dt_Task task)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
+ bool res = BaseDal.UpdateData(task);
+
+ return res;
+ }
+
+ /// <summary>
+ /// 澶勭悊鍏ュ簱浠诲姟
+ /// </summary>
+ private bool ProcessInboundTask(Dt_Task task)
+ {
+ task.TaskState = (int)TaskInStatusEnum.InFinish;
+ BaseDal.UpdateData(task);
+
+ // 娣诲姞鍏ュ簱鍘嗗彶璁板綍
+ // _task_HtyService.AddTaskHty(task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "鍏ュ簱瀹屾垚");
+
+ // 鍏ュ簱瀹屾垚鍚庡垹闄や换鍔�
+ bool res = BaseDal.DeleteData(task);
+
+ return res;
+ }
+
+ /// <summary>
+ /// 澶勭悊绉诲簱浠诲姟
+ /// </summary>
+ private bool ProcessRelocationTask(Dt_Task task)
+ {
+ task.TaskState = (int)TaskRelocationStatusEnum.SC_RelocationFinish;
+ BaseDal.UpdateData(task);
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "绉诲簱瀹屾垚");
+
+ // 绉诲簱瀹屾垚鍚庡垹闄や换鍔�
+ bool res = BaseDal.DeleteData(task);
+ // _task_HtyService.AddTaskHty(task);
+
+ return res;
+ }
+
+ /// <summary>
+ /// 閫氱煡浠诲姟瀹屾垚
+ /// </summary>
+ private void NotifyTaskCompleted(int taskNum)
+ {
+ try
+ {
+ var response = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={taskNum}");
+ if (!response.Status)
+ {
+ // 璁板綍閫氱煡澶辫触鏃ュ織锛屼絾涓嶅奖鍝嶄富娴佺▼
+ //_logger.Warn($"浠诲姟瀹屾垚閫氱煡澶辫触,浠诲姟鍙�:銆恵taskNum}銆�,鍝嶅簲:銆恵response.Message}銆�");
+ }
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父鏃ュ織锛屼絾涓嶅奖鍝嶄富娴佺▼
+ // _logger.Error($"浠诲姟瀹屾垚閫氱煡寮傚父,浠诲姟鍙�:銆恵taskNum}銆�", ex);
+ }
}
/// <summary>
@@ -721,7 +849,13 @@
public Dt_Task GetOutTaskInfo2(string PalletCode)
{
- return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
+ }
+
+ public List<Dt_Task> QueryStackerCraneYKTasks(string deviceNo)
+ {
+ return BaseDal.QueryData(x => x.Roadway == deviceNo && x.TaskType == (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew, TaskOrderBy);
+
}
}
}
--
Gitblit v1.9.3