HuaYiZhongHeng/BaiBuLiKu.git

			@@ -93,7 +93,6 @@

			var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = palletCode, EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode }.ToJsonString());
			content = JsonConvert.DeserializeObject<WebResponseContent>(result);

			if (!content.Status)
			{
			// wms失败返回去NG口任务
			@@ -103,6 +102,7 @@
			}

			var task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
			ConsoleHelper.WriteSuccessLine(content.Data.ToString());
			return ReceiveByWMSTask(task);
			}
			catch (Exception ex)
			@@ -146,6 +146,53 @@
			task.NextAddress = stationinfo.stationChildCode;
			task.TargetAddress = taskDTO.TargetAddress;
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			{
			task.TaskState = (int)TaskStatus.Created;
			task.SourceAddress = taskDTO.SourceAddress;
			task.CurrentAddress = taskDTO.SourceAddress;
			task.NextAddress = taskDTO.TargetAddress;
			task.TargetAddress = taskDTO.TargetAddress;
			}

			BaseDal.AddData(task);

			_taskExecuteDetailService.AddTaskExecuteDetail(task.WMSId, "接收WMS任务");

			content = WebResponseContent.Instance.OK("成功");
			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error($"任务接收错误,错误信息:{ex.Message}");
			}
			return content;
			}

			/// <summary>
			/// 高温出库
			/// </summary>
			/// <param name="taskDTO"></param>
			/// <returns></returns>
			public WebResponseContent ReceiveByWMSGWTask([NotNull] WMSTaskDTO taskDTO)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			if (BaseDal.QueryFirst(x => x.TaskNum == taskDTO.TaskNum \|\| x.PalletCode == taskDTO.PalletCode) != null)
			{
			return content.OK();
			}
			Dt_Task task = _mapper.Map<Dt_Task>(taskDTO);
			task.Creater = "WMS";

			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			task.TaskState = (int)TaskOutStatusEnum.OutNew;
			task.CurrentAddress = taskDTO.RoadWay;
			task.NextAddress = "002-000-002";
			task.SourceAddress = taskDTO.SourceAddress;
			task.TargetAddress = taskDTO.TargetAddress;
			}
			BaseDal.AddData(task);

			_taskExecuteDetailService.AddTaskExecuteDetail(task.WMSId, "接收WMS任务");