From 24ac6e3688db3dbb68eb6a53dd6c6fc9f8e12d6b Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 24 三月 2026 15:28:24 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 34 +++++++++++++++++++++++-----------
1 files changed, 23 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 3a12d21..b035582 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"
@@ -83,7 +83,6 @@
break;
case "outbin"://绂诲紑璧风偣
{
-
///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
TaskFromCompleted(task, deviceTypeEnum);
}
@@ -100,14 +99,14 @@
{
DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());
if (device.IsConnected)
- device.SetValue(HoistEnum.Inboundboxon, 1);//鍏ュ簱瀹屾垚
+ device.SetValue(HoistEnum.Inboundboxon, 1);
else
task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
}
}
//鍑烘彁鍗囨満
- if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+ 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 = "鏈壘鍒版彁鍗囨満淇℃伅";
@@ -119,8 +118,8 @@
task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
}
}
- //鍥涙ゼ 鍏ュ簱
- if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+ //鍥涙ゼ 鍑哄簱
+ 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 = "鏈壘鍒版彁鍗囨満淇℃伅";
@@ -130,10 +129,10 @@
device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
else
task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
- }
+ }
}
- //鍥涙ゼ 鍑哄簱
- if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+ //鍥涙ゼ 鍏ュ簱
+ 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 = "鏈壘鍒版彁鍗囨満淇℃伅";
@@ -141,10 +140,10 @@
{
if (device.IsConnected)
//鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
- device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "1");
+ device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
else
task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
- }
+ }
}
}
break;
@@ -163,7 +162,6 @@
case "end"://浠诲姟瀹屾垚閫氱煡
{
///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
-
TaskCompleted(task, deviceTypeEnum);
}
break;
@@ -417,6 +415,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)
{
--
Gitblit v1.9.3