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

agv调整

Browse Source
This commit is contained in:
qianhao.xu
2024-05-14 15:41:42 +08:00
parent 0e10169a87
commit 1f8d860379
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
View File

@@ -133,13 +133,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
/// <param name="end_point"></param>
/// <returns></returns>
[HttpGet("go_workshop")]
public IActionResult GoWorkshop(string start_point, string end_point)
public IActionResult GoWorkshop(string start_point, string end_point, string agvCode = "1743 ")
{
if (string.IsNullOrEmpty(start_point) || string.IsNullOrEmpty(end_point))
{
SUCCESS(null);
}
var response = materialInputService.AGV_schedule(start_point, end_point);
var response = materialInputService.AGV_schedule(start_point, end_point, agvCode);
return SUCCESS(response);
}
@@ -205,13 +205,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
/// <param name="end_point"></param>
/// <returns></returns>
[HttpGet("emptycarreturn")]
public IActionResult Emptycarreturn(string start_point, string end_point)
public IActionResult Emptycarreturn(string start_point, string end_point, string agvCode = "1743 ")
{
if (string.IsNullOrEmpty(start_point) || string.IsNullOrEmpty(end_point))
{
SUCCESS(null);
}
var response = materialInputService.AGV_schedule(start_point, end_point);
var response = materialInputService.AGV_schedule(start_point, end_point,agvCode);
return SUCCESS(response);
}

1
ZR.Model/MES/wms/AGVtask_third.cs
View File

@@ -18,6 +18,7 @@ namespace ZR.Model.MES.wms
public List<AGV_location_third> positionCodePath { get; set; }
public string podDir { get; set; }
public string priority { get; set; }
public string agvCode { get; set; }
}
public class AGV_location_third
{

2
ZR.Service/mes/mm/IService/IMaterialInputService.cs
View File

@@ -26,7 +26,7 @@ namespace ZR.Service.mes.mm.IService
string[] Getfabgopoints();
string AGV_schedule(string start_point, string end_point);
string AGV_schedule(string start_point, string end_point,string agvCode);
string EmergencyStopAgv(string reqCode);
int FinishBatchingTask(string start_point, string end_point, string taskId);

4
ZR.Service/mes/mm/MaterialInputService.cs
View File

@@ -267,7 +267,7 @@ namespace ZR.Service.mes.mm
/// <param name="start_point"></param>
/// <param name="end_point"></param>
/// <returns></returns>
public string AGV_schedule(string start_point, string end_point)
public string AGV_schedule(string start_point, string end_point,string agvCode= "1743 ")
{
// Context.Updateable<MmAgvLocation>().Where(it => it.Coordinate == start_point).SetColumns(it => it.Status == 0).ExecuteCommand();
// Context.Updateable<MmAgvLocation>().Where(it => it.Coordinate == end_point).SetColumns(it => it.Status == 1).ExecuteCommand();
@@ -277,12 +277,14 @@ namespace ZR.Service.mes.mm
AGVtask_third task = new AGVtask_third();
task.reqCode = SnowFlakeSingle.Instance.NextId().ToString();
task.taskTyp = "F01";
task.agvCode = agvCode;
// MmAgvLocation start_object = Context.Queryable<MmAgvLocation>().Where(it => it.Coordinate == start_point).First();
// MmAgvLocation end_object = Context.Queryable<MmAgvLocation>().Where(it => it.Coordinate == end_point).First();
//判断是否跨楼层
if (end_point == "R1" || start_point == "R1")
{
task.taskTyp = "KLC";
}
task.positionCodePath = new List<AGV_location_third>