ZhongRui/ALDbanyunxiangmu.git

			@@ -361,7 +361,9 @@
			allocatefeedmodel.Details = groupedData;

			var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (feedbackresult != null && feedbackresult.code == 200)

			var response = responseModel(inboundOrder, 3, "http://127.0.0.1:450/api/AldAllocationOperation/AllocationOperation", null, allocatefeedmodel);
			if (response != null && response.IsSuccess)
			{
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			@@ -466,7 +468,7 @@

			//var feedbackresult = await _invokeMESService.FeedbackInbound(feedmodel);

			var response= responseModel(feedmodel, inboundOrder);
			var response= responseModel(inboundOrder,2, "http://127.0.0.1:450/api/AldMaterialWarehousing/MaterialWarehousing", feedmodel);

			if (response != null && response.IsSuccess)
			{
			@@ -495,15 +497,23 @@
			return WebResponseContent.Instance.OK();
			}

			public HttpResponseResult<MesResponseDTO> responseModel(FeedbackInboundRequestModel model,Dt_InboundOrder order)
			public HttpResponseResult<MesResponseDTO> responseModel(Dt_InboundOrder order, int InterfaceType, string url, FeedbackInboundRequestModel model = null, AllocateDto allocateDto = null)
			{
			HttpResponseResult<MesResponseDTO> httpResponseResult = new HttpResponseResult<MesResponseDTO>();
			string reqCode = Guid.NewGuid().ToString();
			string reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			string requestData = string.Empty;
			//string apiUrl = AppSettings.GetValue("AllocationFeedbackUrl");
			string apiUrl = "http://127.0.0.1:450/api/AldMaterialWarehousing/MaterialWarehousing";
			httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, model.Serialize());
			//string apiUrl = "http://127.0.0.1:450/api/AldMaterialWarehousing/MaterialWarehousing";
			string apiUrl = url;
			if (model != null)
			{
			httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, model.Serialize());
			}
			else
			{
			httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, allocateDto.Serialize());
			}
			httpResponseResult.ApiUrl = apiUrl;
			bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data.Code == "200";
			string message = "鎴愬姛";
			@@ -521,7 +531,7 @@
			Dt_MesReturnRecord mesReturnRecord = new Dt_MesReturnRecord()
			{
			ApiUrl = httpResponseResult.ApiUrl,
			InterfaceType = 2,
			InterfaceType = InterfaceType,
			OrderId = order.Id,
			OrderNo = order.InboundOrderNo,
			RequestCode = reqCode,
			@@ -536,7 +546,7 @@
			SuccessTime = httpResponseResult.IsSuccess ? DateTime.Now : null
			};
			_unitOfWorkManage.Db.Insertable(mesReturnRecord).ExecuteCommand();


			return httpResponseResult;
			}