1

huangxiaoqiang

3 天以前 3296ae7c136f405db78c395635e72efa1c0d0125

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

@@ -46,6 +46,7 @@
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_TaskInfoRepository;
using static WIDESEAWCS_QuartzJob.Service.DeviceInfoService;

namespace WIDESEAWCS_TaskInfoService
{
@@ -60,6 +61,7 @@
        private readonly IMapper _mapper;
        private readonly IDeviceInfoRepository _deviceInfoRepository;
        private readonly IDt_StationManagerRepository _stationManagerRepository;
        private readonly IDt_WMSErrorMessageRepository _errorMessageRepository;


        private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -76,7 +78,7 @@
        public List<int> TaskRelocationboundTypes => typeof(TaskRelocationTypeEnum).GetEnumIndexList();

        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService taskHtyService, ISys_ConfigService sys_ConfigService, IDt_StationManagerRepository stationManagerRepository, ITask_HtyRepository taskHtyRepository,
        IDeviceInfoRepository deviceInfoRepository) : base(BaseDal)
        IDeviceInfoRepository deviceInfoRepository, IDt_WMSErrorMessageRepository errorMessageRepository) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -88,6 +90,7 @@
            _mapper = mapper;
            _sys_ConfigService = sys_ConfigService;
            _deviceInfoRepository = deviceInfoRepository;
            _errorMessageRepository = errorMessageRepository;
        }

        /// <summary>
@@ -100,7 +103,7 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                List<Dt_Task> tasks = new List<Dt_Task>();
                Dt_Task task =null;
                // åˆ¤æ–­ä»»åŠ¡ç±»åž‹æ˜¯å¦ä¸ºå‡ºåº“任务
                if (taskDTOs.TaskType == "2")
                {
@@ -111,7 +114,7 @@
                        {
                            return content.Error("未找到出库站台信息");
                        }
                        Dt_Task taskIn = new Dt_Task()
                        task = new Dt_Task()
                        {
                            TaskNum = BaseDal.GetTaskNo().Result,
                            Creater = "WMS",
@@ -128,12 +131,30 @@
                            Floor = stationManagerStart.stationFloor,
                            RGVName = ""
                        };
                        BaseDal.AddData(taskIn);
                        BaseDal.AddData(task);
                    }
                    else
                    {

                        string[] targetCodes = taskDTOs.BeginPoint.Split("-");

                        if(GetScCode(Convert.ToInt32(targetCodes[0]))=="SC01"&&(taskDTOs.EndPoint=="1030"|| taskDTOs.EndPoint == "1029"))
                        {
                            return content.Error($"一号堆垛机不能出库至该点位{taskDTOs.EndPoint}");
                        }
                        if (GetScCode(Convert.ToInt32(targetCodes[0])) == "SC06" && (taskDTOs.EndPoint == "1002" || taskDTOs.EndPoint == "1004"))
                        {
                            return content.Error($"六号堆垛机不能出库至该点位{taskDTOs.EndPoint}");
                        }

                        if (taskDTOs.EndPoint == "3004")
                        {
                            var newTask = BaseDal.QueryFirst(x => x.SourceAddress == "3001" && x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState != (int)TaskInStatusEnum.HoistNew && x.TaskState != (int)TaskInStatusEnum.HoistInExecuting && x.TaskState > 225);
                            if (newTask != null)
                            {
                                return content.Error("已存在入库任务，出库任务不可下发");
                            }
                        }


                        Dt_StationManager stationManagerEnd = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTOs.EndPoint);
                        if (stationManagerEnd == null)
@@ -148,7 +169,7 @@
                        {
                            RGVName = stationManager.RGVName;
                        }
                        Dt_Task taskOut = new Dt_Task()
                        task = new Dt_Task()
                        {
                            TaskNum = BaseDal.GetTaskNo().Result,
                            Creater = "WMS",
@@ -167,7 +188,7 @@
                            TargetStation= stationManagerEnd.remark,
                            SourceStation= 0,
                        };
                        BaseDal.AddData(taskOut);
                        BaseDal.AddData(task);
                    }
                }
                // åˆ¤æ–­ä»»åŠ¡ç±»åž‹æ˜¯å¦ä¸ºå…¥åº“任务
