ZhongRui/ALDbanyunxiangmu.git

			@@ -16,6 +16,7 @@
			#endregion << ç æ¬ æ³¨ é >>

			using AutoMapper;
			using Dm.filter;
			using MailKit.Search;
			using Microsoft.Extensions.Logging;
			using Newtonsoft.Json;
			@@ -108,6 +109,7 @@
			_outStockLockInfoService = outStockLockInfoService;
			}


			/// <summary>
			///
			/// </summary>
			@@ -118,6 +120,7 @@
			try
			{
			Dt_Task task;

			if (int.TryParse(taskNum, out var newTaskNum))
			{
			task = BaseDal.QueryFirst(x => x.TaskNum == newTaskNum);
			@@ -130,6 +133,7 @@
			{
			return WebResponseContent.Instance.Error("æªæ¾å°ä»»å¡ä¿¡æ¯");
			}
			_logger.LogInformation($"TaskService TaskCompleted: {JsonConvert.SerializeObject(task)} , {task.TaskType} ");

			MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCompleted");
			if (methodInfo != null)
			@@ -144,6 +148,7 @@
			}
			catch (Exception ex)
			{
			_logger.LogError($"TaskService TaskCompleted: {ex.Message} ");
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}
			@@ -152,7 +157,7 @@
			/// </summary>
			/// <param name="task"></param>
			/// <returns></returns>
			public WebResponseContent InboundTaskCompleted(Dt_Task task)
			public async Task<WebResponseContent> InboundTaskCompleted(Dt_Task task)
			{
			decimal beforeQuantity = 0;

			@@ -243,53 +248,110 @@
			{
			foreach (var inboundOrder in inboundOrders)
			{
			if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.å¥åºå®æ.ObjToInt())
			if (inboundOrder.OrderType == InOrderTypeEnum.Allocat.ObjToInt())//è°æ¨å¥åº
			{
			var feedmodel = new FeedbackInboundRequestModel

			}
			else if (inboundOrder.OrderType == InOrderTypeEnum.ReCheck.ObjToInt()) //éæ£å¥åº
			{

			}
			else
			{
			if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.å¥åºå®æ.ObjToInt())
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = inboundOrder.Modifier,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()
			var feedmodel = new FeedbackInboundRequestModel
			{
			reqCode = Guid.NewGuid().ToString(),
			reqTime = DateTime.Now.ToString(),
			business_type = inboundOrder.BusinessType,
			factoryArea = inboundOrder.FactoryArea,
			operationType = 1,
			Operator = inboundOrder.Operator,
			orderNo = inboundOrder.UpperOrderNo,
			status = inboundOrder.OrderStatus,
			details = new List<FeedbackInboundDetailsModel>()

			};
			};

			var groupedData = inboundOrder.Details.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode})
			.Select(group => new FeedbackInboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			lineNo = group.Key.lineNo,
			warehouseCode = group.Key.WarehouseCode ,
			// warehouseCode= "1072",
			unit = group.Key.BarcodeUnit,
			barcodes = group.Select(row => new FeedbackBarcodesModel
			var groupedData = inboundOrder.Details.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details = groupedData;

			_invokeMESService.FeedbackInbound(feedmodel);
			materialCode = group.Key.MaterielCode,
			supplyCode = group.Key.SupplyCode,
			batchNo = group.Key.BatchNo,
			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 FeedbackBarcodesModel
			{
			barcode = row.Barcode,
			qty = row.BarcodeQty
			}).ToList()
			}).ToList();
			feedmodel.details = groupedData;

			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();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 1 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			}
			}

			}
			}
			catch (Exception ex) {
			catch (Exception ex)
			{
			_logger.LogInformation("InboundTaskCompleted ååMESå¤±è´¥: " + ex.Message);
			}

			return WebResponseContent.Instance.OK();
			}

			public WebResponseContent OutboundTaskCompleted(Dt_Task task)
			{
			_logger.LogInformation($"TaskService OutboundTaskCompleted: {task.TaskNum}");
			//æ¥è´§ä½
			Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			if (locationInfo == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçç»ç¹è´§ä½ä¿¡æ¯");
			}
			locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
			_locationInfoService.Repository.UpdateData(locationInfo);

			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
			{
			StockStatus = StockStatusEmun.åºåºéå®.ObjToInt()
			})
			.Where(it => stockids.Contains(it.Id))
			.ExecuteCommand();

			_stockService.StockInfoDetailService.Db.Updateable<Dt_StockInfoDetail>()
			.SetColumns(it => new Dt_StockInfoDetail
			{
			Status = StockStatusEmun.åºåºéå®.ObjToInt()
			})
			.Where(it => stockids.Contains( it.StockId))
			.ExecuteCommand();



			return WebResponseContent.Instance.OK();


			}
			public async Task<WebResponseContent> InEmptyTaskCompleted(Dt_Task task)
			{

			@@ -343,14 +405,58 @@
			}
			}

			public WebResponseContent InPickTaskCompleted(Dt_Task task)
			{
			_logger.LogInformation($"TaskService InPickTaskCompleted: {task.TaskNum}");
			//æ¥åºå
			Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.PalletCode == task.PalletCode).First();
			if (stockInfo == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°æçå¯¹åºçç»çä¿¡æ¯");
			}
			if (stockInfo.Details.Count == 0 && stockInfo.PalletType != PalletTypeEnum.Empty.ObjToInt())
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥æçåºåæç»ä¿¡æ¯");
			}

			//æ¥è´§ä½
			Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
			if (locationInfo == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºçç»ç¹è´§ä½ä¿¡æ¯");
			}
			stockInfo.LocationCode = task.TargetAddress;
			stockInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			stockInfo.Details.ForEach(x =>
			{
			x.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();
			});
			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);

			if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
			{
			locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
			}
			else
			{
			locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			}
			_locationInfoService.Repository.UpdateData(locationInfo);

			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();

			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);

			return WebResponseContent.Instance.OK();
			}

			public async Task<WebResponseContent> OutEmptyTaskCompleted(Dt_Task task)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
			Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode).First();
			if (stockInfo == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°æçå¯¹åºçåºåä¿¡æ¯");
			@@ -362,7 +468,6 @@
			return content.Error($"æªæ¾å°å¯¹åºçç»ç¹è´§ä½ä¿¡æ¯");
			}

			// _stockRepository.Db.Deleteable(stockInfo);

			int beforeStatus = locationInfo.LocationStatus;

			@@ -374,6 +479,7 @@
			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			_stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			_stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();

			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);

			@@ -382,16 +488,16 @@
			}
			catch (Exception ex)
			{
			_logger.LogError($"TaskService OutEmptyTaskCompleted: {ex.Message} ");
			return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
			}
			}





			/// <summary>
			/// ååºå®æåè° - AGVå°æçæ¾åè´§ä½åè°ç¨
			/// </summary>
			/// ååºå®æåè°
			public async Task<WebResponseContent> BackToStockComplete(Dt_Task task)
			{
			try
			@@ -471,7 +577,7 @@

			// æ´æ°ä»»å¡ç¶æä¸ºå·²å®æ
			task.TaskStatus = (int)TaskStatusEnum.Finish;


			await Db.Updateable(task).ExecuteCommandAsync();

			_unitOfWorkManage.CommitTran();