| | |
|---|
| | | { |
|---|
| | | result.resultMsg = "任务未执行，不允许强制完成！"; |
|---|
| | | } |
|---|
| | | //else if (task.S_B_STATE.Trim() != "未执行" && task.S_B_STATE.Trim() != "待推送" && task.S_B_STATE.Trim() != "取消") |
|---|
| | | else if (task.S_B_STATE.Trim() != "未执行" && task.S_B_STATE.Trim() != "待推送" && task.S_B_STATE.Trim() != "取货失败") |
|---|
| | | |
|---|
| | | else if (task.S_B_STATE.Trim() != "未执行") |
|---|
| | | { |
|---|
| | | //已推送但是没有完成或者取消，通知hosttoagv |
|---|
| | | TaskHelper.UpdateStatus(model.TaskNo.Trim(), "完成"); |
|---|
| | | |
|---|
| | | //if (GZRobot.CancelOrder(task.GZ_ID)) |
|---|
| | | //{ |
|---|
| | | // result.resultMsg = "任务完成已经发送给小车"; |
|---|
| | | |
|---|
| | | // LocationHelper.UnLockLoc(task.S_START_LOC); |
|---|
| | | // LocationHelper.UnLockLoc(task.S_END_LOC); |
|---|
| | | //} |
|---|
| | | } |
|---|
| | | else |
|---|
| | | { |
|---|
