MeiRuiAn/HuaiAn.git

			@@ -36,7 +36,7 @@
			Dt_PalletTypeInfo? palletTypeInfo = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.PalletType == palletType && x.WarehouseId == warehouseId);
			if (palletTypeInfo == null)
			{
			if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() && warehouse.WarehouseCode == WarehouseEnum.HA71.ToString() && warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
			if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() \|\| warehouse.WarehouseCode == WarehouseEnum.HA71.ToString())
			{
			palletTypeInfo = new Dt_PalletTypeInfo()
			{
			@@ -55,10 +55,11 @@
			"HA58" => AssignLocation_PP(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
			"HA152" => AssignLocation_GM(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
			"HA64" => AssignLocation_CSJ(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
			"é»çä»" => AssignLocation_ZH(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
			"HA154" => AssignLocation_ZH(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
			"HA153" => AssignLocation(roadwayNo),
			"HA71" => AssignLocation(roadwayNo),
			"HA71" or "HA72" or "HA73" => AssignLocation(roadwayNo),
			"HA60" => AssignLocation(roadwayNo),
			"HA581" => AssignLocation_PPPK(roadwayNo,palletTypeInfo.PalletType),
			_ => throw new Exception($"æªæ¾å°ä»åºè´§ä½åéæ¹æ³")
			};
			}
			@@ -119,153 +120,153 @@
			/// <param name="location">è´§ä½å¯¹è±¡</param>
			/// <param name="palletType">æçç±»å</param>
			/// <param name="locationStatus">è´§ä½ç¶æ</param>
			public void UpdateLocationStatus2(Dt_LocationInfo location, int palletType, LocationStatusEnum locationStatus, int warehousId)
			{
			List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == location.RoadwayNo);
			//public void UpdateLocationStatus2(Dt_LocationInfo location, int palletType, LocationStatusEnum locationStatus, int warehousId)
			//{
			// List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == location.RoadwayNo);

			List<Dt_LocationInfo> locations = GetGroupLocations(locationInfos, location);
			if (locationInfos.Max(x => x.Depth) < 3)
			{
			for (int i = 0; i < locations.Count; i++)
			{
			if (locations[i].LocationType != palletType.ObjToInt())
			{
			locations[i].LocationType = palletType.ObjToInt();
			}
			// List<Dt_LocationInfo> locations = GetGroupLocations(locationInfos, location);
			// if (locationInfos.Max(x => x.Depth) < 3)
			// {
			// for (int i = 0; i < locations.Count; i++)
			// {
			// if (locations[i].LocationType != palletType.ObjToInt())
			// {
			// locations[i].LocationType = palletType.ObjToInt();
			// }

			if (locations[i].LocationCode == location.LocationCode)
			{
			locations[i].LocationStatus = locationStatus.ObjToInt();
			}
			else
			{
			if (locationStatus == LocationStatusEnum.Lock)
			{
			if (locations[i].LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			{
			locations[i].LocationStatus = LocationStatusEnum.InStockLock.ObjToInt();
			}
			else if (locations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
			{
			locations[i].LocationStatus = LocationStatusEnum.FreeLock.ObjToInt();
			}
			}
			else if (locationStatus == LocationStatusEnum.Free \|\| locationStatus == LocationStatusEnum.InStock)
			{
			if (locations[i].LocationStatus == LocationStatusEnum.InStockLock.ObjToInt())
			{
			locations[i].LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			}
			else if (locations[i].LocationStatus == LocationStatusEnum.FreeLock.ObjToInt())
			{
			locations[i].LocationStatus = LocationStatusEnum.Free.ObjToInt();
			}
			}
			}
			}
			// if (locations[i].LocationCode == location.LocationCode)
			// {
			// locations[i].LocationStatus = locationStatus.ObjToInt();
			// }
			// else
			// {
			// if (locationStatus == LocationStatusEnum.Lock)
			// {
			// if (locations[i].LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			// {
			// locations[i].LocationStatus = LocationStatusEnum.InStockLock.ObjToInt();
			// }
			// else if (locations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
			// {
			// locations[i].LocationStatus = LocationStatusEnum.FreeLock.ObjToInt();
			// }
			// }
			// else if (locationStatus == LocationStatusEnum.Free \|\| locationStatus == LocationStatusEnum.InStock)
			// {
			// if (locations[i].LocationStatus == LocationStatusEnum.InStockLock.ObjToInt())
			// {
			// locations[i].LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			// }
			// else if (locations[i].LocationStatus == LocationStatusEnum.FreeLock.ObjToInt())
			// {
			// locations[i].LocationStatus = LocationStatusEnum.Free.ObjToInt();
			// }
			// }
			// }
			// }

			Dt_LocationInfo? nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column + 1);
			if(location.RoadwayNo == "SC01_BC")
			{
			nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column - 1);
			}
			if (nearLocation != null)
			{
			List<Dt_LocationInfo> nearLocations = GetGroupLocations(locationInfos, nearLocation);
			for (int i = 0; i < nearLocations.Count; i++)
			{
			if (nearLocations[i].LocationType != palletType.ObjToInt())
			{
			nearLocations[i].LocationType = palletType.ObjToInt();
			}
			// Dt_LocationInfo? nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column + 1);
			// if(location.RoadwayNo == "SC01_BC")
			// {
			// nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column + 1);
			// }
			// if (nearLocation != null)
			// {
			// List<Dt_LocationInfo> nearLocations = GetGroupLocations(locationInfos, nearLocation);
			// for (int i = 0; i < nearLocations.Count; i++)
			// {
			// if (nearLocations[i].LocationType != palletType.ObjToInt())
			// {
			// nearLocations[i].LocationType = palletType.ObjToInt();
			// }

			if (palletType.ObjToInt() >= PalletTypeEnum.LargePallet.ObjToInt())
			{
			if (nearLocations[i].LocationCode == nearLocation.LocationCode)
			{
			nearLocations[i].LocationStatus = locationStatus.ObjToInt();
			}
			else
			{
			if (locationStatus == LocationStatusEnum.Lock)
			{
			if (nearLocations[i].LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			{
			nearLocations[i].LocationStatus = LocationStatusEnum.InStockLock.ObjToInt();
			}
			else if (nearLocations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
			{
			nearLocations[i].LocationStatus = LocationStatusEnum.FreeLock.ObjToInt();
			}
			}
			else if (locationStatus == LocationStatusEnum.InStock)
			{
			if (nearLocations[i].LocationStatus == LocationStatusEnum.InStockLock.ObjToInt())
			{
			nearLocations[i].LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			}
			else if (nearLocations[i].LocationStatus == LocationStatusEnum.FreeLock.ObjToInt())
			{
			nearLocations[i].LocationStatus = LocationStatusEnum.Free.ObjToInt();
			}
			}
			}
			}
			// if (palletType.ObjToInt() >= PalletTypeEnum.LargePallet.ObjToInt())
			// {
			// if (nearLocations[i].LocationCode == nearLocation.LocationCode)
			// {
			// nearLocations[i].LocationStatus = locationStatus.ObjToInt();
			// }
			// else
			// {
			// if (locationStatus == LocationStatusEnum.Lock)
			// {
			// if (nearLocations[i].LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			// {
			// nearLocations[i].LocationStatus = LocationStatusEnum.InStockLock.ObjToInt();
			// }
			// else if (nearLocations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
			// {
			// nearLocations[i].LocationStatus = LocationStatusEnum.FreeLock.ObjToInt();
			// }
			// }
			// else if (locationStatus == LocationStatusEnum.InStock)
			// {
			// if (nearLocations[i].LocationStatus == LocationStatusEnum.InStockLock.ObjToInt())
			// {
			// nearLocations[i].LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			// }
			// else if (nearLocations[i].LocationStatus == LocationStatusEnum.FreeLock.ObjToInt())
			// {
			// nearLocations[i].LocationStatus = LocationStatusEnum.Free.ObjToInt();
			// }
			// }
			// }
			// }

			}
			locations.AddRange(nearLocations);
			}
			}
			else
			{
			for (int i = 0; i < locations.Count; i++)
			{
			if (locations[i].LocationCode == location.LocationCode)
			{
			locations[i].LocationStatus = locationStatus.ObjToInt();
			}
			else
			{
			if (locationStatus == LocationStatusEnum.Lock)
			{
			if (locations[i].LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			{
			locations[i].LocationStatus = LocationStatusEnum.InStockLock.ObjToInt();
			}
			else if (locations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
			{
			locations[i].LocationStatus = LocationStatusEnum.FreeLock.ObjToInt();
			}
			}
			else if (locationStatus == LocationStatusEnum.Free \|\| locationStatus == LocationStatusEnum.InStock)
			{
			if (locations[i].LocationStatus == LocationStatusEnum.InStockLock.ObjToInt())
			{
			locations[i].LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			}
			else if (locations[i].LocationStatus == LocationStatusEnum.FreeLock.ObjToInt())
			{
			locations[i].LocationStatus = LocationStatusEnum.Free.ObjToInt();
			}
			}
			}
			if (locations[i].LocationType != palletType.ObjToInt())
			{
			locations[i].LocationType = palletType.ObjToInt();
			}
			}
			}
			// }
			// locations.AddRange(nearLocations);
			// }
			// }
			// else
			// {
			// for (int i = 0; i < locations.Count; i++)
			// {
			// if (locations[i].LocationCode == location.LocationCode)
			// {
			// locations[i].LocationStatus = locationStatus.ObjToInt();
			// }
			// else
			// {
			// if (locationStatus == LocationStatusEnum.Lock)
			// {
			// if (locations[i].LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			// {
			// locations[i].LocationStatus = LocationStatusEnum.InStockLock.ObjToInt();
			// }
			// else if (locations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
			// {
			// locations[i].LocationStatus = LocationStatusEnum.FreeLock.ObjToInt();
			// }
			// }
			// else if (locationStatus == LocationStatusEnum.Free \|\| locationStatus == LocationStatusEnum.InStock)
			// {
			// if (locations[i].LocationStatus == LocationStatusEnum.InStockLock.ObjToInt())
			// {
			// locations[i].LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			// }
			// else if (locations[i].LocationStatus == LocationStatusEnum.FreeLock.ObjToInt())
			// {
			// locations[i].LocationStatus = LocationStatusEnum.Free.ObjToInt();
			// }
			// }
			// }
			// if (locations[i].LocationType != palletType.ObjToInt())
			// {
			// locations[i].LocationType = palletType.ObjToInt();
			// }
			// }
			// }

			if (locations.Where(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()).Count() == locations.Count && locationStatus == LocationStatusEnum.Free)
			{
			locations.ForEach(x =>
			{
			x.LocationType = 0;
			});
			}
			// if (locations.Where(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()).Count() == locations.Count && locationStatus == LocationStatusEnum.Free)
			// {
			// locations.ForEach(x =>
			// {
			// x.LocationType = 0;
			// });
			// }

			Repository.UpdateData(locations);
			}
			// Repository.UpdateData(locations);
			//}

			public void UpdateLocationStatus(Dt_LocationInfo location, int palletType, LocationStatusEnum locationStatus, int warehousId)
			{
			@@ -274,9 +275,9 @@
			List<Dt_PalletTypeInfo> palletTypeInfos = _basicRepository.PalletTypeInfoRepository.QueryData(x => x.WarehouseId == warehousId);
			Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehousId);
			Dt_PalletTypeInfo? palletTypeInfo = palletTypeInfos.FirstOrDefault(x => x.PalletType == palletType && x.WarehouseId == warehousId);
			if (palletTypeInfo == null \|\| warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
			if (palletTypeInfo == null)
			{
			if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() \|\| warehouse.WarehouseCode == WarehouseEnum.HA71.ToString() \|\| warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
			if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() \|\| warehouse.WarehouseCode == WarehouseEnum.HA71.ToString())
			{
			palletTypeInfo = new Dt_PalletTypeInfo()
			{
			@@ -329,21 +330,39 @@
			}
			}

			if (palletTypeInfos.FirstOrDefault(x => x.LocaitonCount == 2) != null)
			if (palletTypeInfo.LocaitonCount == 2)
			{
			Dt_LocationInfo? nearLocation;
			if (palletTypeInfo.IsOdd)
			{
			nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column + 1);
			if (warehouse.WarehouseCode==WarehouseEnum.HA154.ToString())
			{
			nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column - 1);
			}
			else
			{
			nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column + 1);
			}
			}
			else
			{
			nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column - 1);
			}

			if (location.RoadwayNo == "SC01_BC")
			if (nearLocation!=null && location.RoadwayNo.Contains("BC"))
			{
			if (nearLocation?.LocationType == LocationTypeEnum.SmallPallet.ObjToInt())
			{
			nearLocation = null;
			}
			}
			if (location.RoadwayNo == "SC01_BC" && palletType != PalletTypeEnum.SmallPallet.ObjToInt())
			{
			nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column - 1);
			if (nearLocation?.LocationType == LocationTypeEnum.SmallPallet.ObjToInt())
			{
			nearLocation = null;
			}
			}

			if (nearLocation != null)
			@@ -446,8 +465,53 @@
			int row = location.Row;
			for (int j = location.Depth + 1; j <= maxDepth; j++)
			{
			row += 1;
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row);
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == (row + 1));
			#region æµè¯æ¶ãPPå¤æåç»è´§ä½
			if (j == 3 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 2 \|\| row == 5))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			}
			if (j == 3 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 3 \|\| row == 4))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 2);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 2);
			}
			}
			if (j == 2 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 1 \|\| row == 6))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			}
			if (j == 2 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 3 \|\| row == 4))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			}
			#endregion
			if (locationInfo != null)
			{
			groupLocations.Add(locationInfo);
			@@ -456,8 +520,42 @@

			for (int j = location.Depth - 1; j >= 1; j--)
			{
			row -= 1;
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row);
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == (row -1));
			#region æµè¯æ¶ãPPå¤æåç»è´§ä½
			if (j == 1 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 1 \|\| row == 6))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 2);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 2);
			}
			}
			if (j == 1 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 2 \|\| row == 5))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			}
			if (j == 2 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 1 \|\| row == 6))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			}
			#endregion
			if (locationInfo != null)
			{
			groupLocations.Add(locationInfo);
			@@ -480,8 +578,53 @@
			int row = location.Row;
			for (int j = location.Depth + 1; j <= maxDepth; j++)
			{
			row += 1;
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row);
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && (x.Row == row + 1 \|\| x.Row == row - 1));
			#region æµè¯æ¶ãPPå¤æåç»è´§ä½
			if (j == 3 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 2 \|\| row == 5))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			}
			if (j == 3 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 3 \|\| row == 4))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 2);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 2);
			}
			}
			if (j == 2 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 1 \|\| row == 6))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			}
			if (j == 2 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 3 \|\| row == 4))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			}
			#endregion
			if (locationInfo != null)
			{
			groupLocations.Add(locationInfo);
			@@ -490,8 +633,42 @@

			for (int j = location.Depth - 1; j >= 1; j--)
			{
			row -= 1;
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row);
			Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && (x.Row == row + 1 \|\| x.Row == row - 1));
			#region æµè¯æ¶ãPPå¤æåç»è´§ä½
			if (j == 1 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 1 \|\| row == 6))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 2);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 2);
			}
			}
			if (j == 1 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 2 \|\| row == 5))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			}
			if (j == 2 && (location.RoadwayNo.Contains("CSJ") \|\| location.RoadwayNo.Contains("PP")) && (row == 1 \|\| row == 6))
			{
			if (row <= maxDepth)
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row <= maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row + 1);
			}
			else
			{
			locationInfo = locationInfos.FirstOrDefault(x => x.Row > maxDepth && x.Depth == j && x.Column == location.Column && x.Layer == location.Layer && x.Row == row - 1);
			}
			}
			#endregion
			if (locationInfo != null)
			{
			groupLocations.Add(locationInfo);
			@@ -499,6 +676,34 @@
			}
			return groupLocations;
			}


			public Dt_LocationInfo? AssignLocation_PPPK(string roadwayNo, int palletType)
			{
			lock (_locker)
			{
			List<LocationCache> removeItems = locationCaches.Where(x => (DateTime.Now - x.DateTime).TotalMinutes > 5).ToList();//æ¥è¯¢æ·»å éæåéè¶è¿5åéçè´§ä½
			int count = removeItems.Count;
			for (int i = 0; i < count; i++)
			{
			locationCaches.Remove(removeItems[i]);//ç§»é¤æ¥è¯¢æ·»å éæåéè¶è¿5åéçè´§ä½
			}

			List<string> lockLocations = locationCaches.Select(x => x.LocationCode).ToList();

			List<Dt_LocationInfo> locationInfos = BaseDal.QueryData(x => x.RoadwayNo == roadwayNo);//æ¥è¯¢å··éææè´§ä½ä¿¡æ¯

			Dictionary<string, OrderByType> orderBy = new Dictionary<string, OrderByType>()
			{
			{ nameof(Dt_LocationInfo.Layer),OrderByType.Asc },
			{ nameof(Dt_LocationInfo.Column),OrderByType.Asc },
			{ nameof(Dt_LocationInfo.Depth),OrderByType.Desc },
			{ nameof(Dt_LocationInfo.Row),OrderByType.Asc }
			};

			return BaseDal.QueryFirst(x => x.RoadwayNo == roadwayNo && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && x.LocationType == palletType && !lockLocations.Contains(x.LocationCode), orderBy);
			}
			}
			}

			}