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 | 230 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 184 insertions(+), 46 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 9c037f2..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"
@@ -16,7 +16,7 @@
public partial class LocationInfoService
{
- double weightValue_BC = 0.25;
+ double weightValue_BC = 0.5;
private readonly static object _locker_BC = new object();
static List<LocationCache> locationCaches_BC = new List<LocationCache>();
@@ -29,7 +29,7 @@
/// 鎵樼洏绫诲瀷
/// </param>
/// <returns></returns>
- public Dt_LocationInfo? AssignLocation_BC(string roadwayNo, PalletTypeEnum palletType, string beRelocationCode = "")
+ public Dt_LocationInfo? AssignLocation_BC(string roadwayNo, int palletType, Dt_PalletTypeInfo palletTypeInfo, string beRelocationCode = "", int heightType = 0)
{
lock (_locker_BC)
{
@@ -67,41 +67,165 @@
}
}
- //宸插畾涔夎揣浣嶇被鍨嬬殑璐т綅
- List<Dt_LocationInfo> definedTypeLocations = locationInfos.Where(x => x.LocationType == palletType.ObjToInt()).ToList();
+ 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.Row).ThenBy(x => x.Column).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.Row).ThenBy(x => x.Column).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 ((locationInfos.Count * weightValue_BC >= definedTypeLocations.Count && undefinedTypeEmptyLocations.Any()) || !definedTypeEmptyLocations.Any())//濡傛灉宸插畾涔夌被鍨嬭揣浣嶆湭瓒呰繃姣斾緥锛屼笖鏈夋湭瀹氫箟绫诲瀷鐨勮揣浣�
+ if (heightType == 1)
{
- if (palletType == PalletTypeEnum.LargePallet || palletType == PalletTypeEnum.LargestPallet)
- {
- undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => x.Depth % 2 == 1).ToList();
- }
- for (int i = 0; i < undefinedTypeEmptyLocations.Count; i++)
- {
- Dt_LocationInfo undefinedTypeEmptyLocation = undefinedTypeEmptyLocations[i];
- Dt_LocationInfo? locationInfo = GetUsableLocation_BC(locationInfos, undefinedTypeEmptyLocation, palletType);
- if (locationInfo != null)
- {
- locationCaches_BC.Add(new LocationCache { LocationCode = locationInfo.LocationCode, DateTime = DateTime.Now });
- return locationInfo;
- }
- }
+ 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)
+ {
+ // 浠呬繚鐣�5灞�
+ definedTypeEmptyLocations = allDefinedLocations.Where(x => x.Layer == 5).ToList();
+ undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => x.Layer == 5).ToList();
}
else
{
+ // 鍏朵粬heightType锛氭棤鍙敤璐т綅
+ definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => false).ToList();
+ undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => false).ToList();
+ }
+
+ if (palletTypeInfo.LocaitonCount == 2)
+ {
+ if (roadwayNo != "SC01_BC")
+ definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => x.Column % 2 == 1).ToList();
+ else
+ definedTypeEmptyLocations = definedTypeEmptyLocations.Where(x => x.Column % 2 == 0).ToList();
+ }
+
+ if (definedTypeEmptyLocations.Any())
+ {
for (int i = 0; i < definedTypeEmptyLocations.Count; i++)
{
- Dt_LocationInfo definedTypeEmptyLocation = definedTypeEmptyLocations[i];
- Dt_LocationInfo? locationInfo = GetUsableLocation_BC(locationInfos, definedTypeEmptyLocation, palletType);
- if (locationInfo != null)
+ Dt_LocationInfo currentLocation = definedTypeEmptyLocations[i];
+ Dt_LocationInfo? usableLocation = GetUsableLocation_BC(locationInfos, currentLocation, palletType, palletTypeInfo);
+
+ if (usableLocation?.Depth == 1)
{
- locationCaches_BC.Add(new LocationCache { LocationCode = locationInfo.LocationCode, DateTime = DateTime.Now });
- return locationInfo;
+ 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 (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)
+ {
+ if (roadwayNo != "SC01_BC")
+ undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => x.Column % 2 == 1).ToList();
+ else
+ undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => x.Column % 2 == 0).ToList();
+
+ for (int i = 0; i < undefinedTypeEmptyLocations.Count; i++)
+ {
+ Dt_LocationInfo currentLocation = undefinedTypeEmptyLocations[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;
+ }
}
}
}
@@ -116,22 +240,32 @@
/// <param name="emptyLocation"></param>
/// <param name="palletType"></param>
/// <returns></returns>
- private Dt_LocationInfo? GetUsableLocation_BC(List<Dt_LocationInfo> locationInfos, Dt_LocationInfo emptyLocation, PalletTypeEnum palletType)
+ private Dt_LocationInfo? GetUsableLocation_BC(List<Dt_LocationInfo> locationInfos, Dt_LocationInfo emptyLocation, int palletType, Dt_PalletTypeInfo palletTypeInfo)
{
- switch (palletType)
+
+ if (palletTypeInfo.LocaitonCount == 2)
{
- case PalletTypeEnum.LargestPallet:
- case PalletTypeEnum.LargePallet:
- if (emptyLocation.Depth % 2 == 0)
+ Dt_LocationInfo? nearLocation = null;
+ if (emptyLocation.RoadwayNo != "SC01_BC" && emptyLocation.Column % 2 == 1)
+ nearLocation = locationInfos.FirstOrDefault(x => x.Row == emptyLocation.Row && x.Layer == emptyLocation.Layer && x.Depth == emptyLocation.Depth && x.Column == emptyLocation.Column - 1);
+ else if (emptyLocation.RoadwayNo == "SC01_BC" && emptyLocation.Column % 2 == 0)
+ nearLocation = locationInfos.FirstOrDefault(x => x.Row == emptyLocation.Row && x.Layer == emptyLocation.Layer && x.Depth == emptyLocation.Depth && x.Column == emptyLocation.Column + 1);
+ if (nearLocation != null && DepthLocationIsEmpty_BC(locationInfos, nearLocation) != null)
+ {
+ Dt_LocationInfo? locationInfo = DepthLocationIsEmpty_BC(locationInfos, emptyLocation);
+ if (locationInfo != null)
{
- return null;
+ return locationInfo;
}
- break;
+ }
}
- Dt_LocationInfo? locationInfo = DepthLocationIsEmpty_BC(locationInfos, emptyLocation, palletType);
- if (locationInfo != null)
+ else
{
- return locationInfo;
+ Dt_LocationInfo? locationInfo = DepthLocationIsEmpty_BC(locationInfos, emptyLocation);
+ if (locationInfo != null)
+ {
+ return locationInfo;
+ }
}
return null;
}
@@ -142,25 +276,29 @@
/// <param name="locationInfos"></param>
/// <param name="emptyLocation"></param>
/// <returns></returns>
- private Dt_LocationInfo? DepthLocationIsEmpty_BC(List<Dt_LocationInfo> locationInfos, Dt_LocationInfo emptyLocation, PalletTypeEnum palletType)
+ private Dt_LocationInfo? DepthLocationIsEmpty_BC(List<Dt_LocationInfo> locationInfos, Dt_LocationInfo emptyLocation)
{
List<Dt_LocationInfo> locations = GetGroupLocations(locationInfos, emptyLocation);
bool moreDepthFlag = false;
bool littleDepthFlag = false;
- switch (palletType)
+ if (emptyLocation.LocationType == 0)
{
- case PalletTypeEnum.LargestPallet:
- case PalletTypeEnum.LargePallet:
- List<Dt_LocationInfo> moreDepth = locations.Where(x => x.Depth > emptyLocation.Depth).ToList();
- moreDepthFlag = moreDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() && x.LocationStatus != LocationStatusEnum.PalletLock.ObjToInt()) == null;//鏌ヨ澶т簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓烘湁璐х殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娣辫揣浣嶆湁鏈浣跨敤鐨勬儏鍐�
+ List<Dt_LocationInfo> moreDepth = locations.Where(x => x.Depth > emptyLocation.Depth).ToList();
+ moreDepthFlag = moreDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.LocationType != 0) == null;//鏌ヨ澶т簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓烘湁璐х殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娣辫揣浣嶆湁鏈浣跨敤鐨勬儏鍐�
- List<Dt_LocationInfo> littleDepth = locations.Where(x => x.Depth <= emptyLocation.Depth).ToList();
- littleDepthFlag = littleDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.OnlyIn.ObjToInt() && x.EnableStatus != EnableStatusEnum.Normal.ObjToInt()) == null; //鏌ヨ灏忎簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓虹┖锛屼笖绂佺敤鐘舵�佷笉涓虹鐢ㄤ互鍙婂彧鍏ョ殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娴呰揣浣嶈浣跨敤鎴栬�呰绂佺敤鐨勬儏鍐�
- break;
+ List<Dt_LocationInfo> littleDepth = locations.Where(x => x.Depth <= emptyLocation.Depth).ToList();
+ littleDepthFlag = littleDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.LocationType != 0) == null; //鏌ヨ灏忎簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓虹┖锛屼笖绂佺敤鐘舵�佷笉涓虹鐢ㄤ互鍙婂彧鍏ョ殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娴呰揣浣嶈浣跨敤鎴栬�呰绂佺敤鐨勬儏鍐�
}
+ else
+ {
+ List<Dt_LocationInfo> moreDepth = locations.Where(x => x.Depth > emptyLocation.Depth).ToList();
+ moreDepthFlag = moreDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.LocationType != emptyLocation.LocationType) == null;//鏌ヨ澶т簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓烘湁璐х殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娣辫揣浣嶆湁鏈浣跨敤鐨勬儏鍐�
+ List<Dt_LocationInfo> littleDepth = locations.Where(x => x.Depth <= emptyLocation.Depth).ToList();
+ littleDepthFlag = littleDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.LocationType != emptyLocation.LocationType) == null; //鏌ヨ灏忎簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓虹┖锛屼笖绂佺敤鐘舵�佷笉涓虹鐢ㄤ互鍙婂彧鍏ョ殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娴呰揣浣嶈浣跨敤鎴栬�呰绂佺敤鐨勬儏鍐�
+ }
if (moreDepthFlag && littleDepthFlag)
{
return emptyLocation;
--
Gitblit v1.9.3