update:
currTask列表总览及操作方式修改-bug修改
This commit is contained in:
		@@ -173,12 +173,6 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
 | 
			
		||||
                String nowStep="未开始";
 | 
			
		||||
                for (CurrTask currTask1:currTasks
 | 
			
		||||
                     ) {
 | 
			
		||||
                    if (currTask1.getStatus()==1){
 | 
			
		||||
                        nowStep=currTask1.getTargetPosition();
 | 
			
		||||
                    }else if (currTask1.getIsCache()==1){
 | 
			
		||||
                        nowStep=currTask.getLocationName();
 | 
			
		||||
                    }
 | 
			
		||||
                    allStep=allStep.concat("->").concat(currTask1.getTargetPosition());
 | 
			
		||||
                    InStockInfo inStockInfo = inStockInfoServiceBiz.getOne(new QueryWrapper<InStockInfo>().eq(InStockInfo.TASK_ID, currTask1.getId()));
 | 
			
		||||
                    if (inStockInfo!=null){
 | 
			
		||||
                        List<InStockInfoVo> inStockInfoVoList=new ArrayList<>();
 | 
			
		||||
@@ -187,6 +181,15 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
 | 
			
		||||
                        inStockInfoVoList.add(inStockInfoVo);
 | 
			
		||||
                        currTaskInfoVo.setInStockInfoVoList(inStockInfoVoList);
 | 
			
		||||
                    }
 | 
			
		||||
                    if (currTask1.getStatus()==1){
 | 
			
		||||
                        nowStep=currTask1.getTargetPosition();
 | 
			
		||||
                    }else if (currTask1.getIsCache()==1){
 | 
			
		||||
                        nowStep=currTask.getLocationName();
 | 
			
		||||
                    }
 | 
			
		||||
                    if (currTaskInfoVo.getInStockInfoVoList().size()>0){
 | 
			
		||||
                        nowStep=currTaskInfoVo.getInStockInfoVoList().get(0).getLocationName();
 | 
			
		||||
                    }
 | 
			
		||||
                    allStep=allStep.concat("->").concat(currTask1.getTargetPosition());
 | 
			
		||||
                }
 | 
			
		||||
                //
 | 
			
		||||
                currTaskInfoVo.setAllStep(allStep);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user