1

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -578,7 +578,7 @@ namespace IMCS.CCS.Services
                 {
                     //下发任务成功后，查询千机质检结果
                     //如果源目标为是机床，才去查询
-                    if (jList.Contains(req.data.location) && req.data.location=="1")
+                    if (jList.Contains(req.data.location) && req.data.qj == "1")
                     {
                         RequestOpcUaData deviceReq = new RequestOpcUaData();
                         deviceReq.ServerUrl = "opc.tcp://" + jIp[req.data.location] + ":4840";
@@ -597,7 +597,7 @@ namespace IMCS.CCS.Services
                         {
                             if (responseOpcUaData.values != null)
                             {
-                                await _redisService.Database.StringSetAsync("QJ:" + req.taskNodeId, responseOpcUaData.values[0]);
+                                await _redisService.Database.StringSetAsync("QJ:" + req.taskNodeId, "\"" + responseOpcUaData.values[0] + "\"");
                             }
                             Log.Instance.WriteLogAdd(ActionTypeEnum.RobotAction + "查询千机质检结果===>>" + JsonConvert.SerializeObject(responseOpcUaData),
                        EnumHelper.GetDescription(ActionTypeEnum.RobotAction));

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -583,6 +583,7 @@ namespace IMCS.CCS.Service.Impl
                     if (moshi != "257")
                     {
                         _redisService.Database.KeyDelete(RFID + task.TaskId + task.TaskNodeId);
+                        s7.ConnectClose();
                         return "当前操作模式非自动并运行";
                     }
 
@@ -605,7 +606,8 @@ namespace IMCS.CCS.Service.Impl
                         Rfid aa = await this.CheckRFid(task);
 
                          if (aa.success == false) {
-                             return aa.msg;
+                            s7.ConnectClose();
+                            return aa.msg;
                          }
                      } else if (rfidFlag == "2") {