@@ -181,7 +202,7 @@
                            return content.Error("未找到入库站台信息");
                        }
                        string[] targetCodes = taskDTOs.EndPoint.Split("-");
                        Dt_Task taskIn = new Dt_Task()
                        task = new Dt_Task()
                        {
                            TaskNum = BaseDal.GetTaskNo().Result,
                            Creater = "WMS",
@@ -198,7 +219,7 @@
                            Floor = stationManagerStart.stationFloor,
                            RGVName = "RGV03"
                        };
                        BaseDal.AddData(taskIn);
                        BaseDal.AddData(task);
                    } 
                    else if (Convert.ToInt32(taskDTOs.BeginPoint) > 1999 && Convert.ToInt32(taskDTOs.BeginPoint) < 3000)
                    {
@@ -207,7 +228,7 @@
                        {
                            return content.Error("未找到出库站台信息");
                        }
                        Dt_Task taskIn = new Dt_Task()
                        task = new Dt_Task()
                        {
                            TaskNum = BaseDal.GetTaskNo().Result,
                            Creater = "WMS",
@@ -224,11 +245,23 @@
                            Floor = stationManagerStart.stationFloor,
                            RGVName = ""
                        };
                        BaseDal.AddData(taskIn);
                        BaseDal.AddData(task);
                    }
                    else
                    {
                        var task = BaseDal.QueryFirst(x => x.PalletCode == taskDTOs.TPbarcode);
                        task = BaseDal.QueryFirst(x => x.PalletCode == taskDTOs.TPbarcode);
                        string[] targetCodes = taskDTOs.EndPoint.Split("-");

                        if (GetScCode(Convert.ToInt32(targetCodes[0])) == "SC01" && (taskDTOs.BeginPoint == "1030" || taskDTOs.EndPoint == "1029"))
                        {
                            return content.Error($"该点位{taskDTOs.EndPoint}不能入库一号堆垛机");
                        }

                        if (GetScCode(Convert.ToInt32(targetCodes[0])) == "SC06" && (taskDTOs.BeginPoint == "1002" || taskDTOs.BeginPoint == "1004"))
                        {
                            return content.Error($"该点位{taskDTOs.EndPoint}不能入库六号堆垛机");
                        }

                        if (task != null)
                        {
                            task.Creater = "WMS";
@@ -244,8 +277,6 @@
                            task.WMSTaskNum = taskDTOs.TaskId;

                            task.TargetAddress = taskDTOs.EndPoint;

                            string[] targetCodes = taskDTOs.EndPoint.Split("-");

                            task.Roadway = GetScCode(Convert.ToInt32(targetCodes[0]));

@@ -270,7 +301,7 @@
                else if (taskDTOs.TaskType == "3")
                {
                    string[] targetCodes = taskDTOs.BeginPoint.Split("-");
                    Dt_Task taskRelocation = new Dt_Task()
                    task = new Dt_Task()
                    {
                        TaskType = (int)TaskRelocationTypeEnum.Relocation,

@@ -289,13 +320,80 @@
                        Grade = 3,

                    };
                    BaseDal.AddData(taskRelocation);
                    BaseDal.AddData(task);
                }
                else if (taskDTOs.TaskType == "4")
                {
                    task = BaseDal.QueryFirst(x => x.PalletCode == taskDTOs.TPbarcode);
                    Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
                    if (stationManager == null)
                    {
                        return content.Error("未找到起点站台");
                    }
                    
                    if (task != null)
                    {
                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";

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

                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);
                        Dt_WMSErrorMessage message = new Dt_WMSErrorMessage()
                        {
                            TaskNum = task.TaskNum,
                            PalletCode=taskDTOs.TPbarcode,
                            ErrorMessage=taskDTOs.EndPoint,
                            CreateDate=DateTime.Now,
                        };
                        _errorMessageRepository.AddData(message);
                        IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == task.RGVName);
                        if (device != null)
                        {
                            if (task.RGVName == "RGV01" || task.RGVName == "RGV02")
                            {
                                CommonRGV_FirstFloor commonRGV = (CommonRGV_FirstFloor)device;

                                commonRGV.SetValue(StackerCraneDBName.PutcargoLocation, Convert.ToSByte(stationManager.stationRemark));
                                commonRGV.SetValue(StackerCraneDBName.TaskNum, Convert.ToInt16(task.TaskNum));
                                commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(4));
                            }
                            else
                            {
                                CommonRGV commonRGV = (CommonRGV)device;
                                commonRGV.SetValue(StackerCraneDBName.PutcargoLocation, Convert.ToSByte(stationManager.stationRemark));
                                commonRGV.SetValue(StackerCraneDBName.TaskNum, Convert.ToInt16(task.TaskNum));
                                commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(4));
                            }
                        }
                    }
                    else
                    {
                        IDevice? deviceconveyorline = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManager.stationPLC);
                        if (deviceconveyorline != null)
                        {
                            CommonConveyorLine conveyorLine = (CommonConveyorLine)deviceconveyorline;

                            conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(3), stationManager.stationChildCode);

                            Dt_WMSErrorMessage message = new Dt_WMSErrorMessage()
                            {
                                PalletCode = taskDTOs.TPbarcode,
                                ErrorMessage = taskDTOs.EndPoint,
                                CreateDate = DateTime.Now,
                            };
                            _errorMessageRepository.AddData(message);
                        }
                    }
                    return content.OK();
                }
                else
                {
                    return content.Error($"任务类型错误,未找到该任务类型,任务号:【{taskDTOs.TaskId}】,任务类型:【{taskDTOs.TaskType}】");
                }
                _taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskId).ToList(), "接收WMS任务");
                _taskExecuteDetailService.AddTaskExecuteDetailS(task.TaskNum, "接收WMS任务");
                content = WebResponseContent.Instance.OK("成功");
            }
            catch (Exception ex)
