清洗机调整

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -679,12 +679,12 @@ namespace IMCS.CCS.Services
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.SendQualityCenter.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter), req.taskId, req.taskNodeId);
                 taskCallbackData = setCallBackValue(CcsActionAddresses, taskCallbackData);
-                //清洗机启动时更新回调值
+                /*//清洗机启动时更新回调值
                 if(!string.IsNullOrEmpty(req.data.Location) && req.data.Location == "123")
                 { 
                     taskCallbackData.Address = "DB200.48";
                     taskCallbackData.CallbackValue = "1";
-                }
+                }*/
                 await _taskCallbackService.CreateOrUpdateAndCache(taskCallbackData);
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter) + "放物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter));

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -894,9 +894,9 @@ namespace IMCS.CCS.Service.Impl
                     //tagValueQuery.Address = task.Address;
                     List<CcsTagValue> tagValues = _ccsTagValueService.GetList(tagValueQuery).ToList();
                     CcsTagValue tagValue = tagValues.Where(o => o.Address == task.Address).FirstOrDefault();
-                    //if (tagValue != null && tagValue.TagValue == task.CallbackValue)
+                    if (tagValue != null && tagValue.TagValue == task.CallbackValue)
                     //临时处理以解决ecs配置问题
-                    if(currentTime.Subtract(task.CreateTime).TotalSeconds > 10)
+                    //if(currentTime.Subtract(task.CreateTime).TotalSeconds > 10)
                     {
                         CallBackRequestData requestData = new CallBackRequestData();
                         requestData.taskId = long.Parse(task.TaskId);