From 67348f250a1b7970059698002949a5e0a5f3c52f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 14 八月 2025 08:51:04 +0800
Subject: [PATCH] 上传最新代码
---
项目代码/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs | 86 ++++++++++++++++++++-----------------------
1 files changed, 40 insertions(+), 46 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
index 6ac4be6..b4f28e1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
@@ -33,32 +33,25 @@
{
throw new Exception($"鏈壘鍒颁粨搴撲俊鎭�");
}
- 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())
- {
- palletTypeInfo = new Dt_PalletTypeInfo()
- {
- LocaitonCount = 1,
- PalletType = 0,
- IsOdd = false,
- };
- }
- else
- throw new Exception($"璇烽厤缃墭鐩樼被鍨嬩俊鎭�");
- }
+ //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())
+ // {
+ // palletTypeInfo = new Dt_PalletTypeInfo()
+ // {
+ // LocaitonCount = 1,
+ // PalletType = 0,
+ // IsOdd = false,
+ // };
+ // }
+ // else
+ // throw new Exception($"璇烽厤缃墭鐩樼被鍨嬩俊鎭�");
+ //}
return warehouse.WarehouseCode switch
{
- "HA57" => AssignLocation_BC(roadwayNo, palletType, palletTypeInfo, beRelocationCode, heightType),
- "HA58" => AssignLocation_PP(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
- "HA152" => AssignLocation_GM(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
- "HA64" => AssignLocation_CSJ(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
- "HA154" => AssignLocation_ZH(roadwayNo, palletType, palletTypeInfo, beRelocationCode),
- "HA153" => AssignLocation(roadwayNo),
- "HA71" or "HA72" or "HA73" => AssignLocation(roadwayNo),
- "HA60" => AssignLocation(roadwayNo),
+ "LLDCP" or "LLDYL"=> AssignLocation(roadwayNo),
_ => throw new Exception($"鏈壘鍒颁粨搴撹揣浣嶅垎閰嶆柟娉�")
};
}
@@ -87,8 +80,9 @@
Dictionary<string, OrderByType> orderBy = new Dictionary<string, OrderByType>()
{
+
+ { nameof(Dt_LocationInfo.Column),OrderByType.Desc },
{ nameof(Dt_LocationInfo.Layer),OrderByType.Asc },
- { nameof(Dt_LocationInfo.Column),OrderByType.Asc },
{ nameof(Dt_LocationInfo.Depth),OrderByType.Desc },
{ nameof(Dt_LocationInfo.Row),OrderByType.Asc }
};
@@ -273,21 +267,21 @@
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 (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA71.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
- {
- palletTypeInfo = new Dt_PalletTypeInfo()
- {
- LocaitonCount = 1,
- PalletType = 0,
- IsOdd = false,
- };
- }
- else
- throw new Exception($"璇烽厤缃墭鐩樼被鍨嬩俊鎭�");
- }
+ //Dt_PalletTypeInfo? palletTypeInfo = palletTypeInfos.FirstOrDefault(x => x.PalletType == palletType && x.WarehouseId == warehousId);
+ //if (palletTypeInfo == null || warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
+ //{
+ // if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA71.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
+ // {
+ // palletTypeInfo = new Dt_PalletTypeInfo()
+ // {
+ // LocaitonCount = 1,
+ // PalletType = 0,
+ // IsOdd = false,
+ // };
+ // }
+ // else
+ // throw new Exception($"璇烽厤缃墭鐩樼被鍨嬩俊鎭�");
+ //}
List<Dt_LocationInfo> locations = GetGroupLocations(locationInfos, location);
if (locationInfos.Max(x => x.Depth) < 3)
{
@@ -332,14 +326,14 @@
if (palletTypeInfos.FirstOrDefault(x => x.LocaitonCount == 2) != null)
{
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);
- }
- else
- {
+ //if (palletTypeInfo.IsOdd)
+ //{
+ // 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 (nearLocation!=null && location.RoadwayNo.Contains("BC"))
{
--
Gitblit v1.9.3