合并

刘磊

8 天以前 2de09bec5cc05bf875543fa8956167ca7db73021

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

@@ -74,6 +74,66 @@
            }
        }

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€èµ·å§‹åœ°å€å‘WMS请求任务（入库版本)
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        public Dt_Task? InBeforeCheck(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                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.InTransferCheck)?.ConfigValue;
                if (wmsBase == null || requestTask == null)
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddrss = wmsBase + requestTask;

                var result = HttpHelper.Post(wmsIpAddrss, new { taskNum = taskNum }.ToJsonString());
                content = JsonConvert.DeserializeObject<WebResponseContent>(result);

                if (!content.Status)
                {
                    // wms失败
                    throw new Exception();
                }


                //todo ä¼˜åŒ– å¦‚未查询到任务则处理
                //if (content.Data != null)
                //{
                var task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());

                Dt_Task? Relocationtask = null;
                if (task.TaskNum != taskNum)
                {

                    BaseDal.AddData(task);
                    Relocationtask = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum);
                }
                //}

                if (Relocationtask != null)
                {
                    return task;
                }
                else
                {
                    return null;
                }

            }
            catch (Exception ex)
            {
                throw new Exception($"请求异常：{ex.Message}");
            }
        }

        #region æ ¹æ®æ‰˜ç›˜å·ã€ç«™å°å‘WMS请求任务
        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€ç«™å°å‘WMS请求任务
@@ -213,7 +273,13 @@
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {
                    var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationLocation == taskDTO.TargetAddress && x.Roadway == taskDTO.RoadWay);

                    task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    if (task.SourceAddress == "2009")
                    {
                        task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
                    }
                    
                    task.CurrentAddress = taskDTO.RoadWay;
                    task.NextAddress = stationinfo.stationChildCode;
                    task.SourceAddress = taskDTO.SourceAddress;