edit

xumiao
1 parent 22e76ee8
Showing 2 changed files with 8 additions and 7 deletions
src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
@@ -87,7 +87,8 @@ public class AgvTaskController extends BaseController {
                 .ge(StringUtils.isNotEmpty(createdBegin),AgvTask::getCreatedTime,createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd),AgvTask::getCreatedTime,createdEnd)
                 .le(StringUtils.isNotEmpty(taskComplete),AgvTask::getStatus,taskComplete)
-                .last(!StringUtils.isAnyEmpty(isAsc,orderByColumn),"order by"+" "+orderByColumn+" "+isAsc);
+                .last(!StringUtils.isAnyEmpty(isAsc,orderByColumn),"order by"+" "+orderByColumn+" "+isAsc)
+                .last(StringUtils.isAnyEmpty(isAsc,orderByColumn),"order by id desc");
         /**
          * 使用分页查询
          */
@@ -293,20 +293,20 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
             if(flag.equals("true")){
                 AgvTask agvTask=new AgvTask();
                 agvTask.setFromPort(sourcePosition.getCode());
-//                if(i==1){
-//                    agvTask.setToPort("Work 776");
+                if(i==1){
+                    agvTask.setToPort("Work 776");
 //                    List<AgvTask> agvTasks=list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort,"Work 776").lt(AgvTask::getStatus,100));
 //                    if(CollectionUtils.isNotEmpty(agvTasks)){
 //                        return AjaxResult.error("接驳位P4001有任务去");
 //                    }
-//                }
-//                if(i==3){
-//                    agvTask.setToPort("Work 633");
+                }
+                if(i==3){
+                    agvTask.setToPort("Work 633");
 //                    List<AgvTask> agvTasks=list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort,"Work 633").lt(AgvTask::getStatus,100));
 //                    if(CollectionUtils.isNotEmpty(agvTasks)){
 //                        return AjaxResult.error("接驳位P4002有任务去");
 //                    }
-//                }
+                }
                 agvTask.setContainerCode(task.getContainerCode());
                 agvTask.setWarehouseCode("CS0001");
                 agvTask.setPreTaskNo(task.getId().toString());