From 67d4e9ca4267049cc67cff15828080d2d5dfce0b Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期三, 01 四月 2026 16:23:01 +0800
Subject: [PATCH] 1

---
 WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs |   18 +++++++++++-------
 1 files changed, 11 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..92009dd 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs
@@ -29,26 +29,30 @@
             {
                 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),
+                "SC01_CP" => AssignLocation_CP(roadwayNo, palletType, palletTypeInfo, beRelocationCode, heightType),
+                "SC02_CP" => AssignLocation_CP(roadwayNo, palletType, palletTypeInfo, beRelocationCode, heightType),
+                "SC01_YS" => AssignLocation_YS(roadwayNo, palletType, palletTypeInfo, beRelocationCode, heightType),
+                "SC01_DW" => AssignLocation_FL(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 +98,7 @@
         //    }
         //}
 
- 
+
 
 
         /// <summary>

--
Gitblit v1.9.3