恒轮接口

IMCS_CCS/Controllers/CcsController.cs

@@ -167,6 +167,16 @@ namespace IMCS.CCS.Controllers
             return await _httpRequestService.StartNCProgram(data);
         }
         /// <summary>
+        /// 恒轮机床空闲标志： POST: api/hellerFreeStatus
+        /// </summary> 
+        /// <returns></returns>
+        [Route("api/hellerFreeStatus")]
+        [HttpPost]
+        public async Task<ActionResult<ResponseECSData>> hellerFreeStatus(RequestData<RequestToolData> data)
+        {
+            return await _httpRequestService.hellerFreeStatus(data);
+        }
+        /// <summary>
         /// 启动清洗机： POST: api/StartCleanMachine
         /// </summary> 
         /// <returns></returns>

IMCS_CCS/Service/IHttpRequestService .cs

@@ -76,6 +76,10 @@ namespace IMCS.CCS.Services
         /// 启动机床程序
         /// </summary> 
         Task<ResponseECSData> StartNCProgram(RequestData<StartNCProgramData> req);
+        /// <summary>
+        /// 恒轮机床空闲标志
+        /// </summary> 
+        Task<ResponseECSData> hellerFreeStatus(RequestData<RequestToolData> req);
 
         /// <summary>
         /// 粗偏写入

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -822,7 +822,7 @@ namespace IMCS.CCS.Service.Impl
                     CcsTagValue tagValue2 = tagValues.Where(o => o.Address == "DB200.332").FirstOrDefault(); //当前工作台
                     CcsTagValue tagValue3 = tagValues.Where(o => o.Address == "DB200.336").FirstOrDefault(); //当前工作台是否有料标志,1:有料 2:无料
                     if ((tagValue != null && tagValue.TagValue == task.CallbackValue && String.IsNullOrEmpty(task.Description)) 
-                        || (task.Description == ProtocalTypeEnum.OPCUA.ToString() && tagValue != null  && tagValue2 != null && tagValue2.TagValue == task.Description && tagValue3.TagValue == "1")) 
+                        || (task.Description == ProtocalTypeEnum.OPCUA.ToString() && tagValue2 != null  && tagValue3 != null && tagValue2.TagValue == task.Description && tagValue3.TagValue == "1")) 
                     {
                         CallBackRequestData requestData = new CallBackRequestData();
                         requestData.taskId = long.Parse(task.TaskId);