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
This commit is contained in:
赵正易
2024-03-29 15:20:12 +08:00
parent a9d3ce16e6 ca763ec392
commit 04f5aee6a0
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
ZR.Model/MES/wms/AgvLocation.cs
View File

@@ -17,6 +17,15 @@ namespace ZR.Model.MES.wms
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)] [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; } public int Id { get; set; }
/// <summary>
/// 区域
/// </summary>
[SugarColumn(ColumnName = "area_code")]
public int? AreaCode { get; set; }
/// <summary> /// <summary>
/// 区域 /// 区域
/// </summary> /// </summary>

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

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