diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
index 92232747..f4ad3071 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
@@ -3,6 +3,7 @@ using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
+using ZR.Service.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Service.mes.wms;
using ZR.Service.mes.wms.IService;
@@ -114,9 +115,15 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpGet("get_agv_position")]
- public IActionResult GetTask(string taskId)
+ public IActionResult GetAGV_position_list(AgvLocation location)
{
-
+ if(location == null)
+ {
+ return SUCCESS(null);
+ }
+ var response= _WmAGVService.GetAGV_position_list(location);
+
+ return SUCCESS(response);
}
}
diff --git a/ZR.Model/MES/wms/Dto/AGVtaskDto.cs b/ZR.Model/MES/wms/Dto/AGVtaskDto.cs
index 5bdae9dd..87e0fea8 100644
--- a/ZR.Model/MES/wms/Dto/AGVtaskDto.cs
+++ b/ZR.Model/MES/wms/Dto/AGVtaskDto.cs
@@ -11,6 +11,7 @@ namespace ZR.Model.MES.wms.Dto
public class QueryAGVPosition
{
+
}
public class AGVtaskDto
{
diff --git a/ZR.Service/mes/wms/IService/IWmAGVService.cs b/ZR.Service/mes/wms/IService/IWmAGVService.cs
index 5c4f0efb..bb7dbe89 100644
--- a/ZR.Service/mes/wms/IService/IWmAGVService.cs
+++ b/ZR.Service/mes/wms/IService/IWmAGVService.cs
@@ -17,5 +17,7 @@ namespace ZR.Service.mes.wms.IService
int AddAGVTask(AgvTask task);
int DeleteTask(string taskId);
+
+ List GetAGV_position_list(AgvLocation location);
}
}
diff --git a/ZR.Service/mes/wms/WmAGVService.cs b/ZR.Service/mes/wms/WmAGVService.cs
index 72a0e25b..e6c8e558 100644
--- a/ZR.Service/mes/wms/WmAGVService.cs
+++ b/ZR.Service/mes/wms/WmAGVService.cs
@@ -104,10 +104,21 @@ namespace ZR.Service.Business
}
+ ///
+ /// 6 获取agv 起点和终点
+ ///
+ ///
+ ///
+ ///
+ public List GetAGV_position_list(AgvLocation location)
+ {
+ var predicate = Expressionable.Create()
+ .AndIF(string.IsNullOrEmpty(location.Area), it => it.Area == location.Area)
+ .AndIF(location.Type > -1, it => it.Type == location.Type)
+ .AndIF(string.IsNullOrEmpty(location.Coordinate), it => it.Coordinate == location.Coordinate);
-
-
-
+ return Context.Queryable().Where(predicate.ToExpression()).ToList();
+ }
}
}