舵机打标机 空取

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -415,23 +415,18 @@ namespace IMCS.CCS.Services
                     }
                 }
 
-
-                //非打标机取动作操作取
-                if (string.IsNullOrEmpty(req.data.Location) || req.data.Location != "370")
+ 
+                //查询写入地址列表
+                List<CcsActionAddress> CcsActionAddressWrites = CcsActionAddresses.Where(o => o.Type == ActionAddressTypeEnum.WRITE.ToString()).ToList();
+                foreach (CcsActionAddress actionAddress in CcsActionAddressWrites)
                 {
-                    //查询写入地址列表
-                    List<CcsActionAddress> CcsActionAddressWrites = CcsActionAddresses.Where(o => o.Type == ActionAddressTypeEnum.WRITE.ToString()).ToList();
-                    foreach (CcsActionAddress actionAddress in CcsActionAddressWrites)
+                    if (!string.IsNullOrEmpty(actionAddress.Address))
                     {
-                        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);
-                        }
+                        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();
 
@@ -439,11 +434,7 @@ namespace IMCS.CCS.Services
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetQualityCenter.ToString(),
                     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));
@@ -1970,24 +1961,35 @@ namespace IMCS.CCS.Services
                 }
                 else
                 {
-                    foreach (CcsActionAddress actionAddress in CcsActionAddressWrites)
+                    //非打标机取动作操作取
+                    if (string.IsNullOrEmpty(req.data.Location) || req.data.Location != "370")
                     {
-                        if (!string.IsNullOrEmpty(actionAddress.Address))
+                        foreach (CcsActionAddress actionAddress in CcsActionAddressWrites)
                         {
-                            s7.Write(actionAddress.Address, Convert.ToInt16(string.IsNullOrEmpty(actionAddress.Value) ? req.data.Location : actionAddress.Value)); ;
+                            if (!string.IsNullOrEmpty(actionAddress.Address))
+                            {
+                                s7.Write(actionAddress.Address, Convert.ToInt16(string.IsNullOrEmpty(actionAddress.Value) ? req.data.Location : actionAddress.Value)); ;
 
-                            Thread.Sleep(SLEEP_TIME);
+                                Thread.Sleep(SLEEP_TIME);
+                            }
                         }
                     }
+                     
                 }
 
-                s7.ConnectClose();
+                s7.ConnectClose(); 
 
                 //插入回调
                 TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.GetServoStacker.ToString(),
                     EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker), 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);
  
-                await _taskCallbackService.CreateOrUpdateAndCache(setCallBackValue(CcsActionAddresses, taskCallbackData));
                 Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker) + "取物品成功===>>" + JsonConvert.SerializeObject(req)
                    , EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker));
                 return responseData;

IMCS_CCS/Service/Impl/TaskJobService.cs

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