1

huangxiaoqiang

3 天以前 ec9c9add38591d7c7a2708ac43ed6b3fce1a4063

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -103,6 +103,7 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                WriteLog.GetLog("接收WMS任务").Write(JsonConvert.SerializeObject(taskDTOs), "接收WMS任务");
                Dt_Task task =null;
                // åˆ¤æ–­ä»»åŠ¡ç±»åž‹æ˜¯å¦ä¸ºå‡ºåº“任务
                if (taskDTOs.TaskType == "2")
@@ -338,6 +339,7 @@

                        Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
                        task_Hty.TaskId = 0;
                        task_Hty.OperateType = (int)OperateTypeEnum.异常退回;

                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);
@@ -347,6 +349,7 @@
                            PalletCode=taskDTOs.TPbarcode,
                            ErrorMessage=taskDTOs.EndPoint,
                            CreateDate=DateTime.Now,
                            Creater = "WMS"
                        };
                        _errorMessageRepository.AddData(message);
                        IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == task.RGVName);
@@ -383,6 +386,7 @@
                                PalletCode = taskDTOs.TPbarcode,
                                ErrorMessage = taskDTOs.EndPoint,
                                CreateDate = DateTime.Now,
                                Creater ="WMS"
                            };
                            _errorMessageRepository.AddData(message);
                        }
@@ -398,6 +402,7 @@
            }
            catch (Exception ex)
            {
                WriteLog.GetLog("接收WMS任务").Write(JsonConvert.SerializeObject(ex.Message), "接收WMS任务");
                content = WebResponseContent.Instance.Error($"生成任务失败,错误信息:{ex.Message}");
            }
            finally
@@ -940,6 +945,10 @@
                        content = StackCraneTaskCompleted(task.TaskNum);
                        return content;
                    }
                    if (task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
                    {
                        task.Dispatchertime = DateTime.Now;
                    }
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                {
@@ -1030,6 +1039,7 @@
                    }
                    var wmsIpAddress = wmsBase + requestTask;
                    var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
                    WriteLog.GetLog("WMS接口返回信息").Write(JsonConvert.SerializeObject(result), "WMS接口返回信息");

                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV调度完成等待WMS任务");
                }
@@ -1092,7 +1102,7 @@
                    }
                    var wmsIpAddress = wmsBase + requestTask;
                    var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;

                    WriteLog.GetLog("WMS接口返回信息").Write(JsonConvert.SerializeObject(result), "WMS接口返回信息");

                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV出库完成");
                }
@@ -1160,7 +1170,7 @@

                    Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
                    task_Hty.TaskId = 0;

                    task_Hty.OperateType = (int)OperateTypeEnum.自动完成;
                    BaseDal.DeleteData(task);
                    _taskHtyRepository.AddData(task_Hty);
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机入库完成");
@@ -1183,6 +1193,7 @@
                    }
                    var wmsIpAddress = wmsBase + requestTask;
                    var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
                    WriteLog.GetLog("WMS接口返回信息").Write(JsonConvert.SerializeObject(result), "WMS接口返回信息");
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                {
@@ -1216,6 +1227,7 @@
                    }
                    var wmsIpAddress = wmsBase + requestTask;
                    var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
                    WriteLog.GetLog("WMS接口返回信息").Write(JsonConvert.SerializeObject(result), "WMS接口返回信息");
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup)
                {
@@ -1311,6 +1323,7 @@
                }
                var wmsIpAddress = wmsBase + requestTask;
                var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
                WriteLog.GetLog("WMS接口返回信息").Write(JsonConvert.SerializeObject(result), "WMS接口返回信息");
                #endregion

                content = WebResponseContent.Instance.OK("取消任务成功");
@@ -1372,6 +1385,7 @@
                }
                var wmsIpAddress = wmsBase + requestTask;
                var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
                WriteLog.GetLog("WMS接口返回信息").Write(JsonConvert.SerializeObject(result), "WMS接口返回信息");
                #endregion

                content = WebResponseContent.Instance.OK("手动完成成功");