diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs index 2058143..468e6d6 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -520,6 +520,33 @@ namespace HHWMS.Web public ResponseResult GetMoveLocation(Location outter) { + + // 新增:单边位、单伸位直接查找空仓位 + var roadwayType = GetRoadwayType(outter.RoadWay); + if (roadwayType == 1 || roadwayType == 2) + { + var location = DC.Set() + .AsNoTracking() + .Where(l => l.RoadWay == outter.RoadWay + && l.Type == outter.Type + && l.ID != outter.ID + && !l.IsStop + && l.Status == LocationStatusEnum.未锁 + && l.ContainerStatus == LocationStatus.空仓位 + && l.RowFlag == RowFlagEnum.Outer + && l.Height >= outter.Height + && l.Code != null && l.Code != "") + .OrderBy(l => Math.Abs(outter.Line - l.Line)) + .ThenBy(l => l.Layer) + .FirstOrDefault(); + + if (location == null) + return ResponseResult.Error("找不到可用的移库仓位!"); + + return ResponseResult.Success( + new { LocationCode = location.Code }); + } + // 查找移库仓位 // 一次性获取所需的所有数据,避免多次查询数据库 var locationPairs = DC.Set()