fix

WCS.WorkEngineering/WebApi/Controllers/AgvController.cs

@@ -162,7 +162,8 @@ namespace WCS.WorkEngineering.WebApi.Controllers
         {
             lock (LockHub.AgvCallbackLock)
             {
-                LogHub.InterfacePublish(nameof(AgvCallback), $"传入参数--{JsonConvert.SerializeObject(reqDto)}");
+                var remoteIpAddress = HttpContext.Connection.RemoteIpAddress.ToString();
+                LogHub.InterfacePublish(nameof(AgvCallback), $"IP:{remoteIpAddress}--传入参数--{JsonConvert.SerializeObject(reqDto)}");
                 var res = new AgvCallbackResponse() { code = AgvResponseCode.Fail, message = "失败" };
                 WCS_TaskInfo taskInfo = null;
 
@@ -257,7 +258,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                     res.code = AgvResponseCode.Error;
                     res.message = ex.Message;
                 }
-                LogHub.InterfacePublish(nameof(AgvCallback), $"返回结果--{JsonConvert.SerializeObject(res)}");
+                LogHub.InterfacePublish(nameof(AgvCallback), $"IP:{remoteIpAddress}--返回结果--{JsonConvert.SerializeObject(res)}");
 
                 return res;
             }

WCS.WorkEngineering/WebApi/Controllers/WcsController.cs

@@ -2,6 +2,7 @@
 using Newtonsoft.Json;
 using ServiceCenter;
 using ServiceCenter.Extensions;
+using ServiceCenter.Logs;
 using ServiceCenter.Redis;
 using ServiceCenter.SqlSugars;
 using System.Net.NetworkInformation;
@@ -46,7 +47,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                         if (task != null)
                         {
                             //验证wms是否能取消
-                            SRes res = HandleTaskVerify(response, item);
+                            SRes res = HandleTaskVerify(response, item, 106);
                             if (res == null) return;
 
                             switch (task.Type)
@@ -130,7 +131,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                                     break;
                             }
 
-                            SRes cancelRes = CarryTaskInfo(response, item);
+                            SRes cancelRes = CarryTaskInfo(response, item, 106);
                             if (cancelRes == null) return;
                             //取消任务
                             try
@@ -188,7 +189,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                         {
                             if (task.Type == TaskType.OutDepot)
                             {
-                                SRes res = HandleTaskVerify(response, item);
+                                SRes res = HandleTaskVerify(response, item, 99);
                                 if (res == null) return;
 
                                 switch (task.Type)
@@ -207,7 +208,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                                         break;
                                 }
 
-                                SRes cancelRes = CarryTaskInfo(response, item);
+                                SRes cancelRes = CarryTaskInfo(response, item, 99);
                                 if (cancelRes == null) return;
 
                                 //找到对应的AGV任务
@@ -351,12 +352,13 @@ namespace WCS.WorkEngineering.WebApi.Controllers
         /// </summary>
         /// <param name="sRes"></param>
         /// <param name="id"></param>
+        /// <param name="type">99完成,106取消</param>
         /// <returns></returns>
-        public SRes? HandleTaskVerify(SRes<HandleTaskResponse> sRes, int id)
+        public SRes? HandleTaskVerify(SRes<HandleTaskResponse> sRes, int id, int type)
         {
             try
             {
-                var res = WmsApi.HandleTaskVerify(new List<int>() { id }, 106);
+                var res = WmsApi.HandleTaskVerify(new List<int>() { id }, type);
                 return res;
             }
             catch (Exception ex)
@@ -376,12 +378,13 @@ namespace WCS.WorkEngineering.WebApi.Controllers
         /// </summary>
         /// <param name="sRes"></param>
         /// <param name="id"></param>
+        /// <param name="type">99完成,106取消</param>
         /// <returns></returns>
-        public SRes? CarryTaskInfo(SRes<HandleTaskResponse> sRes, int id)
+        public SRes? CarryTaskInfo(SRes<HandleTaskResponse> sRes, int id, int type)
         {
             try
             {
-                var res = WmsApi.CarryTaskInfo(new List<int>() { id }, 106);
+                var res = WmsApi.CarryTaskInfo(new List<int>() { id }, type);
                 return res;
             }
             catch (Exception ex)
@@ -454,8 +457,10 @@ namespace WCS.WorkEngineering.WebApi.Controllers
         [HttpGet]
         public object GetDeviceInfo(string name)
         {
+            var remoteIpAddress = HttpContext.Connection.RemoteIpAddress.ToString();
+            LogHub.InterfacePublish(nameof(GetDeviceInfo), $"IP:{remoteIpAddress}--传入参数--{JsonConvert.SerializeObject(name)}");
             var obj = World.GetSystemInstance<GetDeviceSystem>().Invoke(name);
-
+            LogHub.InterfacePublish(nameof(GetDeviceInfo), $"IP:{remoteIpAddress}--返回结果--{JsonConvert.SerializeObject(obj)}");
             return obj;
         }