Selaa lähdekoodia

恒轮启动条件修改

zhuhao 2 vuotta sitten
vanhempi
commit
061b5d14d7

+ 3 - 0
IMCS_CCS/Repository/ITaskCallbackRepository.cs

@@ -16,6 +16,9 @@ namespace IMCS.CCS.Repository
         //查机器人动作列表
         Task<TaskCallback> GetRobotActionList(TaskCallback vo);
 
+        //查机器人放动作
+        Task<TaskCallback> GetRobotSendAction(TaskCallback vo);
+
         //查询详情
         Task<TaskCallback> GetById(int id);
 

+ 17 - 0
IMCS_CCS/Repository/TaskCallbackRepository.cs

@@ -84,6 +84,23 @@ namespace IMCS.CCS.Repository
 
             return await list.OrderByDescending(o => o.CreateTime).FirstOrDefaultAsync();
 
+        }
+        //查机器人最新放动作
+        public async Task<TaskCallback> GetRobotSendAction(TaskCallback vo)
+        { 
+            IQueryable<TaskCallback> list = _context.TaskCallback; 
+            if (!string.IsNullOrEmpty(vo.IP))
+            {
+                list = list.Where(x => x.IP == vo.IP);
+            }
+            if (!string.IsNullOrEmpty(vo.Description))
+            {
+                list = list.Where(x => x.Description == vo.Description);
+            }
+            list = list.Where(x =>x.OperateType == ActionTypeEnum.SendQualityCenter.ToString());
+
+            return await list.OrderByDescending(o => o.CreateTime).FirstOrDefaultAsync();
+
         }
 
         //查询详情

+ 3 - 0
IMCS_CCS/Service/ITaskCallbackService.cs

@@ -14,6 +14,9 @@ namespace IMCS.CCS.Services
         //查机器人动作列表
         Task<TaskCallback> GetRobotActionList(TaskCallback vo);
 
+        //查机器人放动作
+        Task<TaskCallback> GetRobotSendAction(TaskCallback vo);
+
         //查询详情
         Task<TaskCallback> GetById(int id);
 

+ 1 - 1
IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -1152,7 +1152,7 @@ namespace IMCS.CCS.Services
                     TaskCallback queryTaskCallBack = new TaskCallback();
                     queryTaskCallBack.IP = actionInfo.PlcIp;
                     queryTaskCallBack.Description = ProtocalTypeEnum.OPCUA.ToString();
-                    TaskCallback TaskBean = await _taskCallbackService.GetRobotActionList(queryTaskCallBack);
+                    TaskCallback TaskBean = await _taskCallbackService.GetRobotSendAction(queryTaskCallBack);
 
                     TaskCallback taskCallbackData = new TaskCallback(actionInfo.PlcIp, ActionTypeEnum.StartNCProgram.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.StartNCProgram), req.taskId, req.taskNodeId);

+ 6 - 0
IMCS_CCS/Service/Impl/TaskCallbackService.cs

@@ -42,6 +42,12 @@ namespace IMCS.CCS.Services
             return await _repository.GetRobotActionList(vo);
         }
 
+        //查机器人放动作
+        public async Task<TaskCallback> GetRobotSendAction(TaskCallback vo)
+        {
+            return await _repository.GetRobotSendAction(vo);
+        }
+
         //查询详情
         public async Task<TaskCallback> GetById(int id)
         {