接口交互处理

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -931,7 +931,8 @@ namespace IMCS.CCS.Services
                         return responseData;
                     }
                     //写入程序编号  
-                    string prgNo = !string.IsNullOrEmpty(req.data.remotePath) ? req.data.remotePath.Substring(0, req.data.remotePath.Length - 2) : CcsActionAddressWrites[0].Value;
+                   // string prgNo = !string.IsNullOrEmpty(req.data.fileName) ? req.data.fileName.Substring(0, req.data.fileName.Length - 2) : CcsActionAddressWrites[0].Value;
+                    string prgNo = !string.IsNullOrEmpty(req.data.fileName) ? System.IO.Path.GetFileNameWithoutExtension(req.data.fileName) : CcsActionAddressWrites[0].Value;
                     s7.Write(CcsActionAddressWrites[0].Address, Convert.ToInt16(prgNo));
 
                     Log.Instance.WriteLogAdd("写入编号成功===>>编号位:"  + prgNo + ",写入地址=="+ CcsActionAddressWrites[0].Address,
@@ -1133,7 +1134,7 @@ namespace IMCS.CCS.Services
                         if (Result.IsSuccess && responseOpcUaData.result)
                         {
                             //插入回调
-                            TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartNCProgram.ToString(),
+                            TaskCallback taskCallbackData = new TaskCallback(actionInfo.PlcIp, ActionTypeEnum.StartNCProgram.ToString(),
                             EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram), req.taskId, req.taskNodeId);
                             await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                             Log.Instance.WriteLogAdd(ActionTypeEnum.StartNCProgram + "启动成功===>>" + JsonConvert.SerializeObject(req),
@@ -1222,7 +1223,7 @@ namespace IMCS.CCS.Services
                     }
                     s7.ConnectClose();
                     //插入回调
-                    TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.StartNCProgram.ToString(),
+                    TaskCallback taskCallbackData = new TaskCallback(actionInfo.PlcIp, ActionTypeEnum.StartNCProgram.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram), req.taskId, req.taskNodeId);
                     await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                     Log.Instance.WriteLogAdd(ActionTypeEnum.StartNCProgram + "启动成功===>>" + JsonConvert.SerializeObject(req),
@@ -2315,7 +2316,7 @@ namespace IMCS.CCS.Services
                 //查询当前执行过的任务 
                 TaskCallback queryTaskCallback = new TaskCallback();
                 queryTaskCallback.IP = ip;
-                TaskCallback taskCallBack = await _taskCallbackService.GetRobotActionList(queryTaskCallback); 
+                TaskCallback taskCallBack = await _taskCallbackService.GetRobotActionList(queryTaskCallback);
                 
                  if(taskCallBack != null)
                 { 

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -1368,9 +1368,9 @@ namespace IMCS.CCS.Service.Impl
                                 var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Get, Url + "&fun=AlmInfo", null, null);
                                 if (Result.IsSuccess)
                                 {
-                                    ResponseFanucData fncReq = new ResponseFanucData();
-                                    fncReq = JsonConvert.DeserializeObject<ResponseFanucData>(Result.Message);
-                                    List<AlmInfo> AlmMsg = fncReq.AlmMsg;
+                                    //ResponseFanucData fncReq = new ResponseFanucData();
+                                    List<AlmInfo> AlmMsg = JsonConvert.DeserializeObject<List<AlmInfo>>(Result.Message);
+                                    //List<AlmInfo> AlmMsg = fncReq.AlmMsg;                                   
                                     if (AlmMsg != null && AlmMsg.Count > 0)
                                     {
                                         var msgs = from o in AlmMsg select o.msg;