ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -15,6 +15,7 @@
			using WIDESEA_DTO.SquareCabin;
			using WIDESEA_Common;
			using System.Xml.Linq;
			using WIDESEA_Common.OrderEnum;

			namespace WIDESEA_WMSServer
			{
			@@ -68,7 +69,7 @@
			if (response == null \|\| response.resultCode != "0" \|\| requestData == null)
			{
			// è°ç¨å¼å¸¸æ¥å£
			SendErrorToUpstream(1, "", response.resultMsg ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥", "");
			//SendErrorToUpstream(1, "", response.resultMsg ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥", "");
			return responseContent.Error(response.resultMsg ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥");
			}

			@@ -153,7 +154,7 @@
			{
			_unitOfWorkManage.RollbackTran();
			_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
			SendErrorToUpstream(1, "", ex.Message, "");
			//SendErrorToUpstream(1, "", ex.Message, "");
			//return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			};
			@@ -163,7 +164,7 @@
			catch (Exception ex)
			{
			// å¨å±å¼å¸¸æ¶ï¼ä¹æ¨éå¼å¸¸ç»ä¸æ¸¸
			SendErrorToUpstream(1, "", ex.Message, "");
			//SendErrorToUpstream(1, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			@@ -192,7 +193,7 @@

			if (response.resultCode != "0")
			{
			SendErrorToUpstream(3, "", response.resultMsg ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥", "");
			//SendErrorToUpstream(3, "", response.resultMsg ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥", "");
			return responseContent.Error(response.resultMsg ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥");
			}

			@@ -281,7 +282,7 @@
			{
			_unitOfWorkManage.RollbackTran();
			_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
			SendErrorToUpstream(3, "", ex.Message, "");
			//SendErrorToUpstream(3, "", ex.Message, "");
			//return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			@@ -289,7 +290,7 @@
			}
			catch (Exception ex)
			{
			SendErrorToUpstream(3, "", ex.Message, "");
			//SendErrorToUpstream(3, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			@@ -394,7 +395,7 @@
			}
			else
			{
			SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS æ¨éå¤±è´¥", "");
			//SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS æ¨éå¤±è´¥", "");
			Console.WriteLine($"è®¢å {order.Order_no} æ¨éå¤±è´¥ï¼{resp?.msg}");
			return new WebResponseContent { Status = false, Message = "è®¢åæ¨éå¤±è´¥" };
			}
			@@ -506,14 +507,14 @@
			}
			else
			{
			SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS æ¨éå¤±è´¥", "");
			//SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS æ¨éå¤±è´¥", "");
			Console.WriteLine($"è®¢å {order.Out_no} æ¨éå¤±è´¥ï¼{resp?.msg}");
			}
			//å é¤å¨é¨ç¶ä¸ºå·²å®æçæç»åè¡¨å¤´ï¼ç§»å¥åå²è¡¨
			}
			catch (Exception ex)
			{
			SendErrorToUpstream(3, order.Out_no, ex.Message, "");
			//SendErrorToUpstream(3, order.Out_no, ex.Message, "");
			Console.WriteLine($"è®¢å {order.Out_no} æ¨éå¼å¸¸ï¼{ex.Message}");
			}
			}
			@@ -539,20 +540,16 @@
			var responseContent = new WebResponseContent();
			try
			{
			_unitOfWorkManage.BeginTran();
			#region æ¥æ¾ææå·²å®æå¥åºå
			var inorders = _cabinOrderServices.Repository.QueryData(x => x.OdrderStatus == "å·²å®æ").Select(x => x.Order_no).Distinct().ToList();
			foreach (var inorder in inorders)
			{
			//var Orders = BaseDal.QueryData(x => x.Order_no == inorder);
			var Orders = _cabinOrderServices.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == inorder).Includes(x => x.Details).ToList();

			if (!Orders.Where(x => x.OdrderStatus != "å·²å®æ").Any())
			{
			_unitOfWorkManage.BeginTran();
			// è°ç¨ä¸æ¸¸æ¥å£
			var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
			var result = HttpHelper.Post(url, new { order_no = inorder }.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
			if (response.resultCode == "0")
			if (Orders.FirstOrDefault().Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
			{
			foreach (var item in Orders)
			{
			@@ -561,17 +558,43 @@
			item.Details = null;
			}
			_cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			// æäº¤äºå¡
			_unitOfWorkManage.CommitTran();
			}
			else
			{
			_unitOfWorkManage.RollbackTran();
			SendErrorToUpstream(2, "", $"ä¸æ¸¸æ¥å£è¿åå¤±è´¥: {response.resultMsg}", inorder);
			// è°ç¨ä¸æ¸¸æ¥å£
			var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";



			var result = HttpHelper.Post(url, new { order_no = inorder }.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
			if (response.resultCode == "0")
			{
			foreach (var item in Orders)
			{
			if (item.Details != null)
			_cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			}
			_cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			// æäº¤äºå¡
			}
			else
			{
			string mess = "ä¸æ¥ERPæ ååº";
			if (response != null) mess = response.resultMsg;
			_messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, $"å¥åºåå·ã{inorder}ãå®æä¸æ¥ERPå¤±è´¥", mess);
			//_unitOfWorkManage.RollbackTran();
			//SendErrorToUpstream(2, "", $"ä¸æ¸¸æ¥å£è¿åå¤±è´¥: {response.resultMsg}", inorder);
			continue;
			}
			}


			}
			}
			#endregion
			_unitOfWorkManage.CommitTran();
			return responseContent.OK();
			}
			catch (Exception ex)
			@@ -593,38 +616,58 @@
			var responseContent = new WebResponseContent();
			try
			{
			_unitOfWorkManage.BeginTran();
			#region æ¥æ¾ææå·²å®æåºåºå
			var outorders = _deliveryOrderServices.Repository.QueryData(x => x.OutStatus == "å·²å®æ").Select(x => x.Out_no).Distinct().ToList();
			foreach (var outorder in outorders)
			{
			var Orders = _deliveryOrderServices.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == outorder).Includes(x => x.Details).ToList();

			if (!Orders.Where(x => x.OutStatus != "å·²å®æ").Any())
			{
			_unitOfWorkManage.BeginTran();
			foreach (var item in Orders)
			if (Orders.FirstOrDefault().Out_type == OutOrderTypeEnum.Allocate.ObjToInt().ToString())
			{
			if (item.Details != null)
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			foreach (var item in Orders)
			{
			if (item.Details != null)
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			}
			_deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			}
			_deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
			var requestDate = new
			{
			order_no = outorder
			};
			var result = HttpHelper.Post(url, requestDate.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
			if (response.resultCode == "0") _unitOfWorkManage.CommitTran();
			else
			{
			_unitOfWorkManage.RollbackTran();
			SendErrorToUpstream(4, "", $"ä¸æ¸¸æ¥å£è¿åå¤±è´¥: {response.resultMsg}", outorder);
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
			var requestDate = new
			{
			order_no = outorder
			};
			var result = HttpHelper.Post(url, requestDate.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
			if (response != null && response.resultCode == "0")
			{
			foreach (var item in Orders)
			{
			if (item.Details != null)
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			}
			_deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			}
			else
			{
			string mess = "ä¸æ¥ERPæ ååº";
			if (response != null) mess = response.resultMsg;
			_messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, $"åºåºåå·ã{outorder}ãå®æä¸æ¥ERPå¤±è´¥", mess);
			//_unitOfWorkManage.RollbackTran();
			//SendErrorToUpstream(4, "", $"ä¸æ¸¸æ¥å£è¿åå¤±è´¥: {response.resultMsg}", outorder);
			continue;
			}
			}
			}
			}
			#endregion

			_unitOfWorkManage.CommitTran();
			return responseContent.OK();
			}
			catch (Exception ex)