From 75dcfe564467731b993519eb59ce330703ed1d5b Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期六, 25 四月 2026 16:26:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
index 53ef4b5..c9e31b3 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
@@ -141,7 +141,10 @@
var locations = await BaseDal.QueryDataAsync(x =>
x.EnableStatus == EnableStatusEnum.Normal.GetHashCode() &&
x.RoadwayNo == roadwayNo &&
- x.LocationStatus == LocationStatusEnum.Free.GetHashCode());
+ x.LocationStatus == LocationStatusEnum.Free.GetHashCode() &&
+ (roadwayNo.Contains("HC")
+ ? x.LocationType == (int)LocationTypeEnum.Capacity
+ : x.LocationType == (int)LocationTypeEnum.ShelfCapacity));
return locations?
.OrderByDescending(x => x.Depth) // 1. 娣卞害浼樺厛锛堜粠澶у埌灏忥級
--
Gitblit v1.9.3