From 6d9829c889a826d39cbc911ef5d01825edd1bffc Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期四, 26 六月 2025 16:33:29 +0800 Subject: [PATCH] 添加设备交互日志 --- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs | 43 ++++++++++++------------------------------- 1 files changed, 12 insertions(+), 31 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs" index c5fa9ab..3dc40fc 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_Line.cs" @@ -29,34 +29,9 @@ var ResultData = HttpHelper.PostAsync(WMSInterfaceAddress.ConveyorLineRequestInbound, lineDTO.ToJson(), headers: new Dictionary<string, string>()); if (ResultData.Result == null) throw new Exception($"鍚慦MS璇锋眰鍏ュ簱瓒呮椂"); - content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result); + return JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result); #endregion - - #region 浜х嚎鐢宠鍏ュ簱浠诲姟 - if (content != null && content.Status)//浠诲姟杞崲 - { - var task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToJson()); - if (task != null) - { - List<int> TaskNums = new List<int>(); - List<Dt_Router> routers = _routerService.QueryNextRoutes(task.CurrentAddress, task.TargetAddress); - if (routers.Count > 0) - { - task.NextAddress = routers.FirstOrDefault().ChildPosi; - } - task.WMSId = task.TaskId; - task.Creater = "WMS"; - task.Dispatchertime = null; - task.CreateDate = DateTime.Now; - BaseDal.AddData(task); - TaskNums.Add(task.TaskNum); - _taskExecuteDetailService.AddTaskExecuteDetail(TaskNums, "鎺ユ敹WMS浠诲姟"); - } - } - #endregion - - return content; } /// <summary> @@ -78,12 +53,18 @@ var ResultData = HttpHelper.PostAsync(WMSInterfaceAddress.StackerCraneRequestInbound, lineDTO.ToJson(), headers: new Dictionary<string, string>()); if (ResultData.Result == null) throw new Exception($"鍚慦MS璇锋眰鍏ュ簱鍒嗛厤璐т綅瓒呮椂!浠诲姟鍙�:{task.TaskNum}"); content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result); - if (!content.Status) throw new Exception(content.Message); + if (content.Status) + { + var receiveWMSInfo = JsonConvert.DeserializeObject<ReceiveWMSInfo>(content.Data.ToJson()); + task.SourceIsPickPlace = receiveWMSInfo.SourceIsPickPlace; + task.TargetIsPickPlace = receiveWMSInfo.TargetIsPickPlace; + task.TargetAddress = receiveWMSInfo.TargetAddress; + task.NextAddress = task.TargetAddress; + task.ExceptionMessage = null; + } + else + task.ExceptionMessage = content.Message; - var receiveWMSInfo = JsonConvert.DeserializeObject<ReceiveWMSInfo>(content.Data.ToJson()); - task.IsPickPlace = receiveWMSInfo.IsPickPlace; - task.TargetAddress = receiveWMSInfo.TargetAddress; - task.NextAddress = task.TargetAddress; BaseDal.UpdateData(task); } catch (Exception ex) -- Gitblit v1.9.3