@@ -640,6 +738,147 @@
        /// å°†ä»»åŠ¡çŠ¶æ€ä¿®æ”¹ä¸ºä¸‹ä¸€ä¸ªçŠ¶æ€
        /// </summary>
        /// <param name="taskNum">任务号</param>
        public WebResponseContent HandUpdateTaskStatusToNext(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                int oldState = task.TaskState;
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();

                    task.TaskState = nextStatus;

                    if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutFinish)
                    {
                        task.TaskState = (int)TaskOutStatusEnum.OutFinish;
                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";

                        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);

                        var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                        var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
                        var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
                        WMSTaskDTO taskDTO = new WMSTaskDTO()
                        {
                            TaskId = task.WMSTaskNum,
                            TPbarcode = task.PalletCode,
                            WhCode = "1001",
                            BeginPoint = task.SourceAddress,
                            EndPoint = task.TargetAddress,
                            Results = "1"
                        };
                        if (wmsBase == null || requestTask == null)
                        {
                            throw new InvalidOperationException("WMS IP æœªé…ç½®");
                        }
                        var wmsIpAddress = wmsBase + requestTask;
                        var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;


                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV出库完成");
                    }

                    if (task.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
                    {
                        Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.Roadway == task.Roadway && x.stationChildCode == task.NextAddress);
                        Dt_StationManager stationManagerend = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress);
                        task.CurrentAddress = task.NextAddress;
                        task.NextAddress = task.TargetAddress;
                        task.SourceStation = stationManager.stationRemark;
                        task.TargetStation = stationManagerend.remark;
                    }

                    if (task.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
                    {
                        content = StackCraneTaskCompleted(task.TaskNum);
                        return content;
                    }
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = nextStatus;

                    if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
                    {
                        task.CurrentAddress = task.NextAddress;
                        task.NextAddress = task.TargetAddress;
                    }
                    else if (task.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish)
                    {
                        return content.Error("请等待WMS下发入库任务");
                    }
                    else if (task.TaskState == (int)TaskInStatusEnum.RGV_InExecutingFinish)
                    {
                        Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.NextAddress && x.stationFloor == task.Floor);
                        task.CurrentAddress = task.NextAddress;
                        task.NextAddress = stationManager.stationNextChildCode;
                        task.ModifyDate = DateTime.Now;
                        BaseDal.UpdateData(task);
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV入库完成");
                    }
                    else if (task.TaskState == (int)TaskInStatusEnum.SC_InFinish)
                    {
                        if (App.User.UserId > 0)
                        {
                            content = StackCraneTaskCompleted(task.TaskNum);
                            return content;
                        }

                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";

                        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);
                    }
                    else if (task.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish || task.TaskState == (int)TaskInStatusEnum.RGV_InExecutingFinish)
                    {
                        RGVTaskCompleted(task.TaskNum);
                    }
                }
                else
                {
                    throw new Exception($"任务类型错误,未找到该任务类型,任务号:【{task.TaskNum}】,任务类型:【{task.TaskType}】");
                }

                if (task.TaskState <= 0)
                {
                    return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                }

                task.ModifyDate = DateTime.Now;
                task.Modifier = "System";
                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"人工手动将任务状态从【{oldState}】跳转到【{task.TaskState}】" : $"系统自动流程，任务状态从【{oldState}】转到【{task.TaskState}】");

                content = WebResponseContent.Instance.OK();

                return content;
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }

        /// <summary>
        /// å°†ä»»åŠ¡çŠ¶æ€ä¿®æ”¹ä¸ºä¸‹ä¸€ä¸ªçŠ¶æ€
        /// </summary>
        /// <param name="taskNum">任务号</param>
        public WebResponseContent UpdateTaskStatusToNext(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
@@ -675,14 +914,16 @@

                    if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutFinish)
                    {
                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";
                        //task.ModifyDate = DateTime.Now;
                        //task.Modifier = "System";

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

                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);
                        //BaseDal.DeleteData(task);
                        //_taskHtyRepository.AddData(task_Hty);

                        RGVTaskCompleted(task.TaskNum);
                    }
                    if (task.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
                    {
@@ -726,6 +967,10 @@

                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);
                    }
                    else if (task.TaskState == (int)TaskInStatusEnum.InFinish|| task.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish)
                    {
                        RGVTaskCompleted(task.TaskNum);
                    }
                }
                else
