Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
This commit is contained in:
赵正易
2024-03-29 14:04:16 +08:00
parent 90af133f7e 5bbc99cb74
commit a9d3ce16e6
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
View File

@@ -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
/// <param name="taskId"></param>
/// <returns></returns>
[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);
}
}

1
ZR.Model/MES/wms/Dto/AGVtaskDto.cs
View File

@@ -11,6 +11,7 @@ namespace ZR.Model.MES.wms.Dto
public class QueryAGVPosition
{
}
public class AGVtaskDto
{

2
ZR.Service/mes/wms/IService/IWmAGVService.cs
View File

@@ -17,5 +17,7 @@ namespace ZR.Service.mes.wms.IService
int AddAGVTask(AgvTask task);
int DeleteTask(string taskId);
List<AgvLocation> GetAGV_position_list(AgvLocation location);
}
}

17
ZR.Service/mes/wms/WmAGVService.cs
View File

@@ -104,10 +104,21 @@ namespace ZR.Service.Business
}
/// <summary>
/// 6 获取agv 起点和终点
/// </summary>
/// <param name="location"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
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.Type > -1, it => it.Type == location.Type)
.AndIF(string.IsNullOrEmpty(location.Coordinate), it => it.Coordinate == location.Coordinate);
return Context.Queryable<AgvLocation>().Where(predicate.ToExpression()).ToList();
}
}
}