diff --git a/ZR.Model/MES/wms/AGVtask_third.cs b/ZR.Model/MES/wms/AGVtask_third.cs index c7ba6115..7f3e97c9 100644 --- a/ZR.Model/MES/wms/AGVtask_third.cs +++ b/ZR.Model/MES/wms/AGVtask_third.cs @@ -12,7 +12,8 @@ namespace ZR.Model.MES.wms public class AGVtask_third { public string reqCode { get; set; } - public string msg { get; set; } + public string msg {get; set; } + public string taskTyp { get; set; } public List positionCodePath { get; set; } } diff --git a/ZR.Service/mes/wms/WmAGVService.cs b/ZR.Service/mes/wms/WmAGVService.cs index e20a8cc0..395507dd 100644 --- a/ZR.Service/mes/wms/WmAGVService.cs +++ b/ZR.Service/mes/wms/WmAGVService.cs @@ -124,7 +124,7 @@ namespace ZR.Service.Business return Context.Queryable().Where(predicate.ToExpression()).ToList(); } /// - /// 7 生成agv任务 + /// 7 生成agv任务,并执行 /// /// /// @@ -137,10 +137,10 @@ namespace ZR.Service.Business // 设置文本颜色为红色 Console.ForegroundColor = ConsoleColor.Red; - - string url = "http://192.168.60.1:443/rcms/services/rest/hikRpcService/genAgvSchedulingTask"; + + string url = "http://192.168.60.1:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask"; Console.WriteLine("=======》打印请求URL:" + url); string start_point = ""; string end_point = ""; @@ -156,7 +156,9 @@ namespace ZR.Service.Business } AGVtask_third task = new AGVtask_third(); - task.reqCode = taskid; + task.reqCode = SnowFlakeSingle.Instance.NextId().ToString(); + // "taskTyp":"F01", + task.taskTyp = "F01"; task.positionCodePath = new List { new AGV_location_third() @@ -227,10 +229,10 @@ namespace ZR.Service.Business { task_id = agvTask.BackTaskId; } - - string url = "http://192.168.60.1:443/rcms/services/rest/hikRpcService/cancelTask"; + + string url = "http://192.168.60.1:8182/rcms/services/rest/hikRpcService/cancelTask"; AGVtask_cancel_third req = new AGVtask_cancel_third(); - req.reqCode = taskId; + req.reqCode = SnowFlakeSingle.Instance.NextId().ToString(); req.forceCancel = "1"; req.taskCode = task_id; string postData= JsonSerializer.Serialize(req);