MeiRuiAn/HuaiAn.git

			@@ -55,9 +55,9 @@
			"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),
			_ => throw new Exception($"æªæ¾å°ä»åºè´§ä½åéæ¹æ³")
			};
			@@ -119,153 +119,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)
			{
			@@ -334,16 +334,34 @@
			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)