|
@@ -2220,8 +2220,7 @@ namespace IMCS.CCS.Services
|
|
TaskCallback taskCallBack = await _taskCallbackService.GetRobotActionList(queryTaskCallback);
|
|
TaskCallback taskCallBack = await _taskCallbackService.GetRobotActionList(queryTaskCallback);
|
|
|
|
|
|
if(taskCallBack != null)
|
|
if(taskCallBack != null)
|
|
- {
|
|
|
|
-
|
|
|
|
|
|
+ {
|
|
if (taskCallBack.State
|
|
if (taskCallBack.State
|
|
|| (currentAction == ActionTypeEnum.MoveRobotPosition.ToString() && taskCallBack.OperateType != ActionTypeEnum.SendQualityCenter.ToString())
|
|
|| (currentAction == ActionTypeEnum.MoveRobotPosition.ToString() && taskCallBack.OperateType != ActionTypeEnum.SendQualityCenter.ToString())
|
|
|| (currentAction == ActionTypeEnum.GetQualityCenter.ToString() && taskCallBack.OperateType != ActionTypeEnum.MoveRobotPosition.ToString())
|
|
|| (currentAction == ActionTypeEnum.GetQualityCenter.ToString() && taskCallBack.OperateType != ActionTypeEnum.MoveRobotPosition.ToString())
|