diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java index 6462888..93a5abf 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java @@ -178,6 +178,15 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService // currTaskInfoVo.setAllStep(allStep); currTaskInfoVo.setNowStep(nowStep); + currTaskInfoVo.setAutoExeTaskId(currTask.getAutoExeTaskId()); + }else { + currTaskInfoVo.setAllStep(currTask.getTargetPosition()); + if (currTask.getStatus()==1){ + currTaskInfoVo.setNowStep(currTask.getTargetPosition()); + }else if (currTask.getIsCache()==1){ + currTaskInfoVo.setNowStep(currTask.getLocationName()); + } + currTaskInfoVo.setAutoExeTaskId(currTask.getId()); } //currTaskDet List currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper().eq(CurrTaskDet.CURR_TASK_ID, currTask.getId()));