ZhongRui/ALDbanyunxiangmu.git

			@@ -38,9 +38,11 @@
			using WIDESEA_Core.BaseServices;
			using WIDESEA_Core.Enums;
			using WIDESEA_Core.Helper;
			using WIDESEA_DTO.Allocate;
			using WIDESEA_DTO.Basic;
			using WIDESEA_DTO.Inbound;
			using WIDESEA_DTO.Task;
			using WIDESEA_IAllocateService;
			using WIDESEA_IBasicService;
			using WIDESEA_IInboundService;
			using WIDESEA_IOutboundService;
			@@ -69,7 +71,7 @@
			private readonly IESSApiService _eSSApiService;
			private readonly IStockService _stockService;
			private readonly IRecordService _recordService;

			private readonly IAllocateService _allocateService;
			private readonly IInvokeMESService _invokeMESService;
			public IRepository<Dt_Task> Repository => BaseDal;

			@@ -90,7 +92,7 @@

			public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();

			public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService) : base(BaseDal)
			public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService) : base(BaseDal)
			{
			_mapper = mapper;
			_unitOfWorkManage = unitOfWorkManage;
			@@ -107,6 +109,7 @@
			_outboundOrderDetailService = outboundOrderDetailService;
			_invokeMESService = invokeMESService;
			_outStockLockInfoService = outStockLockInfoService;
			_allocateService = allocateService;
			}


			@@ -250,7 +253,53 @@
			{
			if (inboundOrder.OrderType == InOrderTypeEnum.Allocat.ObjToInt())//è°æ¨å¥åº
			{
			if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.å¥åºå®æ.ObjToInt())
			{
			var allocate = _allocateService.Repository.QueryData(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
			var feedmodel = new AllocateDto
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = "2",
			FactoryArea = inboundOrder.FactoryArea,
			OperationType = 1,
			Operator = inboundOrder.Operator,
			OrderNo = inboundOrder.UpperOrderNo,
			fromWarehouse = allocate?.FromWarehouse??"",
			toWarehouse = allocate?.ToWarehouse??"",
			Details = new List<AllocateDtoDetail>()

			};

			var groupedData = inboundOrder.Details.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			{
			MaterialCode = group.Key.MaterielCode,
			LineNo = group.Key.lineNo,
			WarehouseCode = group.Key.WarehouseCode,
			Qty = group.Sum(x => x.BarcodeQty),
			// warehouseCode= "1072",
			Unit = group.Key.BarcodeUnit,
			Barcodes = group.Select(row => new BarcodeInfo
			{
			Barcode = row.Barcode,
			Qty = row.BarcodeQty,
			BatchNo = row.BatchNo,
			SupplyCode = row.SupplyCode,
			Unit = row.Unit
			}).ToList()
			}).ToList();
			feedmodel.Details = groupedData;

			var result = await _invokeMESService.FeedbackAllocate(feedmodel);
			if (result != null && result.code == 200)
			{
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			}
			}
			else if (inboundOrder.OrderType == InOrderTypeEnum.ReCheck.ObjToInt()) //éæ£å¥åº
			{
			@@ -293,11 +342,11 @@
			}).ToList();
			feedmodel.details = groupedData;

			var result= await _invokeMESService.FeedbackInbound(feedmodel);
			var result = await _invokeMESService.FeedbackInbound(feedmodel);
			if (result != null && result.code == 200)
			{
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })
			.Where(it => it.Id== inboundOrder.Id).ExecuteCommand();
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			@@ -329,7 +378,7 @@
			var outloks = _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>().Where(x => x.TaskNum == task.TaskNum).ToList();

			var stockids = outloks.Select(x => x.StockId).ToList();


			_stockService.StockInfoService.Db.Updateable<Dt_StockInfo>()
			.SetColumns(it => new Dt_StockInfo
			{
			@@ -343,9 +392,9 @@
			{
			Status = StockStatusEmun.åºåºéå®.ObjToInt()
			})
			.Where(it => stockids.Contains( it.StockId))
			.Where(it => stockids.Contains(it.StockId))
			.ExecuteCommand();




			return WebResponseContent.Instance.OK();
			@@ -405,7 +454,7 @@
			}
			}

			public WebResponseContent InPickTaskCompleted(Dt_Task task)
			public async Task<WebResponseContent> InPickTaskCompleted(Dt_Task task)
			{
			_logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum}");
			//æ¥åºå
			@@ -418,13 +467,25 @@
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥æçåºåæç»ä¿¡æ¯");
			}

			//æ¥è´§ä½
			Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
			if (locationInfo == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçç»ç¹è´§ä½ä¿¡æ¯");
			}
			// è·åææååºä¸çåºåºéå®è®°å½
			var returnLocks = _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
			.Where(it => it.OrderNo == task.OrderNo && it.PalletCode == task.PalletCode && it.Status == (int)OutLockStockStatusEnum.ååºä¸)
			.ToList();
			// æ´æ°åºåºéå®è®°å½ç¶æä¸ºååºå®æ
			foreach (var lockInfo in returnLocks)
			{
			lockInfo.Status = (int)OutLockStockStatusEnum.å·²ååº;
			}
			_outStockLockInfoService.Db.Updateable(returnLocks).ExecuteCommand();

			await DeleteZeroQuantityStockDetails(stockInfo.Id);

			stockInfo.LocationCode = task.TargetAddress;
			stockInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			stockInfo.Details.ForEach(x =>
			@@ -433,6 +494,9 @@
			});
			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
			await ProcessStockDetailsForReturn(task, stockInfo.Id);



			if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
			{
			@@ -451,6 +515,60 @@
			return WebResponseContent.Instance.OK();
			}

			/// <summary>
			/// å é¤åºåæ°ä¸º0çåºåæç»è®°å½
			/// </summary>
			private async Task DeleteZeroQuantityStockDetails(int stockId)
			{
			try
			{
			// å é¤åºåæ°éä¸º0çè®°å½
			var deleteCount = await _stockService.StockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockId &&
			x.StockQuantity == 0 &&
			(x.Status==StockStatusEmun.åºåºå®æ.ObjToInt()\|\| x.Status==
			StockStatusEmun.å¥åºå®æ.ObjToInt())) // åªå é¤å·²å®æç¶æçé¶åºå
			.ExecuteCommandAsync();

			if (deleteCount > 0)
			{
			_logger.LogInformation($"å é¤{deleteCount}æ¡é¶åºåæç»è®°å½ - StockId: {stockId}");
			}
			}
			catch (Exception ex)
			{
			_logger.LogWarning($"å é¤é¶åºåè®°å½å¤±è´¥ - StockId: {stockId}, Error: {ex.Message}");
			// æ³¨æï¼å é¤å¤±è´¥ä¸åºè¯¥å½±åä¸»æµç¨ï¼è®°å½æ¥å¿åç»§ç»
			}
			}
			/// <summary>
			/// å¤çååºç¸å³çææåºåæç»ç¶æåæ´
			/// </summary>
			private async Task ProcessStockDetailsForReturn(Dt_Task returnTask, int stockId)
			{
			// è·åè¯¥æçä¸ææéè¦ååºçåºåæç»
			var stockDetails = await _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockId &&
			x.StockQuantity > 0 &&
			( x.Status == StockStatusEmun.åºåºéå®.ObjToInt()\|\| x.Status==
			StockStatusEmun.å¥åºç¡®è®¤.ObjToInt())) // åæ¬åºåºéå®åå¥åºç¡®è®¤ç
			.ToListAsync();

			foreach (var detail in stockDetails)
			{

			detail.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();
			detail.OutboundQuantity = 0; // æ¸ç©ºåºåºæ°é

			_logger.LogInformation($"æ´æ°åºåæç»ç¶æ - æ¡ç : {detail.Barcode}, æ°é: {detail.StockQuantity}");
			}

			if (stockDetails.Any())
			{
			await _stockService.StockInfoDetailService.Db.Updateable(stockDetails).ExecuteCommandAsync();
			_logger.LogInformation($"å±æ´æ°{stockDetails.Count}ä¸ªåºåæç»ç¶æä¸ºå¥åºå®æ");
			}
			}
			public async Task<WebResponseContent> OutEmptyTaskCompleted(Dt_Task task)
			{
			WebResponseContent content = new WebResponseContent();