From 8f9b9411ca279670bd85fcfa7763987295ed9abf Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期五, 10 四月 2026 10:55:38 +0800
Subject: [PATCH] 空桶入出扩展开发
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
index 1dac80b..917e5c8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
@@ -98,16 +98,16 @@
//绌烘《鍒嗛厤
if (k == 1)
{
- locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free).OrderBy(x => x.Layer).First();
+ locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free).OrderBy(x => x.Column).OrderBy(x => x.Layer).First();
}
//椋熷搧鍖哄垎閰�
else if(k == 2)
{
- locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Food).OrderByDescending(x=>x.Column).First();
+ locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Food).OrderBy(x=>x.Column).OrderBy(x => x.Layer).First();
}
//宸ヤ笟鍖哄垎閰�
else if(k == 3){
- locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Industry).OrderBy(x=>x.Column).First();
+ locationInfo = BaseDal.QueryData(x => x.EnableStatus == (int)EnableStatusEnum.Normal && x.LocationStatus == (int)LocationStatusEnum.Free && x.LocationType == (int)LocationTypeEnum.Industry).OrderBy(x=>x.Column).OrderBy(x => x.Layer).First();
}
return locationInfo;
}
@@ -140,11 +140,6 @@
locationInfos.Add(locationInfo);
}
return locationInfos;
- }
-
- public override PageGridData<Dt_LocationInfo> GetPageData(PageDataOptions options)
- {
- return base.GetPageData(options);
}
//鍓嶇椤甸潰鍥剧墖鏄剧ず
--
Gitblit v1.9.3