From 51af2794f47d5b68496edbc09d0ccb168347f02b Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期六, 22 十一月 2025 10:19:05 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 294 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 249 insertions(+), 45 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 ef564b2..63937d9 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"
@@ -1,4 +1,4 @@
-锘�#region << 鐗� 鏈� 娉� 閲� >>
+#region << 鐗� 鏈� 娉� 閲� >>
/*----------------------------------------------------------------
* 鍛藉悕绌洪棿锛歐IDESEAWCS_TaskInfoService
* 鍒涘缓鑰咃細鑳＄搴�
@@ -16,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using HslCommunication.Enthernet;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SqlSugar;
@@ -397,34 +398,43 @@
try
{
int oldState = task.TaskState;
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish)
{
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
+ //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
- task.TaskState = nextStatus;
+ if (task.TaskState ==(int)TaskOutStatusEnum.SC_OutFinish)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
+ }
+ else
+ {
+ task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
+ }
+ task.Dispatchertime = DateTime.Now;
}
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
{
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
- task.TaskState = nextStatus;
-
- if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
+ //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
+ task.TaskState = (int)TaskInStatusEnum.SC_InExecuting;
+ task.Dispatchertime = DateTime.Now;
+ }
+ else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
+ {
+ if (task.TaskState != (int)TaskRelocationStatusEnum.RelocationNew)
{
- Random random = new Random();
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = $"{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}";
- task.TargetAddress = task.NextAddress;
+ return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
+ task.TaskState = (int)TaskRelocationStatusEnum.SC_RelocationExecuting; //涓嬪彂绉诲簱浠诲姟
}
else
{
@@ -436,9 +446,14 @@
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
+
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
- BaseDal.UpdateData(task);
+ bool res = BaseDal.UpdateData(task);
+ if (!res)
+ {
+ return content = WebResponseContent.Instance.Error($"鏇存柊浠诲姟淇℃伅澶辫触,浠诲姟鍙�:銆恵task.TaskNum}銆�");
+ }
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
@@ -493,7 +508,7 @@
/// </summary>
/// <param name="taskNum">浠诲姟缂栧彿</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent StackCraneTaskCompleted(int taskNum)
+ /*public WebResponseContent StackCraneTaskCompleted(int taskNum)
{
WebResponseContent content = new WebResponseContent();
try
@@ -503,52 +518,33 @@
if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
{
- /*List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
- if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�");*/
- task.TaskState = (int)TaskOutStatusEnum.OutFinish;
- BaseDal.UpdateData(task);
-
-
- content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");
-
+ task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
task.ModifyDate = DateTime.Now;
- BaseDal.DeleteData(task);
- // _task_HtyService.AddTaskHty(task); 闇�瑕佹坊鍔犵Щ鍏ュ巻鍙�
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍑哄簱瀹屾垚");
- //todo 鍚屾鍒癢MS
+ task.Modifier = "System";
+ BaseDal.UpdateData(task);
+ content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
- //鏆備笉鑰冭檻澶氫釜鍑哄簱鍙�
}
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}&HowWorks=2");
-
+ 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}&HowWorks=2");
-
-
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
{
@@ -561,6 +557,149 @@
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);
+ // 娣诲姞鍏ュ簱鍘嗗彶璁板綍
+ //AddTaskHistory(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, "鍏ュ簱瀹屾垚");
+ //AddTaskHistory(task);
+
+ // 鍏ュ簱瀹屾垚鍚庡垹闄や换鍔�
+ 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, "绉诲簱瀹屾垚");
+ //AddTaskHistory(task);
+ // 绉诲簱瀹屾垚鍚庡垹闄や换鍔�
+ 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>
@@ -655,11 +794,11 @@
return BaseDal.QueryFirst(x => x.PalletCode == Pallat);
}
- public WebResponseContent UpdateTaskIninfo(string Pallat, int TaskNo)
+ public WebResponseContent UpdateTaskIninfo(string Pallat, string StationCode)
{
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == TaskNo && x.PalletCode == Pallat);
+ Dt_Task task = BaseDal.QueryFirst(x => x.PalletCode == Pallat && x.SourceAddress== StationCode);
if (task != null)
{
task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
@@ -714,5 +853,70 @@
return null;
}
+
+
+ public Dt_Task GetOutTaskInfo(string PLCaddress)
+ {
+ return BaseDal.QueryFirst(x => x.TargetAddress== PLCaddress && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
+ }
+
+ public Dt_Task GetOutTaskInfo2(string PalletCode)
+ {
+ return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.Line_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);
+
+ }
+
+ public WebResponseContent WCSCancelinventory(int taskNum)
+ {
+ //鏌ヨ浠诲姟淇℃伅
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ bool taskmsseg = BaseDal.DeleteData(task);
+ //bool res = AddTaskHistory(task);
+ //return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
+ return null;
+
+ }
+
+ /// <summary>
+ /// 娣诲姞鍘嗗彶浠诲姟璁板綍锛堥潤鎬佹柟娉曪級
+ /// </summary>
+ /// <param name="task">浠诲姟瀵硅薄</param>
+ /// <returns>鏄惁娣诲姞鎴愬姛</returns>
+ public static bool AddTaskHistory(Dt_Task task)
+ {
+ try
+ {
+ if (task == null)
+ {
+ return false;
+ }
+
+ // 鍒涘缓浠诲姟鍘嗗彶鏈嶅姟瀹炰緥
+ var taskHtyService = App.GetService<ITaskHtyService>();
+ if (taskHtyService == null)
+ {
+ return false;
+ }
+
+ // 娣诲姞鍘嗗彶璁板綍
+ bool result = taskHtyService.AddTaskHistory(task, "鑷姩瀹屾垚");
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父鏃ュ織
+ Console.WriteLine($"娣诲姞鍘嗗彶浠诲姟璁板綍澶辫触: {ex.Message}");
+ return false;
+ }
+ }
+
+
}
}
--
Gitblit v1.9.3