diff --git a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
index 05a8d69d..40af7115 100644
--- a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
@@ -133,13 +133,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
///
///
[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
///
///
[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);
}
diff --git a/ZR.Model/MES/wms/AGVtask_third.cs b/ZR.Model/MES/wms/AGVtask_third.cs
index 79892b1a..55935d21 100644
--- a/ZR.Model/MES/wms/AGVtask_third.cs
+++ b/ZR.Model/MES/wms/AGVtask_third.cs
@@ -18,6 +18,7 @@ namespace ZR.Model.MES.wms
public List positionCodePath { get; set; }
public string podDir { get; set; }
public string priority { get; set; }
+ public string agvCode { get; set; }
}
public class AGV_location_third
{
diff --git a/ZR.Service/mes/mm/IService/IMaterialInputService.cs b/ZR.Service/mes/mm/IService/IMaterialInputService.cs
index e4b6d631..5c2b1880 100644
--- a/ZR.Service/mes/mm/IService/IMaterialInputService.cs
+++ b/ZR.Service/mes/mm/IService/IMaterialInputService.cs
@@ -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);
diff --git a/ZR.Service/mes/mm/MaterialInputService.cs b/ZR.Service/mes/mm/MaterialInputService.cs
index 1b869366..5fd017c8 100644
--- a/ZR.Service/mes/mm/MaterialInputService.cs
+++ b/ZR.Service/mes/mm/MaterialInputService.cs
@@ -267,7 +267,7 @@ namespace ZR.Service.mes.mm
///
///
///
- 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().Where(it => it.Coordinate == start_point).SetColumns(it => it.Status == 0).ExecuteCommand();
// Context.Updateable().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().Where(it => it.Coordinate == start_point).First();
// MmAgvLocation end_object = Context.Queryable().Where(it => it.Coordinate == end_point).First();
//判断是否跨楼层
if (end_point == "R1" || start_point == "R1")
{
task.taskTyp = "KLC";
+
}
task.positionCodePath = new List