修改清洗机和放123合并

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -676,7 +676,14 @@ namespace IMCS.CCS.Services
 
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.SendQualityCenter.ToString(),
-                    EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter), req.taskId, req.taskNodeId); 
+                    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(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter) + "放物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter));
@@ -1419,7 +1426,7 @@ namespace IMCS.CCS.Services
 
                 //查询条件
                 List<CcsActionAddress> CcsActionAddressChecks = CcsActionAddresses.Where(o => o.Type == ActionAddressTypeEnum.CHECK.ToString()).ToList();
-                foreach (CcsActionAddress actionAddress in CcsActionAddressChecks)
+                /*foreach (CcsActionAddress actionAddress in CcsActionAddressChecks)
                 {
                     if (!string.IsNullOrEmpty(actionAddress.Address) && !string.IsNullOrEmpty(actionAddress.Value))
                     {
@@ -1445,7 +1452,7 @@ namespace IMCS.CCS.Services
                         s7.Write(actionAddress.Address, Convert.ToInt16(actionAddress.Value));
                         Thread.Sleep(200);
                     }
-                }
+                }*/
                 s7.ConnectClose();
 
                 //插入回调

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -887,7 +887,8 @@ 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)
+                    if(currentTime.Subtract(task.CreateTime).TotalSeconds > 10)
                     {
                         CallBackRequestData requestData = new CallBackRequestData();
                         requestData.taskId = long.Parse(task.TaskId);