123

Infrastructure/Helper/HttpHelper.cs

@@ -19,7 +19,12 @@ namespace Infrastructure
         public static string HttpPost(string url, string postData = null, string contentType = null, int timeOut = 30, Dictionary<string, string> headers = null)
         {
             postData ??= "";
-            using HttpClient client = new HttpClient();
+            var httpClientHandler = new HttpClientHandler
+            {
+                ServerCertificateCustomValidationCallback = (message, certificate2, arg3, arg4) => true  //忽略掉证书异常
+            };
+     
+            using HttpClient client = new HttpClient(httpClientHandler);
             client.Timeout = new TimeSpan(0, 0, timeOut);
             if (headers != null)
             {

ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs

@@ -152,7 +152,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
         {
             if (string.IsNullOrEmpty(reqCode))
             {
-                SUCCESS(null);
+               return SUCCESS(null);
             }
 
             var response = materialInputService.EmergencyStopAgv(reqCode);

ZR.Service/mes/mm/MaterialInputService.cs

@@ -226,7 +226,7 @@ namespace ZR.Service.mes.mm
         /// <returns></returns>
         public string[] Getfabgopoints()
         {
-            return Context.Queryable<MmAgvLocation>().Where(it => it.AreaCode == 3).Where(it => it.Status == 0)
+            return Context.Queryable<MmAgvLocation>().Where(it => it.AreaCode == 3)
                   .Select(it => it.Coordinate).ToArray();
 
         }
@@ -284,6 +284,7 @@ namespace ZR.Service.mes.mm
         /// <param name="reqCode"></param>
         public string EmergencyStopAgv(string reqCode)
         {
+            logger.Info("\n    0.取消任务taskcode=    "+ reqCode);
             string url = "https://192.168.60.1:443/rcms/services/rest/hikRpcService/cancelTask";
 
             logger.Info("    1.紧急终止AGV请求url    " + url);