From 7e758c7f7ebfb3e9a3d1d8a12ce5cae796ee614d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 18 三月 2026 09:20:43 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 106 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 40 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 2a81afd..67e93b8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -42,10 +42,12 @@
GALAXISUpdateTaskStatus gALAXIS = new();
RGVReturnInfo Rgv = new();//鍥涘悜杞︿换鍔＄姸鎬侀�氱煡
HIKROBOTTaskProcessReport hIKROBOT = new();//娴峰悍鏈哄櫒浜�
+ string deviceName = "";
try
{
if (deviceTypeEnum == DeviceTypeEnum.GALAXIS)
{
+ deviceName = "鍑箰澹�";
gALAXIS = TaskDTO.Serialize().DeserializeObject<GALAXISUpdateTaskStatus>();
if (gALAXIS == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
var task = BaseDal.QueryFirst(x => x.WMSTaskNum == gALAXIS.taskId);
@@ -67,64 +69,111 @@
}
else if (deviceTypeEnum == DeviceTypeEnum.HIKROBOT)
{
+ deviceName = "娴峰悍";
hIKROBOT = TaskDTO.Serialize().DeserializeObject<HIKROBOTTaskProcessReport>();
if (hIKROBOT == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
var task = BaseDal.QueryFirst(x => x.WMSTaskNum == hIKROBOT.robotTaskCode);
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵hIKROBOT.robotTaskCode}銆�");
switch (hIKROBOT.extra.values.method)
{
- case "end":
- TaskCompleted(task, deviceTypeEnum);
- break;
- case "outbin":
- TaskFromCompleted(task, deviceTypeEnum);
- break;
case "start":
task.TaskState = (int)TaskStatusEnum.Takeing;
TaskFeedback(task, 1);
break;
- default:
- task.TaskState = ReturnTaskStatus(hIKROBOT.extra.values.method, deviceTypeEnum);
- BaseDal.UpdateData(task);
+ case "outbin":
+ {
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskFromCompleted(task, deviceTypeEnum);
+ }
break;
+ case "into"://鐢宠杩涘叆鎻愬崌鏈�
+ break;
+ case "wait"://鎵爜绛夊緟
+ break;
+ case "end":
+ {
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ break;
+ default:
+ throw new Exception("鏈畾涔夌殑鏂规硶鍚嶏紒");
+ //task.TaskState = ReturnTaskStatus(hIKROBOT.extra.values.method, deviceTypeEnum);
+ //BaseDal.UpdateData(task);
+ //break;
}
}
else //鍥涘悜杞�
{
+ deviceName = "鍥涘悜杞�";
Rgv = TaskDTO.Serialize().DeserializeObject<RGVReturnInfo>();
if (Rgv == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
//var task = BaseDal.QueryFirst(x => x.RGVTaskId == Rgv.content.taskID);
var task = BaseDal.QueryFirst(x => x.PalletCode == Rgv.content.podID);
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵Rgv.content.taskID}銆�");
- if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
+ //绉诲簱
+ if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt() && Rgv.messageType == 10 && Rgv.content.status == 4)
{
-
+ deviceName += "绉诲簱";
+ WMSMoveLocationFeedback wMSMoveLocationFeedback = new WMSMoveLocationFeedback()
+ {
+ containerCode = task.PalletCode,
+ fromStationCode = task.SourceAddress,
+ toLocationCode = task.TargetAddress
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSMoveLocationFeedback));
+ WMSReturn agvContent = null;
+ if (apiInfo == null) task.ExceptionMessage = "鏈壘鍒扮Щ搴撳畬鎴愬弽棣圵MS鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�";
+ else
+ {
+ task.TaskState = TaskStatusEnum.Finish.ObjToInt();
+ string response = HttpHelper.Post(apiInfo.ApiAddress, wMSMoveLocationFeedback.Serialize());
+ agvContent = response.DeserializeObject<WMSReturn>();
+ content.OK(data: agvContent);
+ if (agvContent.code != 200)
+ {
+ task.ExceptionMessage = agvContent.message;
+ content.Error(agvContent.message);
+ }
+ UpdateLocationStatus(task.TargetAddress, task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);
+ BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
+ }
}
else
{
+ //绔欏彴鍒拌川妫�鍙�
if (Rgv.messageType == 72)//灏忚溅椤惰捣璐х墿
{
if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
{
task.TaskState = (int)TaskStatusEnum.WaiCheckShape;
//BaseDal.UpdateData(task);//缁欒川妫�闂ㄥ啓鍏ュ惎鍔ㄤ俊鍙�
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�";
+ else
+ {
+ if (device.IsConnected)
+ device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
+ else
+ task.ExceptionMessage = "1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�";
+ }
TaskFeedback(task, 4);
- var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice ?? throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
- device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
}
else
{
+ //杩欓噷鍑哄簱锛岃繖涓帴鍙ｄ腑涔熻繑鍥炵粰浜唚ms鐘舵��
TaskFromCompleted(task, deviceTypeEnum);
}
}
- else if (Rgv.messageType == 10)
+ else if (Rgv.messageType == 10)//璐ㄦ鍙板埌鐩爣璐т綅
{
if (Rgv.content.status == 2) TaskFeedback(task, 1);
if (Rgv.content.status == 4)
{
if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
{
- task.TaskState = (int)TaskStatusEnum.CheckShapeing;
+ if (!string.IsNullOrEmpty(task.ExceptionMessage)) task.TaskState = TaskStatusEnum.CheckShapeingNG.ObjToInt();
+ else task.TaskState = (int)TaskStatusEnum.CheckShapeing;
BaseDal.UpdateData(task);
}
else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
@@ -134,7 +183,7 @@
else
TaskCompleted(task, deviceTypeEnum);
}
- else if (task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
+ else if (task.TaskType == (int)TaskTypeEnum.CPOutbound )//鍑哄簱瀹屾垚
{
TaskCompleted(task, deviceTypeEnum);
}
@@ -150,30 +199,7 @@
}
finally
{
- // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
- object logObject = null;
- string deviceName = "";
-
- if (gALAXIS != null && gALAXIS.taskId != null)
- {
- logObject = gALAXIS;
- deviceName = "鍑箰澹獳GV";
- }
- else if (hIKROBOT != null && hIKROBOT.robotTaskCode != null)
- {
- logObject = hIKROBOT;
- deviceName = "娴峰悍鏈哄櫒浜�";
- }
- else if (Rgv != null && Rgv.content.taskID != 0)
- {
- logObject = Rgv;
- deviceName = "鍥涘悜杞�";
- }
-
- if (logObject != null)
- {
- _trackloginfoService.AddTrackLog(logObject, content, $"涓嬪彂{deviceName}浠诲姟", "", "");
- }
+ _trackloginfoService.AddTrackLog(TaskDTO, content, $"{deviceName}浠诲姟鐘舵�佸弽棣�", "", "");
}
return content;
}
--
Gitblit v1.9.3