千机质检

IMCS_CCS/Entitys/RequestData.cs

@@ -48,6 +48,8 @@ namespace IMCS.CCS.Models
         /// RFID
         /// </summary>
         public string rfid { get; set; }
+
+        public string qj { get; set; }
     }
 
     public class UploadFileData
@@ -66,6 +68,8 @@ namespace IMCS.CCS.Models
         /// 子文件集合
         /// </summary>
         public List<string> subFileList { get; set; }
+
+        public List<string> toolFileList { get; set; }
     }
 
     public class StartNCProgramData

IMCS_CCS/Model/vo/RequestOpcUaData.cs

@@ -42,6 +42,8 @@ namespace IMCS_CCS.Model.vo
         /// 子文件集合
         /// </summary>
         public List<string> subFileList { get; set; }
+
+        public List<string> toolFileList { get; set; }
     }
 
     public class RequestBody<T>

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -578,7 +578,7 @@ namespace IMCS.CCS.Services
                 {
                     //下发任务成功后，查询千机质检结果
                     //如果源目标为是机床，才去查询
-                    if (jList.Contains(req.data.location))
+                    if (jList.Contains(req.data.location) && req.data.location=="1")
                     {
                         RequestOpcUaData deviceReq = new RequestOpcUaData();
                         deviceReq.ServerUrl = "opc.tcp://" + jIp[req.data.location] + ":4840";
@@ -586,12 +586,14 @@ namespace IMCS.CCS.Services
                         deviceReq.Password = "12345678";
                         deviceReq.Type = OpcUaActionTypeEnum.Collect.ToString();
                         deviceReq.Ip = jIp[req.data.location];
-                        List<string> strings = new List<string>() { "ns=2;s=/Plc/DB2.DBX626.6" };
+                        List<string> strings = new List<string>();
                         deviceReq.Addresses = strings;
                         deviceReq.check = "1";
+                        Console.WriteLine("RequestOpcUaData:" + JsonConvert.SerializeObject(deviceReq));
                         var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, mazakUrlContext, deviceReq, null);
+                        Console.WriteLine("Result:" + Result.Message);
                         ResponseOpcUaData responseOpcUaData = JsonConvert.DeserializeObject<ResponseOpcUaData>(Result.Message);
-                        if (!Result.IsSuccess || !responseOpcUaData.result)
+                        if (Result.IsSuccess && responseOpcUaData.result)
                         {
                             if (responseOpcUaData.values != null)
                             {
@@ -690,6 +692,7 @@ namespace IMCS.CCS.Services
                         deviceReq.Type = OpcUaActionTypeEnum.UploadFileList.ToString();
                         deviceReq.prgName = req.data.fileName;
                         deviceReq.subFileList = req.data.subFileList;
+                        deviceReq.toolFileList=req.data.toolFileList; 
                         deviceReq.Ip = req.url;
                         var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, mazakUrlContext, deviceReq, null);
                         ResponseOpcUaData responseOpcUaData = JsonConvert.DeserializeObject<ResponseOpcUaData>(Result.Message);