From aa75f3cbdcfce80d7ebd3c4f2bcfeea850949209 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 10 三月 2026 20:22:01 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 164 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 107 insertions(+), 57 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 085080c..6a3b7df 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -89,48 +89,99 @@
WebResponseContent content = new WebResponseContent();
try
{
+ List<object> objects = new List<object>();
foreach (var item in taskDTOs)
{
foreach (var task in item.tasks)
{
+ #region 鍒ゆ柇
content = TaskHelpMethods.isOkTaskInfo(task, true, true);
- if (!content.Status) throw new Exception(content.Message);
- if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode || x.PalletCode == task.containerCode) != null)
+ if (!content.Status)
{
- throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆�/鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
- //continue;
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"浠诲姟鍙枫�恵task.taskCode}銆憑content.Message}"
+ });
+ continue;
+ //throw new Exception(content.Message);
}
+ if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode) != null)
+ {
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"浠诲姟鍙枫�恵task.taskCode}銆戝凡瀛樺湪浠诲姟"
+ });
+ continue;
+ //throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆戝凡瀛樺湪浠诲姟");
+ }
+ if (BaseDal.QueryFirst(x => x.PalletCode == task.containerCode) != null)
+ {
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟"
+ });
+ continue;
+ //throw new Exception($"鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
+ }
+ if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode) != null)
+ {
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"璧风偣浣嶇疆銆恵task.containerCode}銆戝凡瀛樺湪浠诲姟"
+ });
+ continue;
+ //throw new Exception($"璧风偣浣嶇疆銆恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
+ }
+ #endregion
switch (item.taskType)
{
case (int)TaskTypeEnum.MLInbound:
- CreateKLSNewInTask(task, item.taskType);
+ content = CreateKLSNewInTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.MLOutbound:
- CreateKLSNewOutTask(task, item.taskType);
+ content = CreateKLSNewOutTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CPInbound:
- CreateRGVNewInTask(task, item.taskType);
+ content= CreateRGVNewInTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CPOutbound:
- CreateRGVNewOutTask(task, item.taskType);
+ content= CreateRGVNewOutTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CJInbound:
- CreateHKNewInTask(task, item.taskType);
+ content = CreateHKNewInTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CJOutbound:
- CreateHKNewOutTask(task, item.taskType);
+ content = CreateHKNewOutTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.Carry:
- CarryTask(task, item.taskType);
+ content = CarryTask(task, item.taskType);
+ objects.Add(content.Data);
break;
case (int)TaskTypeEnum.CJCarry:
- CJCarryTaske(task, item.taskType);
+ content = CJCarryTaske(task, item.taskType);
+ objects.Add(content.Data);
break;
default:
+ objects.Add(new
+ {
+ taskCode = task.taskCode,
+ Message = $"鏈畾涔夌殑浠诲姟绫诲瀷"
+ });
break;
}
}
}
+ content.Data = objects;
}
catch (Exception ex)
{
@@ -168,7 +219,7 @@
#region 鍑箰澹�
if (isGALAXISTask)
{
- KLS = new CancelGALAXISTask
+ KLS = new CancelGALAXISTask
{
taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString()
@@ -181,11 +232,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{agvContent.data.returnInfo}");
}
}
@@ -194,7 +245,7 @@
#region 鍥涘悜杞�
if (isAGV)
{
- cancelSXCTake = new CancelSXCTake
+ cancelSXCTake = new CancelSXCTake
{
taskID = dt_Task.RGVTaskId,
withoutRunning = 1
@@ -207,18 +258,18 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
}
}
#endregion
#region 娴峰悍
if (isHK)
{
- cancelHIKROBOTTask = new CancelHIKROBOTTask
+ cancelHIKROBOTTask = new CancelHIKROBOTTask
{
robotTaskCode = dt_Task.WMSTaskNum,
cancelType = "CANCEL"//鍘熻蒋鍙栨秷锛孌ROP浜哄伐浠嬪叆锛堝師纭彇娑堬級
@@ -231,11 +282,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK("鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{hIKROBOTReturn.data}");
}
}
@@ -252,17 +303,17 @@
object logObject = null;
string deviceName = "";
- if (KLS != null )
+ if (KLS != null)
{
logObject = KLS;
deviceName = "鍑箰澹獳GV";
}
- else if (cancelHIKROBOTTask != null )
+ else if (cancelHIKROBOTTask != null)
{
logObject = cancelHIKROBOTTask;
deviceName = "娴峰悍鏈哄櫒浜�";
}
- else if (cancelSXCTake != null )
+ else if (cancelSXCTake != null)
{
logObject = cancelSXCTake;
deviceName = "鍥涘悜杞�";
@@ -270,7 +321,7 @@
if (logObject != null)
{
- _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟", "", "");
+ _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
}
}
return content;
@@ -311,7 +362,6 @@
{
taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString(),
- district = dt_Task.Roadway,//浠诲姟搴撳尯
priorityCode = updateTaskPriority.taskPriority,
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateGALAXISTaskGrade));
@@ -322,11 +372,11 @@
{
BaseDal.UpdateData(dt_Task);
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK($"淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ content.Error($"{dt_Task.WMSTaskNum}浠诲姟澶辫触,閿欒淇℃伅锛歿agvContent.data.returnInfo}");
}
}
#endregion
@@ -334,7 +384,7 @@
#region 鍥涘悜杞�
if (isAGV)
{
- request = new UpdateAgvSXCTake
+ request = new UpdateAgvSXCTake
{
taskID = dt_Task.RGVTaskId,
priority = updateTaskPriority.taskPriority
@@ -346,11 +396,11 @@
if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{fOURBOTReturn.data}");
}
}
@@ -358,7 +408,7 @@
#region 娴峰悍
if (isHK)
{
- Hkrequest = new HIKROBOTTaskGrade
+ Hkrequest = new HIKROBOTTaskGrade
{
robotTaskCode = dt_Task.WMSTaskNum,//浠诲姟鍙�
initPriority = updateTaskPriority.taskPriority//浼樺厛绾�
@@ -370,11 +420,11 @@
if (hIKROBOTReturn.code == "SUCCESS0" && hIKROBOTReturn.message == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭瘂hIKROBOTReturn.data}");
}
}
#endregion
@@ -389,7 +439,7 @@
object logObject = null;
string deviceName = "";
- if (updateGALAXISTaskGrade != null )
+ if (updateGALAXISTaskGrade != null)
{
logObject = updateGALAXISTaskGrade;
deviceName = "鍑箰澹獳GV";
@@ -399,7 +449,7 @@
logObject = Hkrequest;
deviceName = "娴峰悍鏈哄櫒浜�";
}
- else if (request != null )
+ else if (request != null)
{
logObject = request;
deviceName = "鍥涘悜杞�";
@@ -1120,33 +1170,33 @@
};
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOToccupyStation.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- if (fOURBOTReturn.returnCode != 0 && fOURBOTReturn.returnUserMsg != $"绔欑偣宸茶鍗犵敤,(podID={iQC.ContainerCode})")
+ if (fOURBOTReturn.returnCode != 0 /*&& fOURBOTReturn.returnUserMsg != $"绔欑偣宸茶鍗犵敤,(podID={iQC.ContainerCode})"*/)
throw new Exception(fOURBOTReturn.returnUserMsg);
#endregion
#region 鍒涘缓鍥涘悜杞︿换鍔�
- var task = BaseDal.QueryFirst(x => x.PalletCode == iQC.ContainerCode && x.SourceAddress == iQC.StationCode && x.TaskState == (int)TaskStatusEnum.New);
+ //var task = BaseDal.QueryFirst(x => x.PalletCode == iQC.ContainerCode && x.SourceAddress == iQC.StationCode && x.TaskState == (int)TaskStatusEnum.New);
#endregion
#region 鍛煎彨鍥涘悜杞�
- apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new()
- {
- priority = task.Grade,
- podID = task.PalletCode,
- //desNodeID = task.SourceAddress,
- desExt = new
- {
- unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
- },
- desStationCodes = task.SourceAddress,
- desType = 5
- };
- response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
- fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- content.Data = fOURBOTReturn;
- if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
- task.TaskState = (int)TaskStatusEnum.Execut;
- BaseDal.UpdateData(task);
+ //apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ //FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new()
+ //{
+ // priority = task.Grade,
+ // podID = task.PalletCode,
+ // //desNodeID = task.SourceAddress,
+ // desExt = new
+ // {
+ // unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+ // },
+ // desStationCodes = task.SourceAddress,
+ // desType = 5
+ //};
+ //response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
+ //fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ //content.Data = fOURBOTReturn;
+ //if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
+ //task.TaskState = (int)TaskStatusEnum.Execut;
+ //BaseDal.UpdateData(task);
#endregion
return WebResponseContent.Instance.OK();
}
--
Gitblit v1.9.3