打标机取370不操作处理

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -414,25 +414,37 @@ namespace IMCS.CCS.Services
                         }
                     }
                 }
-               
 
-                //查询写入地址列表
-                List<CcsActionAddress> CcsActionAddressWrites = CcsActionAddresses.Where(o => o.Type == ActionAddressTypeEnum.WRITE.ToString()).ToList();
-                foreach (CcsActionAddress actionAddress in CcsActionAddressWrites)
+
+                //非打标机取动作操作取
+                if (string.IsNullOrEmpty(req.data.Location) || req.data.Location != "370")
                 {
-                    if (!string.IsNullOrEmpty(actionAddress.Address))
+                    //查询写入地址列表
+                    List<CcsActionAddress> CcsActionAddressWrites = CcsActionAddresses.Where(o => o.Type == ActionAddressTypeEnum.WRITE.ToString()).ToList();
+                    foreach (CcsActionAddress actionAddress in CcsActionAddressWrites)
                     {
-                        string Address = ToolUtils.AddressConvertDBW(actionAddress.Address);
-                        s7.Write(Address, Convert.ToInt16(string.IsNullOrEmpty(actionAddress.Value) ? req.data.Location : actionAddress.Value)); ;
-                        Thread.Sleep(SLEEP_TIME);
+                        if (!string.IsNullOrEmpty(actionAddress.Address))
+                        {
+                            string Address = ToolUtils.AddressConvertDBW(actionAddress.Address);
+                            s7.Write(Address, Convert.ToInt16(string.IsNullOrEmpty(actionAddress.Value) ? req.data.Location : actionAddress.Value)); ;
+                            Thread.Sleep(SLEEP_TIME);
+                        }
                     }
                 }
+               
+
                 s7.Close();
 
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetQualityCenter.ToString(),
-                    EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter), req.taskId, req.taskNodeId); 
-                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
+                    EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter), req.taskId, req.taskNodeId);
+                taskCallbackData = setCallBackValue(CcsActionAddresses, taskCallbackData);
+                //当是打标机取操作,插入回调打标机取标志
+                if(!string.IsNullOrEmpty(req.data.Location) && req.data.Location == "370")
+                {
+                    taskCallbackData.Description = req.data.Location;
+                }
+                await _taskCallbackService.CreateOrUpdateAndCache(taskCallbackData);
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter) + "取物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.GetQualityCenter));
                 return responseData;

IMCS_CCS/Service/Impl/TaskJobService.cs

@@ -542,7 +542,8 @@ namespace IMCS.CCS.Service.Impl
                     List<CcsTagValue> tagValues = _ccsTagValueService.GetList(tagValueQuery).ToList();
                     CcsTagValue callBacktagValue = tagValues.Where(o => o.Address == task.Address).FirstOrDefault();
 
-                    if (callBacktagValue != null && callBacktagValue.TagValue == task.CallbackValue)
+                    if (callBacktagValue != null && callBacktagValue.TagValue == task.CallbackValue 
+                        || (task.OperateType == ActionTypeEnum.GetQualityCenter.ToString()) && task.Description == "370")
                     {
                         CallBackRequestData requestData = new CallBackRequestData();
                         requestData.taskId = long.Parse(task.TaskId);