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
			{
			@@ -65,10 +66,10 @@
			// ååºåå
			var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);

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

			@@ -76,8 +77,10 @@
			{
			return responseContent.OK("æ æ°å¥åºåæ°æ®");
			}
			var ordernos = response.data.Select(x => x.order_no).ToList();
			// è·åææå·²åå¨çå¥åºåå·
			var existingOrderNos = _cabinOrderServices.Db.Queryable<Dt_CabinOrder>()
			.Where(x => ordernos.Contains(x.Order_no))
			.Select(x => x.Order_no)
			.Distinct().ToList();

			@@ -86,7 +89,7 @@
			.Where(order => !existingOrderNos.Contains(order.order_no))
			.ToList();

			if (!newOrders.Any())
			if (newOrders.Count < 1)
			{
			return responseContent.OK("ææå¥åºåå·²åå¨ï¼æ éæ°å¢");
			}
			@@ -151,8 +154,8 @@
			{
			_unitOfWorkManage.RollbackTran();
			_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
			SendErrorToUpstream(1, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			//SendErrorToUpstream(1, "", ex.Message, "");
			//return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			};
			return responseContent.OK("åæ¥å¥åºåæå");
			@@ -161,7 +164,7 @@
			catch (Exception ex)
			{
			// å¨å±å¼å¸¸æ¶ï¼ä¹æ¨éå¼å¸¸ç»ä¸æ¸¸
			SendErrorToUpstream(1, "", ex.Message, "");
			//SendErrorToUpstream(1, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			@@ -174,8 +177,8 @@
			var responseContent = new WebResponseContent();
			try
			{
			//var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
			var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
			var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
			//var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
			if (string.IsNullOrEmpty(SearchOutDate)) SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			//// è¯·æ±åæ°
			var requestData = new
			@@ -190,7 +193,7 @@

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

			@@ -198,9 +201,10 @@
			{
			return responseContent.OK("æ æ°åºåºåæ°æ®");
			}

			var ordernos = response.data.Select(x => x.order_no).ToList();
			// å·²åå¨åºåºåå·
			var existingOutOrderNos = _deliveryOrderServices.Db.Queryable<Dt_DeliveryOrder>()
			.Where(x => ordernos.Contains(x.Out_no))
			.Select(x => x.Out_no)
			.Distinct().ToList();

			@@ -211,7 +215,7 @@

			List<string> order_no = newOutOrders.Select(x => x.order_no).ToList();

			if (!newOutOrders.Any())
			if (newOutOrders.Count < 1)
			{
			return responseContent.OK("ææåºåºåå·²åå¨ï¼æ éæ°å¢");
			}
			@@ -278,15 +282,15 @@
			{
			_unitOfWorkManage.RollbackTran();
			_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
			SendErrorToUpstream(3, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			//SendErrorToUpstream(3, "", ex.Message, "");
			//return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			return responseContent.OK($"åæ¥åºåºåæåï¼å±{_DeliveryOrders.Count}æ¡");
			}
			catch (Exception ex)
			{
			SendErrorToUpstream(3, "", ex.Message, "");
			//SendErrorToUpstream(3, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			@@ -391,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 = "è®¢åæ¨éå¤±è´¥" };
			}
			@@ -480,8 +484,8 @@
			};

			// 4. è°ç¨æ¥å£
			//var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
			var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
			var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
			//var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";

			var result = HttpHelper.Post(url, ediDto.ToJsonString());
			var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
			@@ -503,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}");
			}
			}
			@@ -536,39 +540,61 @@
			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();
			foreach (var item in Orders)
			if (Orders.FirstOrDefault().Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
			{
			if (item.Details != null)
			_cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			}
			_cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			// è°ç¨ä¸æ¸¸æ¥å£
			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")
			{
			// æäº¤äºå¡
			_unitOfWorkManage.CommitTran();
			foreach (var item in Orders)
			{
			if (item.Details != null)
			_cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			}
			_cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			}
			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)
			@@ -590,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)