@@ -786,9 +1031,6 @@
                    var wmsIpAddress = wmsBase + requestTask;
                    var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;


                    

                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV调度完成等待WMS任务");
                }
                else if (task.TaskState == (int)TaskInStatusEnum.RGV_InExecuting)
@@ -806,7 +1048,7 @@
                    task.TaskState = (int)TaskOutStatusEnum.RGV_OutdispatchFinish;
                    task.ModifyDate = DateTime.Now;
                    BaseDal.UpdateData(task);

                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV出库调度");
                }
                else if (task.TaskState == (int)TaskInStatusEnum.InRetuen)
                {
@@ -828,7 +1070,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);

@@ -886,7 +1128,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, $"堆垛机出库完成");
@@ -951,7 +1193,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, $"堆垛机移库完成");
@@ -1011,6 +1253,128 @@
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "人工取消任务");
                }
                content = WebResponseContent.Instance.OK("取消任务成功");
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }

        public WebResponseContent TaskCancel(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return content.Error("未找到该任务信息");

                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {
                    task.TaskState = (int)TaskOutStatusEnum.OutCancel;
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                {
                    task.TaskState = (int)TaskInStatusEnum.InCancel;
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                {
                    task.TaskState = (int)TaskRelocationStatusEnum.RelocationCancel;
                }
                else
                {
                    return content.Error($"任务类型错误,未找到该任务类型,任务号:【{task.TaskNum}】,任务类型:【{task.TaskType}】");
                }
                task.ModifyDate = DateTime.Now;
                BaseDal.DeleteData(task);

                Dt_Task_Hty taskHty = _mapper.Map<Dt_Task_Hty>(task);
                taskHty.OperateType = (int)OperateTypeEnum.WCS人工取消;
                _taskHtyRepository.AddData(taskHty);

                #region ä¸ŠæŠ¥WMS执行结果
                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
                var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    TaskId = task.WMSTaskNum,
                    TPbarcode = task.PalletCode,
                    WhCode = "1001",
                    BeginPoint = task.SourceAddress,
                    EndPoint = task.TargetAddress,
                    Results = "3"
                };
                if (wmsBase == null || requestTask == null)
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddress = wmsBase + requestTask;
                var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
                #endregion

                content = WebResponseContent.Instance.OK("取消任务成功");
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }

        public WebResponseContent TaskComplete(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var task=BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return content.Error("未找到该任务信息");

                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {
                    task.TaskState = (int)TaskOutStatusEnum.OutHandFinish;
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                {
                    task.TaskState = (int)TaskInStatusEnum.InHandFinish;
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                {
                    task.TaskState = (int)TaskRelocationStatusEnum.RelocationHandFinish;
                }
                else
                {
                    return content.Error($"任务类型错误,未找到该任务类型,任务号:【{task.TaskNum}】,任务类型:【{task.TaskType}】");
                }
                task.ModifyDate = DateTime.Now;
                BaseDal.DeleteData(task);

                Dt_Task_Hty taskHty = _mapper.Map<Dt_Task_Hty>(task);
                taskHty.OperateType = (int)OperateTypeEnum.人工完成;
                _taskHtyRepository.AddData(taskHty);

                #region ä¸ŠæŠ¥WMS完成
                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
                var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    TaskId = task.WMSTaskNum,
                    TPbarcode = task.PalletCode,
                    WhCode = "1001",
                    BeginPoint = task.SourceAddress,
                    EndPoint = task.TargetAddress,
                    Results = "2"
                };
                if (wmsBase == null || requestTask == null)
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddress = wmsBase + requestTask;
                var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
                #endregion

                content = WebResponseContent.Instance.OK("手动完成成功");
            }
            catch (Exception ex)
            {
@@ -1167,65 +1531,6 @@
                ((SqlSugarClient)BaseDal.Db).RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public WebResponseContent TaskComplete()
        {
            WebResponseContent content = new WebResponseContent();
            //var result = _stationManagerRepository.Db.Queryable<Dt_StationManager>()
            //    .Where(t => SqlFunc.Abs(t.LevelPointFist - taskNum) <= 1000)
            //    .ToList();
            var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
            var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
            var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
            WMSTaskDTO taskDTO = new WMSTaskDTO()
            {
                TaskId="1",
                TPbarcode = "123456",
                WhCode = "1001",
                BeginPoint = "1013",
                EndPoint="1-1-1",
                Results="1"
            };
            if (wmsBase == null || requestTask == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + requestTask;
            var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;

            return content.OK(data: result);
        }

        public WebResponseContent RequestTask()
        {
            WebResponseContent content = new WebResponseContent();
            //var result = _stationManagerRepository.Db.Queryable<Dt_StationManager>()
            //    .Where(t => SqlFunc.Abs(t.LevelPointFist - taskNum) <= 1000)
            //    .ToList();
            var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
            var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
            var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestTask)?.ConfigValue;
            //var keys = new Dictionary<string, object>()
            //{
            //    {"TPbarcode", "123456"},
            //    {"WhCode", "1001"},
            //    {"BeginPoint", "1013"}
            //};

            WMSTaskDTO taskDTO = new WMSTaskDTO()
            {
                TPbarcode = "123456",
                WhCode = "1001",
                BeginPoint = "1013"
            };
            if (wmsBase == null || requestTask == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddress = wmsBase + requestTask;
            var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;

            return content.OK(data: result);
        }
    }
}