From e1dd1dc9ba7135e3d64a65587d6c1be2c3e18c5a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 25 六月 2025 11:01:22 +0800
Subject: [PATCH] 提交最新优化代码
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs | 106 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 25 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs"
index 7145284..2fc79e7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_GM.cs"
@@ -43,8 +43,8 @@
List<string> lockLocationCodes = locationCaches_GM.Select(x => x.LocationCode).ToList();
List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == roadwayNo);
- //鑾峰彇鎵�鏈変簩娣变綅璐т綅鏁版嵁
- List<Dt_LocationInfo> locationInfoDepth = Repository.QueryData(x => x.RoadwayNo == roadwayNo && x.Depth== locationInfos.Max(v=>v.Depth));
+ //鑾峰彇鎵�鏈夎揣浣嶆暟鎹�
+ List<Dt_LocationInfo> locationInfoDepth = Repository.QueryData(x => x.RoadwayNo == roadwayNo);
if (locationInfos == null || locationInfos.Count == 0)
{
throw new Exception($"鏈壘鍒拌宸烽亾鐨勮揣浣嶄俊鎭�,宸烽亾鍙�:{roadwayNo}");
@@ -58,22 +58,24 @@
throw new Exception($"鏈壘鍒拌揣浣嶄俊鎭�");
}
int maxDepth = locationInfos.Max(x => x.Depth);
- int mathCurrentRow = beRelocation.Row - Convert.ToInt32(Math.Ceiling(beRelocation.Row / maxDepth / 2.0)) * maxDepth * 2;
- if (mathCurrentRow <= maxDepth)
+ //int mathCurrentRow = beRelocation.Row - Convert.ToInt32(Math.Ceiling(beRelocation.Row / maxDepth / 2.0)) * maxDepth * 2;
+ //if (mathCurrentRow <= maxDepth)
+ //{
+ // locationInfos = locationInfos.Where(x => x.Row - Convert.ToInt32(Math.Ceiling(x.Row / maxDepth / 2.0)) * maxDepth * 2 <= maxDepth).ToList();
+
+ //}
+ //else
+ //{
+ // locationInfos = locationInfos.Where(x => x.Row - Convert.ToInt32(Math.Ceiling(x.Row / maxDepth / 2.0)) * maxDepth * 2 > maxDepth).ToList();
+
+ //}
+ if (beRelocation.Row <= maxDepth)
{
- locationInfos = locationInfos.Where(x => x.Row - Convert.ToInt32(Math.Ceiling(x.Row / maxDepth / 2.0)) * maxDepth * 2 <= maxDepth).ToList();
- if (beRelocation.Row> maxDepth)
- {
- locationInfos = locationInfos.Where(x=>x.Row>maxDepth).ToList();
- }
+ locationInfos = locationInfos.Where(x => x.Row <= maxDepth).ToList();
}
- else
+ else if (beRelocation.Row > maxDepth)
{
- locationInfos = locationInfos.Where(x => x.Row - Convert.ToInt32(Math.Ceiling(x.Row / maxDepth / 2.0)) * maxDepth * 2 > maxDepth).ToList();
- if (beRelocation.Row <= maxDepth)
- {
- locationInfos = locationInfos.Where(x => x.Row <= maxDepth).ToList();
- }
+ locationInfos = locationInfos.Where(x => x.Row > maxDepth).ToList();
}
}
@@ -93,7 +95,7 @@
Dt_LocationInfo? locationInfo = GetUsableLocation_GM(locationInfos, definedTypeEmptyLocation, palletType, palletTypeInfo);
if (locationInfo != null)
{
- if (locationInfo.Depth<locationInfoDepth.Max(x=>x.Depth) && palletTypeInfo.LocaitonCount<2)
+ if (locationInfo.Depth<locationInfoDepth.Max(x=>x.Depth))
{
Dt_LocationInfo? locationInfoExist = null;
int Column = locationInfo.Column;
@@ -103,11 +105,11 @@
}
if (locationInfo.Row - locationInfo.Depth == locationInfo.Depth)
{
- locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row-1) && x.Column== Column && x.Layer==locationInfo.Layer && x.LocationStatus==LocationStatusEnum.InStock.ObjToInt());
+ locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row-1) && x.Column== Column && x.Layer==locationInfo.Layer);
}
else
{
- locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row + 1) && x.Column == Column && x.Layer == locationInfo.Layer && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
+ locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row + 1) && x.Column == Column && x.Layer == locationInfo.Layer);
}
//鑾峰彇娣变綅璐т綅绫诲瀷
if (locationInfoExist==null)
@@ -115,11 +117,38 @@
continue;
}
Dt_PalletTypeInfo palletTypeInfoDepth = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.WarehouseId == locationInfoExist.WarehouseId && x.PalletType == locationInfoExist.LocationType);
- if (palletTypeInfoDepth == null)
+ if (palletTypeInfoDepth != null && palletTypeInfoDepth.LocaitonCount != palletTypeInfo.LocaitonCount)
{
continue;
}
- if (palletTypeInfoDepth.LocaitonCount==2 && palletTypeInfo.LocaitonCount==1)
+ }
+ else
+ {
+ Dt_LocationInfo? locationInfoExist = null;
+ int Column = locationInfo.Column;
+ if (Column % 2 == 0)
+ {
+ Column -= 1;
+ }
+ if (locationInfo.Row % 2 == 0)
+ {
+ locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row - 1) && x.Column == Column && x.Layer == locationInfo.Layer);
+ }
+ else
+ {
+ locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row + 1) && x.Column == Column && x.Layer == locationInfo.Layer);
+ }
+ //鑾峰彇娣变綅璐т綅绫诲瀷
+ if (locationInfoExist == null)
+ {
+ continue;
+ }
+ Dt_PalletTypeInfo palletTypeInfoDepth = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.WarehouseId == locationInfoExist.WarehouseId && x.PalletType == locationInfoExist.LocationType);
+ if (palletTypeInfoDepth != null && palletTypeInfoDepth.LocaitonCount != palletTypeInfo.LocaitonCount)
+ {
+ continue;
+ }
+ if (locationInfoExist.LocationStatus!=LocationStatusEnum.Free.ObjToInt() || locationInfoExist.EnableStatus!= EnableStatusEnum.Normal.ObjToInt())
{
continue;
}
@@ -144,7 +173,7 @@
Dt_LocationInfo? locationInfo = GetUsableLocation_GM(locationInfos, undefinedTypeEmptyLocation, palletType, palletTypeInfo);
if (locationInfo != null)
{
- if (locationInfo.Depth < locationInfoDepth.Max(x => x.Depth) && palletTypeInfo.LocaitonCount < 2)
+ if (locationInfo.Depth < locationInfoDepth.Max(x => x.Depth))
{
Dt_LocationInfo? locationInfoExist = null;
int Column = locationInfo.Column;
@@ -154,11 +183,11 @@
}
if (locationInfo.Row - locationInfo.Depth == locationInfo.Depth)
{
- locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row - 1) && x.Column == Column && x.Layer == locationInfo.Layer && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
+ locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row - 1) && x.Column == Column && x.Layer == locationInfo.Layer);
}
else
{
- locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row + 1) && x.Column == Column && x.Layer == locationInfo.Layer && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
+ locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row + 1) && x.Column == Column && x.Layer == locationInfo.Layer);
}
//鑾峰彇娣变綅璐т綅绫诲瀷
if (locationInfoExist == null)
@@ -166,11 +195,38 @@
continue;
}
Dt_PalletTypeInfo palletTypeInfoDepth = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.WarehouseId == locationInfoExist.WarehouseId && x.PalletType == locationInfoExist.LocationType);
- if (palletTypeInfoDepth == null)
+ if (palletTypeInfoDepth != null && palletTypeInfoDepth.LocaitonCount != palletTypeInfo.LocaitonCount)
{
continue;
}
- if (palletTypeInfoDepth.LocaitonCount == 2)
+ }
+ else
+ {
+ Dt_LocationInfo? locationInfoExist = null;
+ int Column = locationInfo.Column;
+ if (Column % 2 == 0)
+ {
+ Column -= 1;
+ }
+ if (locationInfo.Row % 2 == 0)
+ {
+ locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row - 1) && x.Column == Column && x.Layer == locationInfo.Layer);
+ }
+ else
+ {
+ locationInfoExist = locationInfoDepth.FirstOrDefault(x => x.Row == (locationInfo.Row + 1) && x.Column == Column && x.Layer == locationInfo.Layer);
+ }
+ //鑾峰彇娣变綅璐т綅绫诲瀷
+ if (locationInfoExist == null)
+ {
+ continue;
+ }
+ Dt_PalletTypeInfo palletTypeInfoDepth = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.WarehouseId == locationInfoExist.WarehouseId && x.PalletType == locationInfoExist.LocationType);
+ if (palletTypeInfoDepth != null && palletTypeInfoDepth.LocaitonCount != palletTypeInfo.LocaitonCount)
+ {
+ continue;
+ }
+ if (locationInfoExist.LocationStatus != LocationStatusEnum.Free.ObjToInt() || locationInfoExist.EnableStatus != EnableStatusEnum.Normal.ObjToInt())
{
continue;
}
--
Gitblit v1.9.3