ZhongRui/ALDbanyunxiangmu.git

			@@ -1,15 +1,18 @@
			ï»¿using System;
			ï»¿using Newtonsoft.Json;
			using Newtonsoft.Json.Serialization;
			using Org.BouncyCastle.Asn1.Ocsp;
			using SqlSugar;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Text;
			using System.Threading.Tasks;
			using Newtonsoft.Json;
			using SqlSugar;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Helper;
			using WIDESEA_Core.HttpContextUser;
			using WIDESEA_Core.LogHelper;
			using WIDESEA_Core.Util;
			using WIDESEA_DTO.Base;
			using WIDESEA_DTO.ReturnMES;
			@@ -40,13 +43,46 @@

			public WebResponseContent OutboundFeedback(string orderNo)
			{
			WebResponseContent webResponse = new WebResponseContent();
			try
			{
			Dt_OutboundOrder outboundOrder = _outboundOrderRepository.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == orderNo).Includes(x => x.Details).First();
			if (outboundOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçåºåºåä¿¡æ¯");
			return webResponse = WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçåºåºåä¿¡æ¯");
			}

			List<Dt_MesReturnRecord> returnRecords = BaseDal.QueryData(x => x.OrderNo == orderNo && x.OrderId == outboundOrder.Id && x.ReturnStatus == 2);

			foreach (var item in returnRecords)
			{
			HttpResponseResult<MesResponseDTO> httpResponse = _httpClientHelper.Post<MesResponseDTO>(item.ApiUrl, item.RequestData);

			string rMsg = "æå";
			bool success = httpResponse.IsSuccess && httpResponse.Data.Code == "200";
			if (!success)
			{
			if (!httpResponse.IsSuccess)
			{
			rMsg = $"MESæ¥å£è¿åéè¯¯ï¼HTTPä»£ç ï¼{httpResponse.StatusCode}ï¼ä¿¡æ¯ï¼{httpResponse.ErrorMessage}";
			}
			else if (httpResponse?.Data?.Code != "200")
			{
			rMsg = $"è°ç¨MESæ¥å£å¤±è´¥ï¼ä»£ç ï¼{httpResponse?.Data?.Code}ï¼ä¿¡æ¯ï¼{httpResponse?.Data?.Message}";
			}
			}

			item.ReturnCount += 1;

			item.ReturnStatus = success ? 1 : 2;
			item.HttpStatusCode = httpResponse.StatusCode.ObjToInt();
			item.LastReturnTime = DateTime.Now;
			item.ResponseData = httpResponse.Content;
			item.SuccessTime = success ? DateTime.Now : null;
			}

			BaseDal.UpdateData(returnRecords);

			HttpResponseResult<MesResponseDTO> httpResponseResult = new HttpResponseResult<MesResponseDTO>();
			string reqCode = Guid.NewGuid().ToString();
			string reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			@@ -57,12 +93,22 @@
			MaterialOutboundReturnDTO? returnDTO = BuildOutboundFeedbackData(outboundOrder);
			if (returnDTO == null)
			{
			return WebResponseContent.Instance.Error($"æå»ºåè°å¯¹è±¡å¤±è´¥");
			return webResponse = WebResponseContent.Instance.Error($"æå»ºåè°å¯¹è±¡å¤±è´¥");
			}
			string apiUrl = "";

			if (returnDTO.Details.Count <= 0)
			{
			return webResponse = WebResponseContent.Instance.Error($"è¯¥åæ®æ æç»å¯åä¼ ");
			}

			string apiUrl = AppSettings.GetValue("MaterialOutboundFeedbackUrl");
			returnDTO.ReqCode = reqCode;
			returnDTO.ReqTime = reqTime;
			requestData = returnDTO.Serialize();
			JsonSerializerSettings settings = new JsonSerializerSettings
			{
			ContractResolver = new CamelCasePropertyNamesContractResolver()
			};
			requestData = JsonConvert.SerializeObject(returnDTO, settings);
			lineNos = returnDTO.Details.Select(x => x.LineNo).ToList();
			httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, requestData);
			httpResponseResult.ApiUrl = apiUrl;
			@@ -72,23 +118,36 @@
			Dt_AllocateOrder allocateOrder = _allocateRepository.QueryFirst(x => x.OrderNo == outboundOrder.OrderNo);
			if (allocateOrder == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçè°æ¨å");
			return webResponse = WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçè°æ¨å");
			}

			AllocationReturnDTO? returnDTO = BuildAllocationFeedbackData(outboundOrder, allocateOrder.FromWarehouse, allocateOrder.ToWarehouse);
			if (returnDTO == null)
			{
			return WebResponseContent.Instance.Error($"æå»ºåè°å¯¹è±¡å¤±è´¥");
			return webResponse = WebResponseContent.Instance.Error($"æå»ºåè°å¯¹è±¡å¤±è´¥");
			}
			string apiUrl = "";

			if (returnDTO.Details.Count <= 0)
			{
			return webResponse = WebResponseContent.Instance.Error($"è¯¥åæ®æ æç»å¯åä¼ ");
			}

			string apiUrl = AppSettings.GetValue("AllocationFeedbackUrl"); ;
			returnDTO.ReqCode = reqCode;
			returnDTO.ReqTime = reqTime;
			requestData = returnDTO.Serialize();
			JsonSerializerSettings settings = new JsonSerializerSettings
			{
			ContractResolver = new CamelCasePropertyNamesContractResolver()
			};
			requestData = JsonConvert.SerializeObject(returnDTO, settings);
			lineNos = returnDTO.Details.Select(x => x.LineNo).ToList();
			httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, requestData);
			httpResponseResult.ApiUrl = apiUrl;

			Logger.Add(requestData, httpResponseResult.Serialize());
			}

			bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data != null && httpResponseResult.Data.Code == "200";
			bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data.Code == "200";
			string message = "æå";
			if (!isSuccess)
			{
			@@ -96,16 +155,16 @@
			{
			message = $"MESæ¥å£è¿åéè¯¯ï¼HTTPä»£ç ï¼{httpResponseResult.StatusCode}ï¼ä¿¡æ¯ï¼{httpResponseResult.ErrorMessage}";
			}
			else if (httpResponseResult.Data.Code != "200")
			else if (httpResponseResult?.Data?.Code != "200")
			{
			message = $"è°ç¨MESæ¥å£å¤±è´¥ï¼ä»£ç ï¼{httpResponseResult.Data.Code}ï¼ä¿¡æ¯ï¼{httpResponseResult.Data.Message}";
			message = $"è°ç¨MESæ¥å£å¤±è´¥ï¼ä»£ç ï¼{httpResponseResult?.Data?.Code}ï¼ä¿¡æ¯ï¼{httpResponseResult?.Data?.Message}";
			}
			}

			Dt_MesReturnRecord mesReturnRecord = new Dt_MesReturnRecord()
			{
			ApiUrl = httpResponseResult.ApiUrl,
			InterfaceType = 1,
			InterfaceType = outboundOrder.OrderType == 0 ? 1 : 3,
			OrderId = outboundOrder.Id,
			OrderNo = outboundOrder.OrderNo,
			RequestCode = reqCode,
			@@ -116,43 +175,58 @@
			ResponseData = httpResponseResult.Content,
			ReturnType = 0,
			ReturnCount = 1,
			ReturnStatus = httpResponseResult.IsSuccess ? 1 : 2,
			SuccessTime = httpResponseResult.IsSuccess ? DateTime.Now : null
			ReturnStatus = isSuccess ? 1 : 2,
			SuccessTime = isSuccess ? DateTime.Now : null
			};

			_unitOfWorkManage.BeginTran();
			_unitOfWorkManage.Db.Insertable(mesReturnRecord).ExecuteCommand();

			if (isSuccess)
			List<Dt_OutboundOrderDetail> outboundOrderDetails = outboundOrder.Details.Where(x => lineNos.Contains(x.lineNo)).ToList();
			outboundOrderDetails.ForEach(x =>
			{
			List<Dt_OutboundOrderDetail> outboundOrderDetails = outboundOrder.Details.Where(x => lineNos.Contains(x.lineNo)).ToList();
			outboundOrderDetails.ForEach(x =>
			if (x.OverOutQuantity == x.OrderQuantity - x.MoveQty)
			{
			if (x.OverOutQuantity == x.OrderQuantity - x.MoveQty)
			{
			x.ReturnToMESStatus = isSuccess ? 1 : 2;
			}
			else
			{
			x.ReturnToMESStatus = isSuccess ? 3 : 4;
			}
			x.CurrentDeliveryQty = 0;
			x.ReturnJsonData = "";
			});
			x.ReturnToMESStatus = isSuccess ? 1 : 2;
			}
			else
			{
			x.ReturnToMESStatus = isSuccess ? 3 : 4;
			}
			x.CurrentDeliveryQty = 0;
			x.ReturnJsonData = "";
			});

			_outboundOrderRepository.Db.Updateable(outboundOrderDetails).ExecuteCommand();
			mesReturnRecord.ReturnType = outboundOrder.Details.Count == outboundOrderDetails.Count ? 1 : 2;

			if (outboundOrder.Details.Count == outboundOrderDetails.Count && outboundOrderDetails.All(x => x.ReturnToMESStatus == 1 \|\| x.ReturnToMESStatus == 2))
			{
			outboundOrder.ReturnToMESStatus = isSuccess ? 1 : 2;
			}
			else
			{
			outboundOrder.ReturnToMESStatus = isSuccess ? 3 : 4;
			}

			_unitOfWorkManage.CommitTran();
			_outboundOrderRepository.Db.Updateable(outboundOrderDetails).ExecuteCommand();
			_outboundOrderRepository.UpdateData(outboundOrder);

			WebResponseContent responseContent = new WebResponseContent();
			responseContent.Status = isSuccess;
			responseContent.Message = message;
			return responseContent;
			_unitOfWorkManage.CommitTran();
			int successCount = returnRecords.Where(x => x.ReturnStatus == 1).Count() + (isSuccess ? 1 : 0);
			int failCount = returnRecords.Where(x => x.ReturnStatus == 2).Count() + (isSuccess ? 1 : 0);

			webResponse.Status = true;
			webResponse.Message = $"åè°æåæ¡æ°ï¼{successCount}ï¼åè°å¤±è´¥æ¡æ°ï¼{failCount}";

			return webResponse;
			}
			catch (Exception ex)
			{
			return WebResponseContent.Instance.Error(ex.Message);
			return webResponse = WebResponseContent.Instance.Error(ex.Message);
			}
			finally
			{
			Logger.Add(orderNo, webResponse.Serialize());
			}
			}

			@@ -191,9 +265,10 @@
			Details = returnDetails,
			FactoryArea = outboundOrder.FactoryArea,
			OperationType = 1,
			OrderNo = outboundOrder.OrderNo,
			OrderNo = outboundOrder.UpperOrderNo,
			FromWarehouse = fromWarehouse,
			ToWarehouse = toWarehouse
			ToWarehouse = toWarehouse,
			Operator = App.User.UserName
			};

			return outboundReturnDTO;
			@@ -314,11 +389,11 @@
			{
			Business_type = outboundOrder.BusinessType,
			Details = returnDetails,
			DocumentsNO = "",
			DocumentsNO = _basicService.CreateCodeByRule("OutboundOrderRule"),
			FactoryArea = outboundOrder.FactoryArea,
			OperationType = 1,
			Operator = App.User.UserName,
			OrderNo = outboundOrder.OrderNo,
			OrderNo = outboundOrder.UpperOrderNo,
			Status = 1
			};

			@@ -341,7 +416,7 @@
			return WebResponseContent.Instance.Error($"æªæ¾å°ç©ææ¡ç ä¿¡æ¯{newBarcode}");
			}

			string apiUrl = "";
			string apiUrl = AppSettings.GetValue("BarcodeFeedbackUrl");

			BarcodeReturnDTO returnDTO = new BarcodeReturnDTO()
			{
			@@ -355,17 +430,22 @@
			Qty = materialCodeInfo.AfterQuantity,
			SupplyCode = materialCodeInfo.SuplierCode,
			Unit = materialCodeInfo.Unit,
			WarehouseCode = materialCodeInfo.WarehouseCode
			WarehouseCode = materialCodeInfo.WarehouseCode,
			OldQty = materialCodeInfo.OriginalQuantity
			};

			string reqCode = Guid.NewGuid().ToString();
			string reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			string requestData = returnDTO.Serialize();
			JsonSerializerSettings settings = new JsonSerializerSettings
			{
			ContractResolver = new CamelCasePropertyNamesContractResolver()
			};

			string requestData = JsonConvert.SerializeObject(returnDTO, settings);
			HttpResponseResult<MesResponseDTO> httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, requestData);
			httpResponseResult.ApiUrl = apiUrl;

			bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data != null && httpResponseResult.Data.Code == "200";
			bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data.Code == "200";
			string message = "æå";
			if (!isSuccess)
			{