Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs

@@ -110,7 +110,7 @@ namespace ZR.Admin.WebApi.Controllers
         }
 
         /// <summary>
-        /// 5. 获取agv位置
+        /// 6 获取agv 起点和终点
         /// </summary>
         /// <param name="taskId"></param>
         /// <returns></returns>

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; }
 
+
+        /// <summary>
+        /// 区域 
+        /// </summary>
+       [SugarColumn(ColumnName = "area_code")]
+        public int? AreaCode { get; set; }
+
+
+
         /// <summary>
         /// 区域 
         /// </summary>

ZR.Service/mes/wms/WmAGVService.cs

@@ -113,7 +113,7 @@ namespace ZR.Service.Business
         public List<AgvLocation> GetAGV_position_list(AgvLocation location)
         {
             var predicate = Expressionable.Create<AgvLocation>()
-                .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);