From 4a574cd38860e7260f9349f9770c87d27dfdeeaf Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 01 四月 2026 20:59:27 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 103 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 18 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 b13e3a4..109c94b 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"
@@ -21,6 +21,7 @@
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
+using WIDESEAWCS_QuartzJob.DTO;
namespace WIDESEAWCS_TaskInfoService
{
@@ -77,25 +78,93 @@
switch (hIKROBOT.extra.values.method)
{
case "start":
- task.TaskState = (int)TaskStatusEnum.Takeing;
- TaskFeedback(task, 1);
+ if (task.TaskState == (int)TaskStatusEnum.CallingHKtransportation && task.TaskType == (int)TaskTypeEnum.Move)
+ {
+ task.TaskState = (int)TaskStatusEnum.HktransportIng;
+ }
+ else
+ {
+ task.TaskState = (int)TaskStatusEnum.Takeing;
+ TaskFeedback(task, 1);
+ }
break;
case "outbin"://绂诲紑璧风偣
{
- if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskFromCompleted(task, deviceTypeEnum); //浠诲姟鐘朵綋鏀逛负3鍙栬揣瀹屾垚锛屾洿鏂拌捣鐐硅揣浣嶇姸鎬侊紝骞跺弽棣圵MS璧风偣瀹屾垚
+ }
+ break;
+ case "finish"://绂诲紑鎻愬崌鏈�
+ {
+
+ //鍏ユ彁鍗囨満
+ if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
+ {
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
+ else
+ {
+ DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());
+ if (device.IsConnected)
+ device.SetValue(HoistEnum.Inboundboxon, 1);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
+
+ //鍑烘彁鍗囨満
+ else if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
{
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
else
{
if (device.IsConnected)
- device.SetValue(HoistEnum.Outboundboxon, 1);
+ device.SetValue(HoistEnum.Outboundboxon, 1);//鍑哄簱瀹屾垚
else
task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
}
}
- ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
- TaskFromCompleted(task, deviceTypeEnum);
+ //鍥涙ゼ 鍑哄簱
+ else if ((task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() || task.TaskType == TaskTypeEnum.F04.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+ {
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
+ else
+ {
+ if (device.IsConnected)
+ device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
+ //鍥涙ゼ 鍏ュ簱
+ else if ((task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() || task.TaskType == TaskTypeEnum.F03.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+ {
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
+ else
+ {
+ if (device.IsConnected)
+ //鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
+ device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
+ else if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() || task.TaskType == TaskTypeEnum.Q3CK.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+ {
+ if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt())
+ {
+ //濡傛灉鏄叚妤煎埌涓�妤煎氨鍐欎竴涓俊鍙风粰1妤紁lc鍛婅瘔浠栨垜鏉ュ叆搴撲簡
+
+ }
+ else
+ {
+ //杩欎釜灏卞啓涓�涓浣嶇姸鎬侊紝鍛婅瘔瀹冩垜鍑哄簱浜�
+
+ }
+ }
}
break;
case "into"://鐢宠杩涘叆鎻愬崌鏈�
@@ -112,20 +181,17 @@
break;
case "end"://浠诲姟瀹屾垚閫氱煡
{
- ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
- if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
+ if (task.TaskType == (int)TaskTypeEnum.Move && task.TaskState == (int)TaskStatusEnum.HkTransportCompleted)
{
- var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
- if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
- else
- {
- if (device.IsConnected)
- device.SetValue(HoistEnum.Inboundboxon, 1);
- else
- task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
- }
+ task.TaskState = TaskStatusEnum.Finish.ObjToInt();
+ TaskFeedback(task, 2);
+ BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
}
- TaskCompleted(task, deviceTypeEnum);
+ else
+ {
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskCompleted(task, deviceTypeEnum);
+ }
}
break;
default:
@@ -490,6 +556,7 @@
string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
agvContent = response.DeserializeObject<WMSReturn>();
content.OK(data: agvContent);
+ content.Message = dt_Task.ExceptionMessage;
if (agvContent.code != 200)
{
dt_Task.ExceptionMessage = agvContent.message;
--
Gitblit v1.9.3