MingHeZhiNeng/DuiDuoJiLiKu.git

			@@ -1,4 +1,5 @@
			ï»¿using MailKit.Search;
			ï»¿using AngleSharp.Dom;
			using MailKit.Search;
			using Masuit.Tools;
			using Microsoft.Extensions.Hosting;
			using Microsoft.Extensions.Logging;
			@@ -30,14 +31,13 @@
			private readonly ISys_ConfigService _configService;
			private readonly ILocationInfoRepository _locationRepository;
			private readonly IDt_InboundOrderRepository _inboundOrderRepository;
			private readonly IDt_OtherOutboundOrderRepository _otheroutboundorderRepository;
			private readonly IDt_ProductionOutboundOrderRepository _productionoutboundorderRepository;
			private readonly IDt_InventoryOutboundOrderRepository _inventoryoutboundorderRepository;
			private readonly IDt_AllocateOutboundOrderRepository _allocateoutboundorderRepository;
			private readonly IUnitOfWorkManage _unitOfWorkManage;

			private Timer _timer;

			public MyBackgroundService(ILogger<MyBackgroundService> logger, ILocationInfoRepository locationRepository, IStockInfoRepository stockInfoRepository, IDt_AreaInfoRepository areaInfoRepository, IDt_TaskRepository taskRepository, IDt_StationManagerRepository stationManagerRepository, ISys_ConfigService configService,IDt_InboundOrderRepository inboundOrderRepository, IDt_OtherOutboundOrderRepository otheroutboundorderRepository, IDt_AllocateOutboundOrderRepository allocateoutboundorderRepository, IDt_InventoryOutboundOrderRepository inventoryOutboundOrderRepository,IDt_ProductionOutboundOrderRepository productionOutboundOrderRepository)
			public MyBackgroundService(ILogger<MyBackgroundService> logger, ILocationInfoRepository locationRepository, IStockInfoRepository stockInfoRepository, IDt_AreaInfoRepository areaInfoRepository, IDt_TaskRepository taskRepository, IDt_StationManagerRepository stationManagerRepository, ISys_ConfigService configService,IDt_InboundOrderRepository inboundOrderRepository,IDt_AllocateOutboundOrderRepository allocateoutboundorderRepository,IDt_ProductionOutboundOrderRepository productionOutboundOrderRepository,IUnitOfWorkManage unitOfWorkManage)
			{
			_logger = logger;
			_locationRepository = locationRepository;
			@@ -47,10 +47,9 @@
			_stationManagerRepository = stationManagerRepository;
			_configService = configService;
			_inboundOrderRepository = inboundOrderRepository;
			_otheroutboundorderRepository = otheroutboundorderRepository;
			_allocateoutboundorderRepository = allocateoutboundorderRepository;
			_inventoryoutboundorderRepository = inventoryOutboundOrderRepository;
			_productionoutboundorderRepository = productionOutboundOrderRepository;
			_unitOfWorkManage = unitOfWorkManage;
			}

			public Task StartAsync(CancellationToken cancellationToken)
			@@ -130,28 +129,28 @@
			}
			#endregion


			#region ERPçäº§é¢æååæ¥

			var productionOutOrder = _productionoutboundorderRepository.Db.Queryable<Dt_ProductionOutboundOrder>().Includes(x => x.Details).ToList();

			List<Dt_ProductionOutboundOrder> EngineeringoutboundOrderAdd = new List<Dt_ProductionOutboundOrder>();
			List<Dt_ProductionOutboundOrder> EngineeringoutboundOrderUpdate = new List<Dt_ProductionOutboundOrder>();
			List<Dt_ProductionOutboundOrder> productionoutboundOrderAdd = new List<Dt_ProductionOutboundOrder>();
			List<Dt_ProductionOutboundOrder> productionoutboundOrderUpdate = new List<Dt_ProductionOutboundOrder>();
			List<WMS_ç¨åå·¥ç¨åè´§åä¸è§è¡¨_ST> EngineeringERP = SqlSugarHelper.DBERP.Queryable<WMS_ç¨åå·¥ç¨åè´§åä¸è§è¡¨_ST>().Where(x => true).ToList();
			List<WMS_ç¨åçäº§é¢æåä¸è§è¡¨_ST> productERP = SqlSugarHelper.DBERP.Queryable<WMS_ç¨åçäº§é¢æåä¸è§è¡¨_ST>().Where(x => true).ToList();
			foreach (var item in EngineeringERP)
			{
			var x = productionOutOrder.Where(x => x.UpperOrderNo == item.åå·).FirstOrDefault();
			var x = productionOutOrder.Where(x => x.UpperOrderNo == item.åå· && x.DemandClassification == item.éæ±åç§° && x.OrderPartNumber == item.è®¢åæå· && x.OrderSpec == item.è®¢åè§æ ¼).FirstOrDefault();
			if (x == null)
			{
			if(productionoutboundOrderAdd.Where(x => x.UpperOrderNo == item.åå·).FirstOrDefault()==null)
			if(productionoutboundOrderAdd.Where(x => x.UpperOrderNo == item.åå· && x.DemandClassification == item.éæ±åç§° && x.OrderPartNumber == item.è®¢åæå· && x.OrderSpec == item.è®¢åè§æ ¼).FirstOrDefault()==null)
			{
			Dt_ProductionOutboundOrder outOrder = new Dt_ProductionOutboundOrder()
			{
			OrderNo = GetOrderPintCode("OrderNoOut"),
			UpperOrderNo = item.åå·,
			OrderName = item.è®¢ååå,
			DemandClassification = item.éæ±åç§°,
			OrderPartNumber = item.è®¢åæå·,
			OrderSpec = item.è®¢åè§æ ¼,
			OrderStatus = (int)OrderStateEmun.æªå¼å§,
			OrderType = (int)OrderTypeEmun.çäº§é¢æå,
			CreateType = (int)OrderCreateTypeEmun.ERPæ¨é,
			@@ -161,100 +160,8 @@
			{
			MaterielCode = item.åä»¶æå·,
			MaterielName = item.åä»¶åå,
			DemandClassification = item.éæ±åç§°,
			OrderQuantity = item.åä»¶å®éç¨é,
			NotOutQuantity = item.åä»¶æªåæ°é,
			OverOutQuantity = item.åä»¶åæ¾æ°é,
			}
			}
			};
			EngineeringoutboundOrderAdd.Add(outOrder);
			}
			else
			{
			var existingOrder = EngineeringoutboundOrderAdd.Where(x => x.UpperOrderNo == item.åå·).FirstOrDefault();
			existingOrder.Details.Add(new Dt_ProductionOutboundOrderDetail()
			{
			MaterielCode = item.åä»¶æå·,
			MaterielName = item.åä»¶åå,
			DemandClassification = item.éæ±åç§°,
			OrderQuantity = item.åä»¶å®éç¨é,
			NotOutQuantity = item.åä»¶æªåæ°é,
			OverOutQuantity = item.åä»¶åæ¾æ°é,
			});
			}
			}
			//else
			//{
			// foreach (var detail in x.Details)
			// {
			// if (detail.MaterielCode != item.åä»¶æå· && detail.MaterielName != item.åä»¶åå)
			// {
			// if (EngineeringoutboundOrderUpdate.Where(o => o.UpperOrderNo == item.åå·).FirstOrDefault() == null)
			// {
			// x.Details = new List<Dt_ProductionOutboundOrderDetail>()
			// {
			// new Dt_ProductionOutboundOrderDetail()
			// {
			// MaterielCode = item.åä»¶æå·,
			// MaterielName = item.åä»¶åå,
			// DemandClassification = item.éæ±åç§°,
			// OrderQuantity = item.åä»¶å®éç¨é,
			// NotOutQuantity = item.åä»¶æªåæ°é,
			// OverOutQuantity = item.åä»¶åæ¾æ°é,
			// }
			// };
			// EngineeringoutboundOrderUpdate.Add(x);
			// }
			// else
			// {
			// var existingOrder = EngineeringoutboundOrderUpdate.Where(o => o.UpperOrderNo == item.åå·).FirstOrDefault();
			// existingOrder.Details.Add(new Dt_ProductionOutboundOrderDetail()
			// {
			// MaterielCode = item.åä»¶æå·,
			// MaterielName = item.åä»¶åå,
			// DemandClassification = item.éæ±åç§°,
			// OrderQuantity = item.åä»¶å®éç¨é,
			// NotOutQuantity = item.åä»¶æªåæ°é,
			// OverOutQuantity = item.åä»¶åæ¾æ°é,
			// });
			// }
			// }
			// }
			//}
			}
			if (EngineeringoutboundOrderAdd.Count > 0)
			{
			foreach (var order in EngineeringoutboundOrderAdd)
			{
			_productionoutboundorderRepository.AddDataNavAsync(order);
			}
			}
			if (EngineeringoutboundOrderUpdate.Count > 0)
			{
			_productionoutboundorderRepository.UpdateDataNav(EngineeringoutboundOrderUpdate);
			}
			foreach (var item in productERP)
			{
			var x = productionOutOrder.Where(x => x.UpperOrderNo == item.åå·).FirstOrDefault();
			if (x == null)
			{
			if (productionoutboundOrderAdd.Where(x => x.UpperOrderNo == item.åå·).FirstOrDefault() == null)
			{
			Dt_ProductionOutboundOrder outOrder = new Dt_ProductionOutboundOrder()
			{
			OrderNo = GetOrderPintCode("OrderNoOut"),
			UpperOrderNo = item.åå·,
			OrderStatus = (int)OrderStateEmun.æªå¼å§,
			OrderType = (int)OrderTypeEmun.çäº§é¢æå,
			CreateType = (int)OrderCreateTypeEmun.ERPæ¨é,
			Details = new List<Dt_ProductionOutboundOrderDetail>()
			{
			new Dt_ProductionOutboundOrderDetail()
			{
			MaterielCode = item.åä»¶æå·,
			MaterielName = item.åä»¶åå,
			DemandClassification = item.éæ±åç§°,
			Specs = item.åä»¶è§æ ¼,
			Weight = item.åä»¶åé,
			OrderQuantity = item.åä»¶å®éç¨é,
			NotOutQuantity = item.åä»¶æªåæ°é,
			OverOutQuantity = item.åä»¶åæ¾æ°é,
			@@ -270,67 +177,152 @@
			{
			MaterielCode = item.åä»¶æå·,
			MaterielName = item.åä»¶åå,
			DemandClassification = item.éæ±åç§°,
			Specs = item.åä»¶è§æ ¼,
			Weight = item.åä»¶åé,
			OrderQuantity = item.åä»¶å®éç¨é,
			NotOutQuantity = item.åä»¶æªåæ°é,
			OverOutQuantity = item.åä»¶åæ¾æ°é,
			});
			}
			}
			//else
			//{
			// foreach (var detail in x.Details)
			// {
			// if (productionoutboundOrderUpdate.Where(o => o.UpperOrderNo == item.åå·).FirstOrDefault() == null)
			// {
			// x.Details = new List<Dt_ProductionOutboundOrderDetail>()
			// {
			// new Dt_ProductionOutboundOrderDetail()
			// {
			// MaterielCode = item.åä»¶æå·,
			// MaterielName = item.åä»¶åå,
			// DemandClassification = item.éæ±åç§°,
			// OrderQuantity = item.åä»¶å®éç¨é,
			// NotOutQuantity = item.åä»¶æªåæ°é,
			// OverOutQuantity = item.åä»¶åæ¾æ°é,
			// }
			// };
			// productionoutboundOrderUpdate.Add(x);
			// }
			// else
			// {
			// var existingOrder = productionoutboundOrderUpdate.Where(o => o.UpperOrderNo == item.åå·).FirstOrDefault();
			// existingOrder.Details.Add(new Dt_ProductionOutboundOrderDetail()
			// {
			// MaterielCode = item.åä»¶æå·,
			// MaterielName = item.åä»¶åå,
			// DemandClassification = item.éæ±åç§°,
			// OrderQuantity = item.åä»¶å®éç¨é,
			// NotOutQuantity = item.åä»¶æªåæ°é,
			// OverOutQuantity = item.åä»¶åæ¾æ°é,
			// });
			// }
			// }
			//}
			}
			foreach (var item in productERP)
			{
			var x = productionOutOrder.Where(x => x.UpperOrderNo == item.åå· && x.DemandClassification == item.éæ±åç§° && x.OrderPartNumber == item.è®¢åæå·).FirstOrDefault();
			if (x == null)
			{
			if (productionoutboundOrderAdd.Where(x => x.UpperOrderNo == item.åå· && x.DemandClassification == item.éæ±åç§° && x.OrderPartNumber == item.è®¢åæå·).FirstOrDefault() == null)
			{
			Dt_ProductionOutboundOrder outOrder = new Dt_ProductionOutboundOrder()
			{
			OrderNo = GetOrderPintCode("OrderNoOut"),
			UpperOrderNo = item.åå·,
			OrderName = item.è®¢ååå,
			DemandClassification = item.éæ±åç§°,
			OrderPartNumber = item.è®¢åæå·,
			//OrderSpec = item.è®¢åè§æ ¼,
			OrderStatus = (int)OrderStateEmun.æªå¼å§,
			OrderType = (int)OrderTypeEmun.çäº§é¢æå,
			CreateType = (int)OrderCreateTypeEmun.ERPæ¨é,
			Details = new List<Dt_ProductionOutboundOrderDetail>()
			{
			new Dt_ProductionOutboundOrderDetail()
			{
			MaterielCode = item.åä»¶æå·,
			MaterielName = item.åä»¶åå,
			Specs = item.åä»¶è§æ ¼,
			Weight = item.åä»¶åé,
			OrderQuantity = item.åä»¶å®éç¨é,
			NotOutQuantity = item.åä»¶æªåæ°é,
			OverOutQuantity = item.åä»¶åæ¾æ°é,
			}
			}
			};
			productionoutboundOrderAdd.Add(outOrder);
			}
			else
			{
			var existingOrder = productionoutboundOrderAdd.Where(x => x.UpperOrderNo == item.åå· && x.DemandClassification == item.éæ±åç§° && x.OrderPartNumber == item.è®¢åæå·).FirstOrDefault();
			existingOrder.Details.Add(new Dt_ProductionOutboundOrderDetail()
			{
			MaterielCode = item.åä»¶æå·,
			MaterielName = item.åä»¶åå,
			Specs = item.åä»¶è§æ ¼,
			Weight = item.åä»¶åé,
			OrderQuantity = item.åä»¶å®éç¨é,
			NotOutQuantity = item.åä»¶æªåæ°é,
			OverOutQuantity = item.åä»¶åæ¾æ°é,
			});
			}
			}

			}

			#endregion

			#region ERPè°æ¨åºåºååæ¥

			var allocateoutboundorder = _allocateoutboundorderRepository.Db.Queryable<Dt_AllocateOutboundOrder>().Includes(x => x.Details).ToList();

			List<Dt_AllocateOutboundOrder> allocateoutboundorderAdd = new List<Dt_AllocateOutboundOrder>();
			List<Dt_AllocateOutboundOrder> allocateoutboundorderUpdate = new List<Dt_AllocateOutboundOrder>();
			List<WMS_ç¨åçµæ§æè°æ¨ä¸è§è¡¨_ST> ERPallocateOrder = SqlSugarHelper.DBERP.Queryable<WMS_ç¨åçµæ§æè°æ¨ä¸è§è¡¨_ST>().Where(x => true).ToList();
			foreach (var item in ERPallocateOrder)
			{
			var x = allocateoutboundorder.Where(x => x.UpperOrderNo == item.åå· && x.DemandClassification == item.éæ±åç§° && x.OrderPartNumber == item.è®¢åæå· && x.OrderSpec == item.è®¢åè§æ ¼).FirstOrDefault();
			if (x == null)
			{
			if (allocateoutboundorderAdd.Where(x => x.UpperOrderNo == item.åå·).FirstOrDefault() == null)
			{
			Dt_AllocateOutboundOrder outOrder = new Dt_AllocateOutboundOrder()
			{
			OrderNo = GetOrderPintCode("OrderNoOut"),
			UpperOrderNo = item.åå·,
			OrderName=item.è®¢ååå,
			DemandClassification=item.éæ±åç§°,
			OrderPartNumber =item.è®¢åæå·,
			OrderSpec =item.è®¢åè§æ ¼,
			OrderStatus = (int)OrderStateEmun.æªå¼å§,
			OrderType = (int)OrderTypeEmun.è°æ¨åºåºå,
			CreateType = (int)OrderCreateTypeEmun.ERPæ¨é,
			Details = new List<Dt_AllocateOutboundOrderDetail>()
			{
			new Dt_AllocateOutboundOrderDetail()
			{
			MaterielCode = item.åä»¶æå·,
			MaterielName = item.åä»¶åå,
			Specs = item.åä»¶è§æ ¼,
			Weight = item.åä»¶åé,
			OrderQuantity = item.åä»¶å®éç¨é,
			NotOutQuantity = item.åä»¶æªåæ°é,
			OverOutQuantity = item.åä»¶åæ¾æ°é,
			}
			}
			};
			allocateoutboundorderAdd.Add(outOrder);
			}
			else
			{
			var existingOrder = allocateoutboundorderAdd.Where(x => x.UpperOrderNo == item.åå· && x.DemandClassification == item.éæ±åç§° && x.OrderPartNumber == item.è®¢åæå· && x.OrderSpec == item.è®¢åè§æ ¼).FirstOrDefault();
			existingOrder.Details.Add(new Dt_AllocateOutboundOrderDetail()
			{
			MaterielCode = item.åä»¶æå·,
			MaterielName = item.åä»¶åå,
			Specs = item.åä»¶è§æ ¼,
			Weight = item.åä»¶åé,
			OrderQuantity = item.åä»¶å®éç¨é,
			NotOutQuantity = item.åä»¶æªåæ°é,
			OverOutQuantity = item.åä»¶åæ¾æ°é,
			});
			}
			}
			}
			#endregion

			#region æ°æ®å¤ç
			_unitOfWorkManage.BeginTran();

			if (productionoutboundOrderAdd.Count > 0)
			{
			foreach (var order in productionoutboundOrderAdd)
			//foreach (var order in productionoutboundOrderAdd)
			//{
			// _productionoutboundorderRepository.AddDataNavAsync(order);
			//}
			SqlSugarHelper.DbWMS.InsertNav(productionoutboundOrderAdd).Include(x => x.Details).ExecuteCommandAsync();
			}
			if (allocateoutboundorderAdd.Count > 0)
			{
			_productionoutboundorderRepository.AddDataNavAsync(order);
			SqlSugarHelper.DbWMS.InsertNav(allocateoutboundorderAdd).Include(x=>x.Details).ExecuteCommandAsync();
			}
			}
			if (productionoutboundOrderUpdate.Count > 0)
			{
			_productionoutboundorderRepository.UpdateDataNav(productionoutboundOrderUpdate);
			}
			_unitOfWorkManage.CommitTran();


			#endregion

			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			ConsoleHelper.WriteErrorLine($"éè¯¯ä¿¡æ¯ï¼" + ex.Message);
			}
			}