This commit is contained in:
霍尔 committed 2023-10-26 09:55:15 +08:00
1 parent 523dee5e38
commit f9bf7be066
12 files changed
+635 -42

No files matched your search

@@ -187,7 +187,7 @@ namespace HHWMS.Web
}
if (station != null && count > 0)
{
var container = _unitwork.Find<Location>(x => x.Row == station.Row && x.ZoneCode == LocationTypeEnum.盘料库位
var container = _unitwork.Find<Location>(x => x.Row == station.Row && x.Type == LocationTypeEnum.盘料库位
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器) && x.Length == Length && !x.IsStop)
.OrderByDescending(x => x.Length - x.Width).FirstOrDefault();
if (Length == 23 && container == null && station.Row == 3)
@@ -195,9 +195,10 @@ namespace HHWMS.Web
station = _unitwork.Find<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位)
&& x.Status != LocationStatus.任务锁 && x.Row == 1).FirstOrDefault();
container = _unitwork.Find<Location>(x => x.Row == station.Row && x.ZoneCode == LocationTypeEnum.盘料库位
container = _unitwork.Find<Location>(x => x.Row == station.Row && x.Type == LocationTypeEnum.盘料库位
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器) && x.Length == Length && !x.IsStop)
.OrderByDescending(x => x.Length - x.Width).FirstOrDefault();
}
if(station != null && container != null)
{