From dab0a583302f306d8c0ec37fbae37c9b4e37e473 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 十二月 2025 18:46:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu
---
WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs b/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs
index c0ddb50..5e15212 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs
@@ -29,26 +29,27 @@
{
throw new Exception($"鏈壘鍒颁粨搴撲俊鎭�");
}
- Dt_PalletTypeInfo? palletTypeInfo = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.PalletType == palletType && x.WarehouseId == warehouseId);
+ Dt_PalletTypeInfo? palletTypeInfo = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.PalletType == palletType);
if (palletTypeInfo == null)
{
- if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ToString())
- {
+ //if (warehouse.WarehouseCode == WarehouseEnum.SC01_BC.ToString())
+ //{
palletTypeInfo = new Dt_PalletTypeInfo()
{
LocaitonCount = 1,
PalletType = 1,
IsOdd = false,
};
- }
- else
- throw new Exception($"璇烽厤缃墭鐩樼被鍨嬩俊鎭�");
+ //}
+ //else
+ // throw new Exception($"璇烽厤缃墭鐩樼被鍨嬩俊鎭�");
}
return warehouse.WarehouseCode switch
{
"SC01_BC" => AssignLocation_BC(roadwayNo, palletType, palletTypeInfo, beRelocationCode, heightType),
"SC02_BC" => AssignLocation_BC(roadwayNo, palletType, palletTypeInfo, beRelocationCode, heightType),
+ "TestJCLK" => AssignLocation_CP(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),
@@ -94,7 +95,7 @@
// }
//}
-
+
/// <summary>
--
Gitblit v1.9.3