From 821af8301009019a0f0e81a3ea2a0ae7952b5025 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 28 一月 2026 11:43:30 +0800
Subject: [PATCH] 更新
---
项目代码/WCSServices/WIDESEAWCS_BasicInfoService/LocationInfoService.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_BasicInfoService/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_BasicInfoService/LocationInfoService.cs"
index a554c4e..8d7a4d8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_BasicInfoService/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_BasicInfoService/LocationInfoService.cs"
@@ -112,7 +112,21 @@
{ nameof(Dt_LocationInfo.Columns),OrderByType.Desc },
};
- Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode), orderBy);//鏌ヨ绌鸿揣浣嶄俊鎭苟鎺掗櫎5鍒嗛挓鍐呭垎閰嶇殑璐т綅,鏍规嵁灞傘�佸垪銆佹繁搴︺�佽鎺掑簭
+ //Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode), orderBy);//鏌ヨ绌鸿揣浣嶄俊鎭苟鎺掗櫎5鍒嗛挓鍐呭垎閰嶇殑璐т綅,鏍规嵁灞傘�佸垪銆佹繁搴︺�佽鎺掑簭
+ // 鍚堝苟鏌ヨ鏉′欢锛屼紭鍏�44~48鍒楋紝鑻ユ棤鍒欐煡鍏ㄩ儴
+ Dt_LocationInfo locationInfo = BaseDal.QueryFirst(
+ x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt()
+ && !lockLocations.Contains(x.LocationCode)
+ && (x.Columns >= 44 && x.Columns <= 48), // 浼樺厛44~48鍒楃殑鏉′欢
+ orderBy)
+ ??
+ BaseDal.QueryFirst(
+ x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt()
+ && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt()
+ && !lockLocations.Contains(x.LocationCode),
+ orderBy);
+
if (locationInfo!=null)
{
LocationCache locationCache = new LocationCache()
--
Gitblit v1.9.3