From 3edc6956b30df3fc11025e0b719f320fcb1ec9c5 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 19 一月 2026 16:31:15 +0800
Subject: [PATCH] 更新出库线体配置，PP、干膜质检单独判断
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_BC.cs | 143 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 108 insertions(+), 35 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_BC.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_BC.cs"
index 5841275..63b766d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_BC.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_BC.cs"
@@ -67,31 +67,55 @@
}
}
+ List<Dt_LocationInfo> allDefinedLocations = locationInfos
+ .Where(x =>
+ (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) &&
+ x.LocationStatus == LocationStatusEnum.Free.ObjToInt() &&
+ x.LocationType == palletType.ObjToInt() &&
+ !lockLocationCodes.Contains(x.LocationCode)
+ )
+ .OrderByDescending(x => x.Depth)
+ .ThenBy(x => x.Layer)
+ .ThenBy(x => x.Column)
+ .ThenBy(x => x.Row)
+ .ToList();
- //鏈畾涔夌被鍨嬬殑绌鸿揣浣�
- List<Dt_LocationInfo> undefinedTypeEmptyLocations = locationInfos.Where(x => (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == LocationTypeEnum.Undefined.ObjToInt() && !lockLocationCodes.Contains(x.LocationCode)).OrderByDescending(x => x.Depth).ThenBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).ToList();
+ List<Dt_LocationInfo> undefinedTypeEmptyLocations = locationInfos
+ .Where(x =>
+ (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) &&
+ x.LocationStatus == LocationStatusEnum.Free.ObjToInt() &&
+ x.LocationType == LocationTypeEnum.Undefined.ObjToInt() &&
+ !lockLocationCodes.Contains(x.LocationCode)
+ )
+ .OrderByDescending(x => x.Depth)
+ .ThenBy(x => x.Layer)
+ .ThenBy(x => x.Column)
+ .ThenBy(x => x.Row)
+ .ToList();
- List<Dt_LocationInfo> definedTypeEmptyLocations = locationInfos.Where(x => (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == palletType.ObjToInt() && !lockLocationCodes.Contains(x.LocationCode)).OrderByDescending(x => x.Depth).ThenBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).ToList();
+ List<Dt_LocationInfo> definedTypeEmptyLocations = new List<Dt_LocationInfo>();
+ List<Dt_LocationInfo> definedLocations1_4 = new List<Dt_LocationInfo>(); // 1-4灞傚凡瀹氫箟璐т綅
+ List<Dt_LocationInfo> definedLocations5 = new List<Dt_LocationInfo>(); // 5灞傚凡瀹氫箟璐т綅
- if(heightType == 1)
+ if (heightType == 1)
{
- undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x=>x.Layer <= 3).ToList();
- definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => x.Layer <= 3).ToList();
+ definedLocations1_4 = allDefinedLocations.Where(x => x.Layer <= 4).ToList();
+ definedLocations5 = allDefinedLocations.Where(x => x.Layer == 5).ToList();
+ definedTypeEmptyLocations = definedLocations1_4;
+ // 鏈畾涔夌被鍨嬩粎淇濈暀1-4灞�
+ undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => x.Layer <= 4).ToList();
}
- else if(heightType == 2)
+ else if (heightType == 2)
{
- undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => x.Layer == 4).ToList();
- definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => x.Layer == 4).ToList();
- }
- else if (heightType == 3)
- {
+ // 浠呬繚鐣�5灞�
+ definedTypeEmptyLocations = allDefinedLocations.Where(x => x.Layer == 5).ToList();
undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => x.Layer == 5).ToList();
- definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => x.Layer == 5).ToList();
}
else
{
- undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => false).ToList();
+ // 鍏朵粬heightType锛氭棤鍙敤璐т綅
definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => false).ToList();
+ undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => false).ToList();
}
if (palletTypeInfo.LocaitonCount == 2)
@@ -106,25 +130,70 @@
{
for (int i = 0; i < definedTypeEmptyLocations.Count; i++)
{
- Dt_LocationInfo definedTypeEmptyLocation = definedTypeEmptyLocations[i];
- Dt_LocationInfo? locationInfo = GetUsableLocation_BC(locationInfos, definedTypeEmptyLocation, palletType, palletTypeInfo);
- //鍒ゆ柇璐т綅涓ゆ繁鍙婁互涓婃槸鍚﹀瓨鍦ㄥ嚭搴撻攣瀹氳揣浣�
- if (locationInfo?.Depth == 1)
+ Dt_LocationInfo currentLocation = definedTypeEmptyLocations[i];
+ Dt_LocationInfo? usableLocation = GetUsableLocation_BC(locationInfos, currentLocation, palletType, palletTypeInfo);
+
+ if (usableLocation?.Depth == 1)
{
- Dt_LocationInfo? IsBebusyLocation = locationInfos.Where(x => x.Row == (locationInfo?.Row == 2 ? locationInfo?.Row - 1 : locationInfo?.Row + 1) && x.Column==locationInfo?.Column && x.Layer== locationInfo?.Layer).FirstOrDefault();
- if (IsBebusyLocation!=null && (IsBebusyLocation.LocationStatus<LocationStatusEnum.InStock.ObjToInt()))
+ int oppositeRow = usableLocation.Row == 2 ? usableLocation.Row - 1 : usableLocation.Row + 1;
+ Dt_LocationInfo? oppositeLocation = locationInfos.FirstOrDefault(x =>
+ x.Row == oppositeRow &&
+ x.Column == usableLocation.Column &&
+ x.Layer == usableLocation.Layer
+ );
+ if (oppositeLocation != null && (oppositeLocation.LocationStatus < LocationStatusEnum.InStock.ObjToInt()))
{
continue;
}
}
- if (locationInfo != null)
+
+ if (usableLocation != null)
{
- locationCaches_BC.Add(new LocationCache { LocationCode = locationInfo.LocationCode, DateTime = DateTime.Now });
- return locationInfo;
+ locationCaches_BC.Add(new LocationCache { LocationCode = usableLocation.LocationCode, DateTime = DateTime.Now });
+ return usableLocation;
}
}
}
- if ((/*locationInfos.Count * weightValue_BC >= definedTypeLocations.Count &&*/ undefinedTypeEmptyLocations.Any()))//濡傛灉宸插畾涔夌被鍨嬭揣浣嶆湭瓒呰繃姣斾緥锛屼笖鏈夋湭瀹氫箟绫诲瀷鐨勮揣浣�
+
+ if (heightType == 1 && definedLocations5.Any())
+ {
+ List<Dt_LocationInfo> filtered5Locations = definedLocations5;
+ if (palletTypeInfo.LocaitonCount == 2)
+ {
+ if (roadwayNo != "SC01_BC")
+ filtered5Locations = filtered5Locations.Where(x => x.Column % 2 == 1).ToList();
+ else
+ filtered5Locations = filtered5Locations.Where(x => x.Column % 2 == 0).ToList();
+ }
+
+ for (int i = 0; i < filtered5Locations.Count; i++)
+ {
+ Dt_LocationInfo currentLocation = filtered5Locations[i];
+ Dt_LocationInfo? usableLocation = GetUsableLocation_BC(locationInfos, currentLocation, palletType, palletTypeInfo);
+
+ if (usableLocation?.Depth == 1)
+ {
+ int oppositeRow = usableLocation.Row == 2 ? usableLocation.Row - 1 : usableLocation.Row + 1;
+ Dt_LocationInfo? oppositeLocation = locationInfos.FirstOrDefault(x =>
+ x.Row == oppositeRow &&
+ x.Column == usableLocation.Column &&
+ x.Layer == usableLocation.Layer
+ );
+ if (oppositeLocation != null && (oppositeLocation.LocationStatus < LocationStatusEnum.InStock.ObjToInt()))
+ {
+ continue;
+ }
+ }
+
+ if (usableLocation != null)
+ {
+ locationCaches_BC.Add(new LocationCache { LocationCode = usableLocation.LocationCode, DateTime = DateTime.Now });
+ return usableLocation;
+ }
+ }
+ }
+
+ if (undefinedTypeEmptyLocations.Any() && palletType != PalletTypeEnum.SmallPallet.ObjToInt())
{
if (palletTypeInfo.LocaitonCount == 2)
{
@@ -135,26 +204,30 @@
for (int i = 0; i < undefinedTypeEmptyLocations.Count; i++)
{
- Dt_LocationInfo undefinedTypeEmptyLocation = undefinedTypeEmptyLocations[i];
- Dt_LocationInfo? locationInfo = GetUsableLocation_BC(locationInfos, undefinedTypeEmptyLocation, palletType, palletTypeInfo);
- //鍒ゆ柇璐т綅涓ゆ繁鍙婁互涓婃槸鍚﹀瓨鍦ㄥ嚭搴撻攣瀹氳揣浣�
- if (locationInfo?.Depth == 1)
+ Dt_LocationInfo currentLocation = undefinedTypeEmptyLocations[i];
+ Dt_LocationInfo? usableLocation = GetUsableLocation_BC(locationInfos, currentLocation, palletType, palletTypeInfo);
+
+ if (usableLocation?.Depth == 1)
{
- Dt_LocationInfo? IsBebusyLocation = locationInfos.Where(x => x.Row == (locationInfo?.Row == 2 ? locationInfo?.Row - 1 : locationInfo?.Row + 1) && x.Column == locationInfo?.Column && x.Layer == locationInfo?.Layer).FirstOrDefault();
- if (IsBebusyLocation != null && (IsBebusyLocation.LocationStatus < LocationStatusEnum.InStock.ObjToInt()))
+ int oppositeRow = usableLocation.Row == 2 ? usableLocation.Row - 1 : usableLocation.Row + 1;
+ Dt_LocationInfo? oppositeLocation = locationInfos.FirstOrDefault(x =>
+ x.Row == oppositeRow &&
+ x.Column == usableLocation.Column &&
+ x.Layer == usableLocation.Layer
+ );
+ if (oppositeLocation != null && (oppositeLocation.LocationStatus < LocationStatusEnum.InStock.ObjToInt()))
{
continue;
}
}
- if (locationInfo != null)
+
+ if (usableLocation != null)
{
- //UpdateLocationStatus(locationInfo, palletType, LocationStatusEnum.Lock, locationInfo.WarehouseId);
- locationCaches_BC.Add(new LocationCache { LocationCode = locationInfo.LocationCode, DateTime = DateTime.Now });
- return locationInfo;
+ locationCaches_BC.Add(new LocationCache { LocationCode = usableLocation.LocationCode, DateTime = DateTime.Now });
+ return usableLocation;
}
}
}
-
}
return null;
}
--
Gitblit v1.9.3