From 490e62a0f7b33249dabb74e000725bd8555ca186 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 22 三月 2026 12:56:52 +0800
Subject: [PATCH] 添加3F、4F循环任务；平库表添加状态和托盘号；海康AGV任务反馈添加更新平库货位信息
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 11 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 bec86f6..b13e3a4 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"
@@ -76,20 +76,63 @@
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"://绂诲紑璧风偣
+ {
+ 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);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskFromCompleted(task, deviceTypeEnum);
+ }
break;
+ case "into"://鐢宠杩涘叆鎻愬崌鏈�
+ {
+ task.TaskState = (int)TaskStatusEnum.AGV_WaitToExecute;
+ BaseDal.UpdateData(task);
+ }
+ break;
+ case "wait"://鎵爜绛夊緟
+ {
+ task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
+ BaseDal.UpdateData(task);
+ }
+ break;
+ case "end"://浠诲姟瀹屾垚閫氱煡
+ {
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ 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
+ {
+ if (device.IsConnected)
+ device.SetValue(HoistEnum.Inboundboxon, 1);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ break;
+ default:
+ throw new Exception("鏈畾涔夌殑鏂规硶鍚嶏紒");
+ //task.TaskState = ReturnTaskStatus(hIKROBOT.extra.values.method, deviceTypeEnum);
+ //BaseDal.UpdateData(task);
+ //break;
}
}
else //鍥涘悜杞�
@@ -167,12 +210,12 @@
}
else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
{
- if (!string.IsNullOrEmpty(task.ExceptionMessage))
+ if (!string.IsNullOrEmpty(task.ExceptionMessage) && !task.ExceptionMessage.Contains("鐢变簬鐩爣璁＄畻鏈虹Н鏋佹嫆缁濓紝鏃犳硶杩炴帴"))
ErrorTaskFeedback(task, true/*!task.ExceptionMessage.Contains("澶栨澶辫触")*/);
else
TaskCompleted(task, deviceTypeEnum);
}
- else if (task.TaskType == (int)TaskTypeEnum.CPOutbound )//鍑哄簱瀹屾垚
+ else if (task.TaskType == (int)TaskTypeEnum.CPOutbound)//鍑哄簱瀹屾垚
{
TaskCompleted(task, deviceTypeEnum);
}
@@ -335,6 +378,20 @@
dt_HKLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
_hKLocationInfoService.Repository.UpdateData(dt_HKLocationInfo);
}
+ Dt_StationInfo? stationInfo = _stationInfo.Repository.QueryFirst(x => x.StationCode == locationCode);
+ if (stationInfo != null)
+ {
+ if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+ {
+ stationInfo.PalletCode = "";
+ }
+ else
+ {
+ stationInfo.PalletCode = palletCode;
+ }
+ stationInfo.StationStatus = locationStatusEnum.ObjToInt();
+ _stationInfo.UpdateData(stationInfo);
+ }
}
else if (deviceTypeEnum == DeviceTypeEnum.YuanLiJuHe)
{
@@ -454,5 +511,9 @@
return content;
}
#endregion
+
+
+
+
}
}
--
Gitblit v1.9.3