ZhongRui/ALDbanyunxiangmu.git

			@@ -282,11 +282,28 @@
			_inboundOrderService.UpdateData(inboundOrder);
			}
			}
			Dt_OutboundOrder outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();

			if (outboundOrder != null)
			{
			foreach (var item in stockInfo.Details.Where(x => x.OrderNo == outboundOrder.OrderNo).ToList())
			{
			var inbounddetail = _allocateMaterialInfo.QueryFirst(x => x.OrderNo == item.OrderNo && x.Barcode == item.Barcode);
			if (inbounddetail != null)
			{
			var alldelete = _allocateMaterialInfo.DeleteAndMoveIntoHty(inbounddetail, OperateTypeEnum.èªå¨å é¤);
			if (!alldelete)
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			}
			}
			}
			stockInfo.LocationCode = task.TargetAddress;
			stockInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			stockInfo.Details.ForEach(x =>
			{
			x.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();
			x.Status = StockStatusEmun.å¥åºç¡®è®¤.ObjToInt();
			});
			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
			@@ -315,8 +332,6 @@
			try
			{
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);

			_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, WIDESEA_Common.StockEnum.StockChangeType.MaterielGroup);
			}
			catch (Exception ex)
			{
			@@ -345,8 +360,9 @@
			Details = new List<AllocateDtoDetail>()

			};

			var groupedData = inboundOrder.Details.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			var query = inboundOrder.Details.AsQueryable();
			query = query.Where(item => item.ReturnToMESStatus == 0);
			var groupedData = query.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new AllocateDtoDetail
			{
			MaterialCode = group.Key.MaterielCode,
			@@ -365,8 +381,6 @@
			}).ToList()
			}).ToList();
			allocatefeedmodel.Details = groupedData;

			//var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);

			var response = responseModel(inboundOrder, 3, null, allocatefeedmodel);
			if (response != null && response.IsSuccess)
			@@ -375,65 +389,24 @@
			.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();
			//åä¼ æååºåæå¯ç¨
			_stockRepository.Db.Updateable<Dt_StockInfoDetail>().SetColumns(it => new Dt_StockInfoDetail
			{
			Status = StockStatusEmun.å¥åºå®æ.ObjToInt()
			}).Where(it => it.OrderNo == inboundOrder.InboundOrderNo).ExecuteCommand();
			}
			else
			{
			_inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 2, Remark = response.ErrorMessage })
			.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
			_inboundOrderDetailService.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 2 })
			.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
			}
			}
			}
			else if (inboundOrder.OrderType == InOrderTypeEnum.ReCheck.ObjToInt()) //éæ£å¥åº
			{
			//ä¸éè¦åä¼ ãå ä¸ä¸ªä½ç½®ã
			}
			else if (inboundOrder.OrderType == InOrderTypeEnum.InternalAllocat.ObjToInt()) //æºä»è°æºä»
			{
			_logger.LogInformation($"InboundTaskCompleted ååMES : {inboundOrder.InboundOrderNo} ,ordertype: {InOrderTypeEnum.InternalAllocat.ObjToInt()} ");
			// BusinessTypeEnum.æºä»è°æºä»
			if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.å¥åºå®æ.ObjToInt())
			{
			var allocate = _allocateService.Repository.QueryData(x => x.OrderNo == inboundOrder.InboundOrderNo).First();
			var allocatefeedmodel = new AllocateDto
			{
			ReqCode = Guid.NewGuid().ToString(),
			ReqTime = DateTime.Now.ToString(),
			BusinessType = BusinessTypeEnum.æºä»è°æºä».ObjToInt().ToString(),
			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.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.BarcodeUnit
			}).ToList()
			}).ToList();
			allocatefeedmodel.Details = groupedData;

			var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
			if (feedbackresult != null && feedbackresult.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
			{
			@@ -452,8 +425,9 @@
			details = new List<FeedbackInboundDetailsModel>()

			};

			var groupedData = inboundOrder.Details.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			var query = inboundOrder.Details.AsQueryable();
			query = query.Where(item => item.ReturnToMESStatus == 0);
			var groupedData = query.GroupBy(item => new { item.MaterielCode, item.SupplyCode, item.BatchNo, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
			.Select(group => new FeedbackInboundDetailsModel
			{
			materialCode = group.Key.MaterielCode,
			@@ -482,6 +456,11 @@
			.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();
			//åä¼ æååºåæå¯ç¨
			_stockRepository.Db.Updateable<Dt_StockInfoDetail>().SetColumns(it => new Dt_StockInfoDetail
			{
			Status = StockStatusEmun.å¥åºå®æ.ObjToInt()
			}).Where(it => it.OrderNo == inboundOrder.InboundOrderNo).ExecuteCommand();
			}
			else
			{
			@@ -588,7 +567,11 @@

			stock.Details.ForEach(x =>
			{
			x.Status = StockStatusEmun.åºåºå®æ.ObjToInt();
			if (x.Status != StockStatusEmun.æå¨å»ç».ObjToInt())
			{
			x.Status = StockStatusEmun.åºåºå®æ.ObjToInt();
			}

			});

			_stockService.StockInfoService.Db.UpdateNav(stock).IncludesAllFirstLayer().ExecuteCommand();
			@@ -722,7 +705,11 @@
			var beforelocationStatus = locationInfo.LocationStatus;
			locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			_locationInfoService.Repository.UpdateData(locationInfo);

			stockInfo.Details.ForEach(x =>
			{
			x.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();
			});
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
			stockInfo.LocationCode = locationInfo.LocationCode;
			stockInfo.PalletCode = task.PalletCode;
			stockInfo.LocationCode = task.TargetAddress;
			@@ -737,15 +724,19 @@
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			Dt_OutboundOrder outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x=>x.Details).First();
			foreach (var item in stockInfo.Details.Where(x => x.OrderNo == outboundOrder.OrderNo).ToList())

			if(outboundOrder != null)
			{
			var inbounddetail = _allocateMaterialInfo.QueryFirst(x => x.OrderNo == item.OrderNo && x.Barcode == item.Barcode);
			if (inbounddetail != null)
			foreach (var item in stockInfo.Details.Where(x => x.OrderNo == outboundOrder.OrderNo).ToList())
			{
			var alldelete = _allocateMaterialInfo.DeleteAndMoveIntoHty(inbounddetail, OperateTypeEnum.èªå¨å é¤);
			if (!alldelete)
			var inbounddetail = _allocateMaterialInfo.QueryFirst(x => x.OrderNo == item.OrderNo && x.Barcode == item.Barcode);
			if (inbounddetail != null)
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			var alldelete = _allocateMaterialInfo.DeleteAndMoveIntoHty(inbounddetail, OperateTypeEnum.èªå¨å é¤);
			if (!alldelete)
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			}
			}
			}
			@@ -756,9 +747,9 @@
			string reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			string requestData = string.Empty;
			List<string> lineNos = new List<string>();
			if (outboundOrder.OrderStatus == OutOrderStatusEnum.åºåºå®æ.ObjToInt())
			Dt_AllocateMaterialInfo allocateMaterialInfo = _allocateMaterialInfo.QueryFirst(x => x.OrderNo == outboundOrder.OrderNo);
			if (outboundOrder.OrderStatus == OutOrderStatusEnum.åºåºå®æ.ObjToInt() && outboundOrder.OrderStatus == 0 && allocateMaterialInfo == null)
			{

			Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.OrderNo == outboundOrder.OrderNo);
			if (allocateOrder == null)
			{
			@@ -976,7 +967,10 @@
			{
			foreach (var detail in stockInfo.Details)
			{
			detail.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();
			if(detail.Status != StockStatusEmun.æå¨å»ç».ObjToInt()&& detail.Status != StockStatusEmun.éæ£ä¸.ObjToInt())
			{
			detail.Status = StockStatusEmun.å¥åºå®æ.ObjToInt();
			}
			detail.OutboundQuantity = 0;
			}
			_stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
			@@ -1980,6 +1974,101 @@
			return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
			}
			}

			/// <summary>
			/// éæ£å¥åºå®æ
			/// </summary>
			/// <param name="task"></param>
			/// <returns></returns>
			public async Task<WebResponseContent> InQualityTaskCompleted(Dt_Task task)
			{

			WebResponseContent content = new WebResponseContent();
			try
			{

			Dt_StockInfo stockInfo = await _stockRepository.Db.Queryable<Dt_StockInfo>()
			.Includes(x => x.Details)
			.Where(x => x.PalletCode == task.PalletCode)
			.FirstAsync();

			if (stockInfo == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°æçå¯¹åºçç»çä¿¡æ¯");
			}

			if (stockInfo.Details.Count == 0 && stockInfo.PalletType != PalletTypeEnum.Empty.ObjToInt())
			{
			_logger.LogInformation($"TaskService InPickTaskCompleted: æªæ¾å°è¯¥æçåºåæç»ä¿¡æ¯.{task.TaskNum}");
			return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥æçåºåæç»ä¿¡æ¯");
			}
			Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
			if (locationInfo == null)
			{
			return content.Error($"æªæ¾å°å¯¹åºçç»ç¹è´§ä½ä¿¡æ¯");
			}

			if (!string.IsNullOrEmpty(stockInfo.LocationCode))
			{
			return WebResponseContent.Instance.Error($"è¯¥æçå·²ç»å®è´§ä½");
			}
			if (locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			{
			return WebResponseContent.Instance.Error($"è´§ä½ç¶æä¸æ£ç¡®");
			}

			_unitOfWorkManage.BeginTran();

			var beforelocationStatus = locationInfo.LocationStatus;
			locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			_locationInfoService.Repository.UpdateData(locationInfo);

			stockInfo.LocationCode = locationInfo.LocationCode;
			stockInfo.PalletCode = task.PalletCode;
			stockInfo.LocationCode = task.TargetAddress;
			stockInfo.StockStatus = StockStatusEmun.å¥åºå®æ.ObjToInt();
			_stockRepository.UpdateData(stockInfo);

			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
			var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.èªå¨å®æ);
			_unitOfWorkManage.CommitTran();
			if (!result)
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			Dt_OutboundOrder outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();

			if (outboundOrder != null)
			{
			foreach (var item in stockInfo.Details.Where(x => x.OrderNo == outboundOrder.OrderNo).ToList())
			{
			var inbounddetail = _allocateMaterialInfo.QueryFirst(x => x.OrderNo == item.OrderNo && x.Barcode == item.Barcode);
			if (inbounddetail != null)
			{
			var alldelete = _allocateMaterialInfo.DeleteAndMoveIntoHty(inbounddetail, OperateTypeEnum.èªå¨å é¤);
			if (!alldelete)
			{
			await Db.Deleteable(task).ExecuteCommandAsync();
			}
			}
			}
			}
			try
			{
			_locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
			}
			catch (Exception ex)
			{
			_logger.LogInformation($"InEmptyTaskCompleted AddLocationStatusChangeRecord : {ex.Message} ");
			}
			return content;
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
			}
			}
			}
			}