ccs取消任务

IMCS_CCS/Controllers/CcsController.cs

@@ -260,5 +260,16 @@ namespace IMCS.CCS.Controllers
         }
 
 
+        /// <summary>
+        /// 取消ccs任务
+        /// </summary> 
+        /// <returns></returns>
+        [Route("api/cancelCCS")]
+        [HttpPost]
+        public async Task<ActionResult<ResponseECSData>> CancelCCS(RequestData<LocationData> data)
+        {
+            return await _httpRequestService.CancelCCS(data);
+        }
+
     }
 }

IMCS_CCS/Entitys/TaskCallback.cs

@@ -110,6 +110,11 @@ namespace IMCS.CCS.Entitys
         {
            
         }
+
+        public TaskCallback(string TaskNodeId)
+        {
+            this.TaskNodeId = TaskNodeId;
+        }
     } 
   
 }

IMCS_CCS/Model/vo/ResponseECSData.cs

@@ -24,6 +24,11 @@ namespace IMCS.CCS.Models.vo
             this.taskNodeID = taskNodeID;
         }
 
+        public ResponseECSData(string taskNodeID)
+        {
+            this.taskNodeID = taskNodeID;
+        }
+
     }
 
     public class ResponseCCSData<T>

IMCS_CCS/Service/IHttpRequestService .cs

@@ -109,5 +109,7 @@ namespace IMCS.CCS.Services
         /// 手动处理机器人取放动作
         /// </summary> 
         Task<ResponseECSData> HandRobotAction(RequestData<LocationData> req);
+
+        Task<ResponseECSData> CancelCCS(RequestData<LocationData> req);
     }
 }

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -2735,8 +2735,28 @@ namespace IMCS.CCS.Services
             }
         }
 
-        
+        public async Task<ResponseECSData> CancelCCS(RequestData<LocationData> req)
+        {
+            ResponseECSData responseData = new ResponseECSData(req.taskNodeId);
+            TaskCallback taskCallback = new TaskCallback(req.taskNodeId);
 
+            List<TaskCallback> taskCallbacks = await _taskCallbackService.GetList(taskCallback);
 
+            if (taskCallbacks.Count == 1)
+            {
+                TaskCallback taskCallback1 = taskCallbacks[0];
+                taskCallback1.State = false;
+                await _taskCallbackService.Update(taskCallback1);
+                responseData.msg = req.taskNodeId + ":取消任务成功";
+            }
+            else if(taskCallbacks.Count == 0)
+            {
+                responseData.result = "false";
+                responseData.msg = req.taskNodeId + ":不存在当前任务";
+                   
+            }
+                
+            return responseData;
+        }
     }
 }

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -442,10 +442,6 @@ namespace IMCS.CCS.Service.Impl
                     return rfid;
                 }
                 
-                
-                    plcS7.Write("DB2.12", Convert.ToInt16("2"));
-                    Console.WriteLine("====================================RFID写命令已下发,写入DB2.12-》2");
-                    Log.Instance.WriteLogAdd(task.TaskNodeId + "====================================RFID写命令已下发,写入DB2.12-》2：", LOG_TITLE_CALLBACK);
                     //读 源位置 是上下料站还是机床
                     string up = plcS7.ReadInt16("DB1.12").Content.ToString();
                     //如果是上下料站，往RFID中写state(1毛坯)和PID（零件编码）
@@ -521,7 +517,11 @@ namespace IMCS.CCS.Service.Impl
                         Console.WriteLine("在读一次，写入之后重新读一边:DB2.55：" + readResult5 );
                         Log.Instance.WriteLogAdd("写入之后重新读一边:DB2.55：" + readResult4 + ",是否写入成功：" + op.IsSuccess, LOG_TITLE_CALLBACK);
                 }
-                
+
+                Thread.Sleep(3000);
+                plcS7.Write("DB2.12", Convert.ToInt16("2"));
+                Console.WriteLine("====================================RFID写命令已下发,写入DB2.12-》2");
+                Log.Instance.WriteLogAdd(task.TaskNodeId + "====================================RFID写命令已下发,写入DB2.12-》2：", LOG_TITLE_CALLBACK);
                 Log.Instance.WriteLogAdd("RFID逻辑块==》重新写入RFID命令已下发:" + "读取imcs_redis数据_" + JsonConvert.SerializeObject(imcsRfid) + ",读取RFID数据_" + readResult.ToString(), LOG_TITLE_CALLBACK);
 
                 plcS7.ConnectClose();