ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -13,6 +13,9 @@
			using static WIDESEA_DTO.SquareCabin.TowcsDto;
			using WIDESEA_Common.WareHouseEnum;
			using WIDESEA_DTO.SquareCabin;
			using WIDESEA_Common;
			using System.Xml.Linq;
			using WIDESEA_Common.OrderEnum;

			namespace WIDESEA_WMSServer
			{
			@@ -22,24 +25,16 @@
			private readonly ICabinOrderDetailServices _cabinDetailServices;
			private readonly IDeliveryOrderServices _deliveryOrderServices;
			private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
			private readonly IBasicService _basicService;
			private readonly IMessageInfoService _messageInfoService;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IInventory_BatchServices _inventory_BatchServices;
			private readonly IInventoryInfoService _inventoryInfoService;
			private readonly ISupplyTaskService _supplyTaskService;
			private readonly ITacticsService _tacticsService;
			public Business(IDeliveryOrderServices deliveryOrderServices, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ICabinOrderDetailServices cabinDetailServices)
			public Business(IDeliveryOrderServices deliveryOrderServices, IUnitOfWorkManage unitOfWorkManage, IDeliveryOrderDetailServices deliveryOrderDetailServices, ICabinOrderServices cabinOrderServices, ICabinOrderDetailServices cabinDetailServices, IMessageInfoService messageInfoService)
			{
			_deliveryOrderServices = deliveryOrderServices;
			_basicService = basicService;
			_unitOfWorkManage = unitOfWorkManage;
			_inventory_BatchServices = inventory_BatchServices;
			_inventoryInfoService = inventoryInfoService;
			_deliveryOrderDetailServices = deliveryOrderDetailServices;
			_supplyTaskService = supplyTaskService;
			_cabinOrderServices = cabinOrderServices;
			_tacticsService = tacticsService;
			_cabinDetailServices = cabinDetailServices;
			_messageInfoService = messageInfoService;
			}
			#region è·åERPå¥åºå
			static string SearchInDate = "2025-09-10 00:00:00";
			@@ -71,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 ?? "ä¸æ¸¸æ¥å£è¿åå¤±è´¥");
			}

			@@ -82,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();

			@@ -92,14 +89,16 @@
			.Where(order => !existingOrderNos.Contains(order.order_no))
			.ToList();

			if (!newOrders.Any())
			if (newOrders.Count < 1)
			{
			return responseContent.OK("ææå¥åºåå·²åå¨ï¼æ éæ°å¢");
			}

			//åå¨å¥åºåå·
			List<string> orderNos = new List<string>();

			string name = string.Empty;
			MessageGroupByEnum messageGroupBy = MessageGroupByEnum.InOrderAlarm;
			MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
			foreach (var order in newOrders)
			{
			try
			@@ -107,6 +106,7 @@
			_unitOfWorkManage.BeginTran();
			if (order.order_type == "1") //æ£å¸¸å¥åº
			{
			name = "åå»ºæ£å¸¸å¥åºå";
			responseContent = _cabinOrderServices.CreateInboundOrder(order);
			if (!responseContent.Status) throw new Exception(responseContent.Message);
			List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
			@@ -115,6 +115,8 @@
			}
			else if (order.order_type == "3")//å¥åºéæ
			{
			messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
			name = "åå»ºå¥åºéè´§å";
			//åå»ºåºåºå
			#region è½¬æ¢ä¸ºåºåºå
			UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()
			@@ -141,6 +143,8 @@
			}
			else if (order.order_type == "5")//æ¥æº¢å¥åº
			{
			name = "åå»ºççå¥åºå";
			messageStatus = MessageStatusEnum.Undisposed;
			var content = _cabinOrderServices.CreateCheckInOrder(order);
			if (!content.Status) throw new Exception(content.Message);
			}
			@@ -149,21 +153,18 @@
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			SendErrorToUpstream(1, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
			//SendErrorToUpstream(1, "", ex.Message, "");
			//return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			};

			//å¨ä¸åç»wcs
			//EdiIn(); //åç»ä¸æ¸¸
			//å¦æè¿ä¸ªæ¹æ³æåäºï¼é£ä¹å°±è°ç¨CompleteOrderæ¥å£ï¼ç¶åæ¹å
			return responseContent.OK("åæ¥å¥åºåæå");

			}
			catch (Exception ex)
			{
			// å¨å±å¼å¸¸æ¶ï¼ä¹æ¨éå¼å¸¸ç»ä¸æ¸¸
			SendErrorToUpstream(1, "", ex.Message, "");
			//SendErrorToUpstream(1, "", ex.Message, "");
			return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			@@ -176,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
			@@ -192,7 +193,7 @@

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

			@@ -200,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();

			@@ -213,26 +215,31 @@

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

			if (!newOutOrders.Any())
			if (newOutOrders.Count < 1)
			{
			return responseContent.OK("ææåºåºåå·²åå¨ï¼æ éæ°å¢");
			}

			_unitOfWorkManage.BeginTran();
			try
			List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
			List<string> orderNos = new List<string>();
			string name = string.Empty;
			MessageGroupByEnum messageGroupBy = MessageGroupByEnum.OutOrderAlarm;
			MessageStatusEnum messageStatus = MessageStatusEnum.Emergency;
			foreach (var outorder in newOutOrders)
			{
			List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
			List<string> orderNos = new List<string>();

			foreach (var outorder in newOutOrders)
			try
			{
			_unitOfWorkManage.BeginTran();
			if (outorder.order_type == "1") // æ£å¸¸åºåºå
			{
			name = "åå»ºæ£å¸¸åºåºå";
			var content = _deliveryOrderServices.CreateOutboundOrder(outorder);
			if (!content.Status) throw new Exception(content.Message);
			}
			else if (outorder.order_type == "2")//åºåºéè´§
			{
			name = "åå»ºåºåºéè´§å";
			messageGroupBy = MessageGroupByEnum.InOrderAlarm;
			// åå»ºåºåºéè´§å - è¿ééè¦æ ¹æ®ä¸å¡é»è¾å®ç°
			// ææ¶è·³è¿æå®ç°éè´§é»è¾
			//continue;
			@@ -264,37 +271,26 @@
			}
			else if (outorder.order_type == "6")//æ¥æåºåº
			{
			name = "åå»ºçæåºåºå";
			messageStatus = MessageStatusEnum.Undisposed;
			var content = _deliveryOrderServices.CreateCheckOutOrder(outorder);
			if (!content.Status) throw new Exception(content.Message);
			}
			_unitOfWorkManage.CommitTran();
			}

			// æ¹éæå¥åºåºååæç»
			//if (_DeliveryOrders.Any())
			//{
			// BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
			//}
			//ä¸ååºåºåä»»å¡ç»wcs


			_unitOfWorkManage.CommitTran();
			//var tex = CreateSupplyTask(order_no);
			//if (!tex)
			//{
			// return responseContent.Error("åå»ºä¾åºä»»å¡å¤±è´¥");
			//}
			return responseContent.OK($"åæ¥åºåºåæåï¼å±{_DeliveryOrders.Count}æ¡");
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			_messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
			//SendErrorToUpstream(3, "", ex.Message, "");
			//return responseContent.Error("åæ¥å¤±è´¥: " + ex.Message);
			}
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			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);
			}
			}
			@@ -399,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 = "è®¢åæ¨éå¤±è´¥" };
			}
			@@ -488,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);
			@@ -511,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}");
			}
			}
			@@ -544,37 +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();
			_cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			foreach (var item in Orders)
			if (Orders.FirstOrDefault().Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
			{
			_cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, 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)
			@@ -596,36 +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();
			_deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.èªå¨å®æ);
			foreach (var item in Orders)
			if (Orders.FirstOrDefault().Out_type == OutOrderTypeEnum.Allocate.ObjToInt().ToString())
			{
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			foreach (var item in Orders)
			{
			if (item.Details != null)
			_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.èªå¨å®æ);
			item.Details = null;
			}
			_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)