From 4d2b6fea8d08c95bd6bb2b8c2b1228383110457e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 12:48:46 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 206 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 187 insertions(+), 19 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 914c4fe..ac17fd7 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,121 @@
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;
+ BaseDal.UpdateData(task);
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.Q3CK|| task.TaskType == (int)TaskTypeEnum.Q3RK)
+ {
+ //UpdateStandStatus(task, task.SourceAddress, LocationStatusEnum.Lock);
+ task.TaskState = (int)TaskStatusEnum.Takeing;
+ TaskFeedback(task, 1);
+ }
+ else
+ {
+ task.TaskState = (int)TaskStatusEnum.Takeing;
+ TaskFeedback(task, 1);
+ }
break;
case "outbin"://绂诲紑璧风偣
{
- if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+ if (task.TaskType == (int)TaskTypeEnum.Q3RK|| task.TaskType == (int)TaskTypeEnum.Q3CK)
+ {
+ UpdateStandStatus(task, task.SourceAddress, LocationStatusEnum.Free);
+ task.TaskState = TaskStatusEnum.TakeFinish.ObjToInt();
+ BaseDal.UpdateData(task);
+ TaskFeedback(task, 1);
+ }
+ else
+ {
+
+ 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 = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ BaseDal.UpdateData(task);
+ }
+
+ //3 鍑烘彁鍗囨満 涔嬪墠鏄疉GV_ToExecute
+ else if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.TakeFinish)
{
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 = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
}
+ BaseDal.UpdateData(task);
}
- ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
- 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 = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ BaseDal.UpdateData(task);
+ }
+ // //鍥涙ゼ鍑烘彁鍗囨満 鍏ュ簱 涔嬪墠鏄疉GV_ToExecute //瑕佸啓鎴愬彇璐у畬鎴愮姸鎬乀akeFinish
+ 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 = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ BaseDal.UpdateData(task);
+ }
+ //璺ㄦゼ灞�
+ else if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() || task.TaskType == TaskTypeEnum.Q3CK.ObjToInt() && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ {
+ if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt()|| task.TaskType == TaskTypeEnum.Q3RK.ObjToInt())
+ {
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒拌川妫�闂ㄤ俊鎭�";
+ else
+ {
+ if (device.IsConnected)
+ //鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
+ device.SetValue(QualityInspectionCommandEnum.RequestToEnter, false, task.TargetAddress);
+ else
+ task.ExceptionMessage = "璐ㄦ闂ㄤ俊鎭澶囪繛鎺ュけ璐�";
+ }
+
+ }
+ BaseDal.UpdateData(task);
+ }
}
break;
case "into"://鐢宠杩涘叆鎻愬崌鏈�
@@ -106,26 +203,54 @@
break;
case "wait"://鎵爜绛夊緟
{
+ //瑕佸厛寮�鍚壂鐮佷俊鍙�
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
+ else
+ {
+ if (device.IsConnected)
+ //鎵撳紑鎵爜鍣�
+ device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
BaseDal.UpdateData(task);
}
break;
case "end"://浠诲姟瀹屾垚閫氱煡
{
- ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
- if(task.TaskType== TaskTypeEnum.RK3F.ObjToInt()&& task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
+ if (task.TaskType == (int)TaskTypeEnum.Q3RK || task.TaskType == (int)TaskTypeEnum.Q3CK|| task.TaskType == (int)TaskTypeEnum.MOVE)
{
- 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();
+ BaseDal.UpdateData(task);
+ TaskFeedback(task, 2);
+ BaseDal.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
}
- TaskCompleted(task, deviceTypeEnum);
+ else
+ {
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ }
+ break;
+ case "intolift": //杩涘叆鐢垫
+ {
+ //鍏ゼ鍒颁竴妤肩殑鍏ュ簱浠诲姟
+ if (task.TaskType==(int)TaskTypeEnum.Q3RK||task.TaskType==(int)TaskTypeEnum.MOVE||task.TaskType==(int)TaskTypeEnum.F01)
+ {
+ task.TaskState = TaskStatusEnum.Hkintolift.ObjToInt();
+ BaseDal.UpdateData(task);
+ }
+ }
+ break;
+ case "leavelift": //绂诲紑鐢垫
+ {
+ if (task.TaskType == (int)TaskTypeEnum.Q3RK || task.TaskType == (int)TaskTypeEnum.MOVE || task.TaskType == (int)TaskTypeEnum.F01)
+ {
+ task.TaskState = TaskStatusEnum.HKleavelift.ObjToInt();
+ BaseDal.UpdateData(task);
+ }
}
break;
default:
@@ -378,6 +503,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)
{
@@ -411,6 +550,34 @@
}
#endregion
+ #region 鏇存柊涓�妤肩珯鍙扮姸鎬�
+ public WebResponseContent UpdateStandStatus(Dt_Task task,string stationCode,LocationStatusEnum locationStatusEnum)
+ {
+ try
+ {
+ Dt_StationManger? stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == task.TargetAddress);
+ //stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ if (stationManger != null)
+ {
+ if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+ {
+ stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
+ }
+ else
+ {
+ stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
+ }
+ _stationMangerService.UpdateData(stationManger);
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+ #endregion
+
#region 涓婃姤WMS
public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status)
{
@@ -429,7 +596,7 @@
boundCompleteFeedback.toLocationCode = dt_Task.TargetAddress;
boundCompleteFeedback.status = Status;
boundCompleteFeedback.custStatus = "";
- string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
+ string response = HttpHelper.Post(apiInfo.ApiAddress,boundCompleteFeedback.Serialize());
agvContent = response.DeserializeObject<WMSReturn>();
content.OK(data: agvContent);
if (agvContent.code != 200)
@@ -476,6 +643,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