From 644819a289399eff1d5972c3df41ec55cb9d8c95 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 三月 2026 16:57:00 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 113 +++++++++++++++++++++++++++++---------------------------
1 files changed, 59 insertions(+), 54 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 95ba692..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"
@@ -111,77 +111,82 @@
//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 (Rgv.messageType == 72)//灏忚溅椤惰捣璐х墿
+ //绉诲簱
+ if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt() && Rgv.messageType == 10 && Rgv.content.status == 4)
{
- if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
+ deviceName += "绉诲簱";
+ WMSMoveLocationFeedback wMSMoveLocationFeedback = new WMSMoveLocationFeedback()
{
- 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);
- }
+ 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
{
- TaskFromCompleted(task, deviceTypeEnum);
+ 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 == 10)
+ else
{
- if (Rgv.content.status == 2) TaskFeedback(task, 1);
- if (Rgv.content.status == 4)
+ //绔欏彴鍒拌川妫�鍙�
+ if (Rgv.messageType == 72)//灏忚溅椤惰捣璐х墿
{
- if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
{
- 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鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�";
+ 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
{
- 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.鑷姩瀹屾垚);
+ if (device.IsConnected)
+ device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
+ else
+ task.ExceptionMessage = "1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�";
}
+ TaskFeedback(task, 4);
}
- else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ else
{
- if (!string.IsNullOrEmpty(task.ExceptionMessage)) task.TaskState = TaskStatusEnum.CheckShapeingNG.ObjToInt();
- else task.TaskState = (int)TaskStatusEnum.CheckShapeing;
- BaseDal.UpdateData(task);
+ //杩欓噷鍑哄簱锛岃繖涓帴鍙ｄ腑涔熻繑鍥炵粰浜唚ms鐘舵��
+ TaskFromCompleted(task, deviceTypeEnum);
}
- else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
+ }
+ else if (Rgv.messageType == 10)//璐ㄦ鍙板埌鐩爣璐т綅
+ {
+ if (Rgv.content.status == 2) TaskFeedback(task, 1);
+ if (Rgv.content.status == 4)
{
- if (!string.IsNullOrEmpty(task.ExceptionMessage))
- ErrorTaskFeedback(task, true/*!task.ExceptionMessage.Contains("澶栨澶辫触")*/);
- else
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ {
+ 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)
+ {
+ if (!string.IsNullOrEmpty(task.ExceptionMessage))
+ ErrorTaskFeedback(task, true/*!task.ExceptionMessage.Contains("澶栨澶辫触")*/);
+ else
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.CPOutbound )//鍑哄簱瀹屾垚
+ {
TaskCompleted(task, deviceTypeEnum);
- }
- else if (task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
- {
- TaskCompleted(task, deviceTypeEnum);
+ }
}
}
}
--
Gitblit v1.9.3