ZhongRui/ALDbanyunxiangmu.git

			@@ -12,6 +12,7 @@
			using System.Threading.Tasks;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_DTO.Allocate;
			using WIDESEA_DTO.Basic;
			using WIDESEA_DTO.Inbound;
			using WIDESEA_DTO.Outbound;
			@@ -41,6 +42,12 @@
			_inboundOrderRepository = inboundOrderRepository;
			}

			/// <summary>
			/// 鍏ュ簱鍙嶉
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			/// <exception cref="HttpRequestException"></exception>
			public async Task<ResponseModel> FeedbackInbound(FeedbackInboundRequestModel model)
			{
			string json =JsonConvert.SerializeObject(model, new JsonSerializerSettings
			@@ -64,6 +71,12 @@
			return JsonConvert.DeserializeObject<ResponseModel>(body);
			}

			/// <summary>
			/// 鍑哄簱鍙嶉
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			/// <exception cref="HttpRequestException"></exception>
			public async Task<ResponseModel> FeedbackOutbound(FeedbackOutboundRequestModel model)
			{
			string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
			@@ -86,6 +99,29 @@
			throw new HttpRequestException(body);
			}


			return JsonConvert.DeserializeObject<ResponseModel>(body);
			}

			public async Task<ResponseModel> FeedbackAllocate(AllocateDto model)
			{
			string json = JsonConvert.SerializeObject(model, new JsonSerializerSettings
			{
			ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
			});
			var content = new StringContent(json, Encoding.UTF8, "application/json");
			var _client = _httpClientFactory.CreateClient("MESUrl");
			_client.DefaultRequestHeaders.Clear();
			_client.DefaultRequestHeaders.Add("Accept", "application/json");
			_logger.LogInformation("InvokeMESService FeedbackAllocate : " + json);
			var response = await _client.PostAsync("AldAllocationOperation/AllocationOperation", content);
			string body = await response.Content.ReadAsStringAsync();
			_logger.LogInformation("InvokeMESService FeedbackAllocate body: " + body);
			if (!response.IsSuccessStatusCode)
			{

			throw new HttpRequestException(body);
			}

			return JsonConvert.DeserializeObject<ResponseModel>(body);
			}
			@@ -116,10 +152,11 @@

			var content = new StringContent(json, Encoding.UTF8, "application/json");

			_logger.LogInformation("InvokeMESService FeedbackInbound : " + json);
			_logger.LogInformation("InvokeMESService NewMaterielToMes : " + json);

			using var response = await client.PostAsync("AldBarcodeInformation/BarcodeInformation", content);
			var responseText = await response.Content.ReadAsStringAsync();
			_logger.LogInformation("InvokeMESService NewMaterielToMes body: " + responseText);
			if (!response.IsSuccessStatusCode)
			{
			throw new HttpRequestException(responseText);