From 1cf0b3dd6b2587934a8a34ddd1b3a5a851e9c375 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 13 三月 2026 11:16:38 +0800
Subject: [PATCH] 添加移库数据反馈WMS
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSMoveLocationFeedback.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 123 ++++++++++++++++++++--------------------
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSReturn.cs | 14 ++++
3 files changed, 74 insertions(+), 65 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSMoveLocationFeedback.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSMoveLocationFeedback.cs"
index 2f90d18..bcac56e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSMoveLocationFeedback.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSMoveLocationFeedback.cs"
@@ -39,6 +39,6 @@
/// <summary>
/// 鍙樻洿浣嶇疆鐨勬椂闂�
/// </summary>
- public string alterLocationTime { get; set; }
+ public string alterLocationTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSReturn.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSReturn.cs"
index fa47dc9..1607927 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSReturn.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/WMSReturn.cs"
@@ -12,7 +12,7 @@
public class WMSReturn
{
/// <summary>
- /// 鍝嶅簲鐮侊細0-锛堥潪绌虹锛夋垚鍔燂紝-1-锛堢┖绠憋級澶辫触锛屽叾浠�-寮傚父
+ /// 鎴愬姛锛�200锛屽叾浠栬〃绀哄紓甯搞��
/// </summary>
public int code { get; set; }
@@ -20,8 +20,18 @@
/// 鍝嶅簲娑堟伅锛歴uccess-鎴愬姛锛屽紓甯歌繑鍥炶缁嗛敊璇師鍥�
/// </summary>
public string message { get; set; }
-
+ /// <summary>
+ /// TRUE
+ /// </summary>
public string success { get; set; }
+ /// <summary>
+ /// 鎴愬姛
+ /// </summary>
+ public string result { get; set; }
+ /// <summary>
+ /// 鏃堕棿鎴�
+ /// </summary>
+ public long timestamp { get; set; }
/// <summary>
/// 鍝嶅簲鏁版嵁锛屽浐瀹氫负绌�
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 104b6cc..918d968 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"
@@ -42,10 +42,12 @@
GALAXISUpdateTaskStatus gALAXIS = new();
RGVReturnInfo Rgv = new();//鍥涘悜杞︿换鍔＄姸鎬侀�氱煡
HIKROBOTTaskProcessReport hIKROBOT = new();//娴峰悍鏈哄櫒浜�
+ string deviceName = "";
try
{
if (deviceTypeEnum == DeviceTypeEnum.GALAXIS)
{
+ deviceName = "鍑箰澹�";
gALAXIS = TaskDTO.Serialize().DeserializeObject<GALAXISUpdateTaskStatus>();
if (gALAXIS == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
var task = BaseDal.QueryFirst(x => x.WMSTaskNum == gALAXIS.taskId);
@@ -67,6 +69,7 @@
}
else if (deviceTypeEnum == DeviceTypeEnum.HIKROBOT)
{
+ deviceName = "娴峰悍";
hIKROBOT = TaskDTO.Serialize().DeserializeObject<HIKROBOTTaskProcessReport>();
if (hIKROBOT == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
var task = BaseDal.QueryFirst(x => x.WMSTaskNum == hIKROBOT.robotTaskCode);
@@ -91,61 +94,80 @@
}
else //鍥涘悜杞�
{
+ deviceName = "鍥涘悜杞�";
Rgv = TaskDTO.Serialize().DeserializeObject<RGVReturnInfo>();
if (Rgv == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
//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 (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
- {
- }
- else
+ if (Rgv.messageType == 72)//灏忚溅椤惰捣璐х墿
{
- if (Rgv.messageType == 72)//灏忚溅椤惰捣璐х墿
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
{
- if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
- {
- 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);
- }
+ 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
{
- TaskFromCompleted(task, deviceTypeEnum);
+ if (device.IsConnected)
+ device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
+ else
+ task.ExceptionMessage = "1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�";
}
+ TaskFeedback(task, 4);
}
- else if (Rgv.messageType == 10)
+ else
{
- if (Rgv.content.status == 2) TaskFeedback(task, 1);
- if (Rgv.content.status == 4)
+ TaskFromCompleted(task, deviceTypeEnum);
+ }
+ }
+ else if (Rgv.messageType == 10)
+ {
+ if (Rgv.content.status == 2) TaskFeedback(task, 1);
+ if (Rgv.content.status == 4)
+ {
+ if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
{
- if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ deviceName += "绉诲簱";
+ WMSMoveLocationFeedback wMSMoveLocationFeedback = new WMSMoveLocationFeedback()
{
- if (!string.IsNullOrEmpty(task.ExceptionMessage)) task.TaskState = TaskStatusEnum.CheckShapeingNG.ObjToInt();
- else task.TaskState = (int)TaskStatusEnum.CheckShapeing;
- BaseDal.UpdateData(task);
+ containerCode = task.PalletCode,
+ fromStationCode = task.SourceAddress,
+ toLocationCode = task.TargetAddress
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSInOutBoundCompleteFeedback));
+ WMSReturn agvContent = null;
+ if (apiInfo == null) task.ExceptionMessage = "鏈壘鍒板嚭鍏ュ簱瀹屾垚鍙嶉WMS鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�";
+ else
+ {
+ 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);
+ }
}
- 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 || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
- {
+ }
+ 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 || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
+ {
+ TaskCompleted(task, deviceTypeEnum);
}
}
}
@@ -158,30 +180,7 @@
}
finally
{
- // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
- object logObject = null;
- string deviceName = "";
-
- if (gALAXIS != null && gALAXIS.taskId != null)
- {
- logObject = gALAXIS;
- deviceName = "鍑箰澹獳GV";
- }
- else if (hIKROBOT != null && hIKROBOT.robotTaskCode != null)
- {
- logObject = hIKROBOT;
- deviceName = "娴峰悍鏈哄櫒浜�";
- }
- else if (Rgv != null && Rgv.content.taskID != 0)
- {
- logObject = Rgv;
- deviceName = "鍥涘悜杞�";
- }
-
- if (logObject != null)
- {
- _trackloginfoService.AddTrackLog(logObject, content, $"涓嬪彂{deviceName}浠诲姟", "", "");
- }
+ _trackloginfoService.AddTrackLog(TaskDTO, content, $"{deviceName}浠诲姟鐘舵�佸弽棣�", "", "");
}
return content;
}
--
Gitblit v1.9.3