diff --git a/ZR.Model/MES/wms/AgvLocation.cs b/ZR.Model/MES/wms/AgvLocation.cs index 70596d53..43bb769b 100644 --- a/ZR.Model/MES/wms/AgvLocation.cs +++ b/ZR.Model/MES/wms/AgvLocation.cs @@ -17,6 +17,15 @@ namespace ZR.Model.MES.wms [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } + + /// + /// 区域 + /// + [SugarColumn(ColumnName = "area_code")] + public int? AreaCode { get; set; } + + + /// /// 区域 /// diff --git a/ZR.Service/mes/wms/WmAGVService.cs b/ZR.Service/mes/wms/WmAGVService.cs index e6c8e558..402f53bb 100644 --- a/ZR.Service/mes/wms/WmAGVService.cs +++ b/ZR.Service/mes/wms/WmAGVService.cs @@ -113,7 +113,7 @@ namespace ZR.Service.Business public List GetAGV_position_list(AgvLocation location) { var predicate = Expressionable.Create() - .AndIF(string.IsNullOrEmpty(location.Area), it => it.Area == location.Area) + .AndIF(location.AreaCode>-1, it => it.AreaCode == location.AreaCode) .AndIF(location.Type > -1, it => it.Type == location.Type) .AndIF(string.IsNullOrEmpty(location.Coordinate), it => it.Coordinate == location.Coordinate);