ZhongRui/ALDbanyunxiangmu.git

			@@ -159,7 +159,7 @@
			foreach (var key in keys)
			{
			var detail = _outboundOrderDetailService.Db.Ado.SqlQuerySingle<Dt_OutboundOrderDetail>(
			"SELECT * FROM Dt_OutboundOrderDetail WITH (UPDLOCK, ROWLOCK) WHERE Id = @Id",
			"SELECT * FROM Dt_OutboundOrderDetail WITH (UPDLOCK) WHERE Id = @Id",
			new { Id = key });

			if (detail != null)
			@@ -387,7 +387,6 @@
			// TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,

			};
			//if (taskType != TaskTypeEnum.OutEmpty)
			//{
			@@ -403,51 +402,7 @@
			return tasks;
			}

			public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType)
			{
			List<Dt_Task> tasks = new List<Dt_Task>();
			List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => stockInfos.Select(x => x.LocationCode).Contains(x.LocationCode));
			for (int i = 0; i < stockInfos.Count; i++)
			{
			Dt_StockInfo stockInfo = stockInfos[i];

			if (stockInfo != null)
			{
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == stockInfo.LocationCode);
			if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
			{
			Dt_Task task = new()
			{
			CurrentAddress = stockInfo.LocationCode,
			Grade = 0,
			PalletCode = stockInfo.PalletCode,
			NextAddress = "",
			Roadway = locationInfo.RoadwayNo,
			SourceAddress = stockInfo.LocationCode,
			TargetAddress = "",
			TaskStatus = TaskStatusEnum.New.ObjToInt(),
			TaskType = taskType.ObjToInt(),
			//TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
			PalletType = stockInfo.PalletType,
			WarehouseId = stockInfo.WarehouseId,

			};
			//if (taskType != TaskTypeEnum.OutEmpty)
			//{
			// task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
			// task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
			// task.BatchNo = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
			//}
			//if (stockInfo.StockLength > 0)
			//{
			// task.TaskLength = stockInfo.StockLength;
			//}
			tasks.Add(task);
			}
			}
			}
			return tasks;
			}

			#region 鍐呭瓨閿佺鐞嗗櫒
			private static readonly ConcurrentDictionary<string, SemaphoreSlim> _normalmaterialLocks =
			@@ -713,7 +668,8 @@
			Dt_OutboundOrderDetail? orderDetail = null;
			List<Dt_OutStockLockInfo>? outStockLockInfos = null;
			List<Dt_LocationInfo>? locationInfos = null;
			if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt() \|\|
			outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Outbound.ObjToInt())
			{
			(List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
			if (result.Item1 != null && result.Item1.Count > 0)
			@@ -749,7 +705,7 @@
			if (stockLockInfos != null && stockLockInfos.Count > 0)
			{
			List<Dt_StockInfo> stocks = _stockService.StockInfoService.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
			tasks = GetTasks(stocks, TaskTypeEnum.Outbound);
			tasks = GetTasks(stocks, TaskTypeEnum.Outbound,station);
			}
			}

			@@ -1001,7 +957,7 @@
			List<Dt_Task> tasks = new List<Dt_Task>();

			// 鑾峰彇璁㈠崟鏄庣粏
			var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().With("UPDLOCK, ROWLOCK")
			var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().With("UPDLOCK")
			.FirstAsync(x => x.Id == orderDetailId);

			if (outboundOrderDetail == null)