From eadd700511d0dd1cc31cb103ec8b6cece272fc37 Mon Sep 17 00:00:00 2001
From: xumiao <1365304440@qq.com>
Date: Mon, 12 Dec 2022 10:39:51 +0800
Subject: [PATCH] edit
---
src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java | 3 ++-
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java b/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
index d1ea647..cb52a87 100644
--- a/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
+++ b/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.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");
/**
* 使用分页查询
*/
diff --git a/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java b/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
index 677f256..d7b644c 100644
--- a/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
+++ b/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
@@ -293,20 +293,20 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> 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());
--
libgit2 0.22.2