ZhiHuiQiCe/FangCangZhiNeng.git

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

			namespace WIDESEA_WMSServer
			{
			@@ -36,7 +38,7 @@
			_messageInfoService = messageInfoService;
			}
			#region è·åERPå¥åºå
			static string SearchInDate = "2025-09-10 00:00:00";
			static string SearchInDate = "2025-10-30 00:00:00";
			/// <summary>
			/// è·åä¸æ¸¸ç³»ç»çå¥åºå
			/// </summary>
			@@ -58,17 +60,17 @@
			searchDate = SearchInDate
			//searchDate = "2022-10-10 20:45:16" // æ£ç¡®çæ ¼å¼
			};
			SearchInDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
			SearchInDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			// åèµ·è¯·æ±
			var result = HttpHelper.Post(url, requestData.ToJsonString());

			// ååºåå
			var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);

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

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

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

			if (!newOrders.Any())
			if (newOrders.Count < 1)
			{
			return responseContent.OK("ææå¥åºåå·²åå¨ï¼æ éæ°å¢");
			}
			@@ -100,7 +104,6 @@
			{
			try
			{
			_unitOfWorkManage.BeginTran();
			if (order.order_type == "1") //æ£å¸¸å¥åº
			{
			name = "åå»ºæ£å¸¸å¥åºå";
			@@ -108,7 +111,7 @@
			if (!responseContent.Status) throw new Exception(responseContent.Message);
			List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
			if (dt_CabinOrders != null)
			_cabinOrderServices.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			_cabinOrderServices.Db.CopyNew().InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			}
			else if (order.order_type == "3")//å¥åºéæ
			{
			@@ -145,14 +148,12 @@
			var content = _cabinOrderServices.CreateCheckInOrder(order);
			if (!content.Status) throw new Exception(content.Message);
			}
			_unitOfWorkManage.CommitTran();
			}
			catch (Exception ex)
			{
			_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,21 +162,21 @@
			catch (Exception ex)
			{
			// å¨å±å¼å¸¸æ¶ï¼ä¹æ¨éå¼å¸¸ç»ä¸æ¸¸
			SendErrorToUpstream(1, "", ex.Message, "");
			//SendErrorToUpstream(1, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			#endregion

			#region è·åERPåºåºå
			static string SearchOutDate = "2025-09-10 00:00:00";
			static string SearchOutDate = "2025-10-30 00:00:00";
			public WebResponseContent GetUpstreamOutOrder()
			{
			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
			@@ -183,24 +184,25 @@
			searchDate = SearchOutDate
			//searchDate = "2022-10-10 20:45:16" // æ£ç¡®çæ ¼å¼
			};
			SearchOutDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
			SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

			var result = HttpHelper.Post(url, requestData.ToJsonString());
			var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);

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

			if (response.data == null \|\| !response.data.Any())
			{
			return responseContent.OK("æ æ°åºåºåæ°æ®");
			}

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

			@@ -211,7 +213,7 @@

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

			if (!newOutOrders.Any())
			if (newOutOrders.Count < 1)
			{
			return responseContent.OK("ææåºåºåå·²åå¨ï¼æ éæ°å¢");
			}
			@@ -225,7 +227,6 @@
			{
			try
			{
			_unitOfWorkManage.BeginTran();
			if (outorder.order_type == "1") // æ£å¸¸åºåºå
			{
			name = "åå»ºæ£å¸¸åºåºå";
			@@ -262,7 +263,7 @@
			if (!responseContent.Status) throw new Exception(responseContent.Message);
			List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
			if (dt_CabinOrders != null && dt_CabinOrders.Count > 0)
			_cabinOrderServices.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			_cabinOrderServices.Db.CopyNew().InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
			#endregion
			}
			else if (outorder.order_type == "6")//æ¥æåºåº
			@@ -272,21 +273,19 @@
			var content = _deliveryOrderServices.CreateCheckOutOrder(outorder);
			if (!content.Status) throw new Exception(content.Message);
			}
			_unitOfWorkManage.CommitTran();
			}
			catch (Exception ex)
			{
			_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);
			}
			}
			@@ -312,15 +311,15 @@
			// 3. åè¿æ»¤æä¸ç¬¦åæ¡ä»¶çæç»ï¼åªä¿ç Status=0ï¼
			foreach (var order in orders)
			{
			Console.WriteLine($"è®¢å {order.Order_no} åæç»æ°ï¼{order.Details.Count}");
			//Console.WriteLine($"è®¢å {order.Order_no} åæç»æ°ï¼{order.Details.Count}");
			order.Details = order.Details.Where(d => d.Status == 0).ToList();
			Console.WriteLine($"è®¢å {order.Order_no} è¿æ»¤åæç»æ°ï¼{order.Details.Count}");
			//Console.WriteLine($"è®¢å {order.Order_no} è¿æ»¤åæç»æ°ï¼{order.Details.Count}");
			}


			if (orders == null \|\| !orders.Any())
			if (orders.Count < 1)
			{
			Console.WriteLine("æ²¡æç¬¦åæ¡ä»¶çè®¢åéè¦æ¨é");
			//Console.WriteLine("æ²¡æç¬¦åæ¡ä»¶çè®¢åéè¦æ¨é");
			return WebResponseContent.Instance.Error("æ²¡æç¬¦åæ¡ä»¶çè®¢åéè¦æ¨é");
			}

			@@ -391,9 +390,10 @@
			}
			else
			{
			SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS æ¨éå¤±è´¥", "");
			Console.WriteLine($"è®¢å {order.Order_no} æ¨éå¤±è´¥ï¼{resp?.msg}");
			return new WebResponseContent { Status = false, Message = "è®¢åæ¨éå¤±è´¥" };
			continue;
			//SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS æ¨éå¤±è´¥", "");
			//Console.WriteLine($"è®¢å {order.Order_no} æ¨éå¤±è´¥ï¼{resp?.msg}");
			//return new WebResponseContent { Status = false, Message = "è®¢åæ¨éå¤±è´¥" };
			}
			}
			return new WebResponseContent { Status = true, Message = "æ¨éæå" };
			@@ -426,9 +426,9 @@
			order.Details = order.Details.Where(d => d.Status == 0).ToList();
			}

			if (outOrders == null \|\| !outOrders.Any())
			if (outOrders.Count < 1)
			{
			Console.WriteLine("æ²¡æç¬¦åæ¡ä»¶çè®¢åéè¦æ¨é");
			//Console.WriteLine("æ²¡æç¬¦åæ¡ä»¶çè®¢åéè¦æ¨é");
			return responseContent.Error("æ²¡æç¬¦åæ¡ä»¶çè®¢åéè¦æ¨é");
			}

			@@ -489,13 +489,13 @@
			if (resp != null && resp.code == "0")
			{
			// æ´æ°è¡¨å¤´ç¶æ
			_cabinDetailServices.Db.Updateable<Dt_DeliveryOrder>()
			_cabinDetailServices.Db.CopyNew().Updateable<Dt_DeliveryOrder>()
			.SetColumns(o => new Dt_DeliveryOrder { OutStatus = "å¼å§" })
			.Where(o => o.Id == order.Id)
			.ExecuteCommand();

			// æ´æ°æç»ç¶æ
			_deliveryOrderDetailServices.Db.Updateable<Dt_DeliveryOrderDetail>()
			_deliveryOrderDetailServices.Db.CopyNew().Updateable<Dt_DeliveryOrderDetail>()
			.SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "å¼å§" })
			.Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
			.ExecuteCommand();
			@@ -503,15 +503,16 @@
			}
			else
			{
			SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS æ¨éå¤±è´¥", "");
			Console.WriteLine($"è®¢å {order.Out_no} æ¨éå¤±è´¥ï¼{resp?.msg}");
			continue;
			//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, "");
			Console.WriteLine($"è®¢å {order.Out_no} æ¨éå¼å¸¸ï¼{ex.Message}");
			//SendErrorToUpstream(3, order.Out_no, ex.Message, "");
			//Console.WriteLine($"è®¢å {order.Out_no} æ¨éå¼å¸¸ï¼{ex.Message}");
			}
			}

			@@ -519,7 +520,7 @@
			}
			catch (Exception ex)
			{
			Console.WriteLine("EdiOut å¼å¸¸ï¼" + ex.Message);
			//Console.WriteLine("EdiOut å¼å¸¸ï¼" + ex.Message);
			return responseContent.Error("åºåºè®¢åæ¨éå¤±è´¥ï¼" + ex.Message);
			}
			}
			@@ -536,39 +537,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();
			var Orders = _cabinOrderServices.Db.CopyNew().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 != null&&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 +613,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();
			var Orders = _deliveryOrderServices.Db.CopyNew().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)