From ae2f9a18e28a7e223e8831fef82e14fd94e26193 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 07 四月 2025 16:37:54 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index 8c4da30..7100cb6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -25,6 +25,8 @@
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
@Autowired
+ private BusService busService;
+ @Autowired
private CodeService codeService;
@Autowired
private LocService locService;
@@ -94,6 +96,7 @@
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ busService.checkoutComplete(task.getBusId());
return Boolean.TRUE;
}
@@ -112,6 +115,7 @@
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ busService.checkoutComplete(task.getBusId());
return Boolean.TRUE;
}
@@ -135,7 +139,7 @@
if (null == codeId) {
return null;
}
- return laneService.search(codeService.getById(codeId).getData());
+ return laneService.search(codeService.getCacheById(codeId).getData());
}
@Override
@@ -158,7 +162,7 @@
if (null == codeId) {
return null;
}
- return laneService.search(codeService.getById(codeId).getData());
+ return laneService.search(codeService.getCacheById(codeId).getData());
}
@Override
@@ -184,6 +188,14 @@
wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
return this.list(wrapper);
+ }
+
+ @Override
+ public Integer findTransportTasksCountByAgv(Long agvId) {
+ LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>().eq(Task::getAgvId, agvId);
+ wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
+ wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
+ return this.count(wrapper);
}
@Override
@@ -214,13 +226,13 @@
oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
oriLoc.setUpdateTime(now);
if (!locService.updateById(oriLoc)) {
- throw new BusinessException("Loc [" + task.getOriLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ throw new BusinessException("Loc [" + oriLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
}
destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
destLoc.setUpdateTime(now);
if (!locService.updateById(destLoc)) {
- throw new BusinessException("Loc [" + task.getDestLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ throw new BusinessException("Loc [" + destLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
}
break;
case LOC_TO_STA:
@@ -228,18 +240,45 @@
oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
oriLoc.setUpdateTime(now);
if (!locService.updateById(oriLoc)) {
- throw new BusinessException("Loc [" + task.getOriLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ throw new BusinessException("Loc [" + oriLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ }
+
+ destSta = staService.getById(task.getDestSta());
+ destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
+ destSta.setUpdateTime(now);
+ if (!staService.updateById(destSta)) {
+ throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
}
break;
case STA_TO_LOC:
+ oriSta = staService.getById(task.getOriSta());
+ oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
+ oriSta.setUpdateTime(now);
+ if (!staService.updateById(oriSta)) {
+ throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ }
+
destLoc = locService.getById(task.getDestLoc());
destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
destLoc.setUpdateTime(now);
if (!locService.updateById(destLoc)) {
- throw new BusinessException("Loc [" + task.getDestLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ throw new BusinessException("Loc [" + destLoc.getLocNo() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
}
break;
case STA_TO_STA:
+ oriSta = staService.getById(task.getOriSta());
+ oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
+ oriSta.setUpdateTime(now);
+ if (!staService.updateById(oriSta)) {
+ throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ }
+
+ destSta = staService.getById(task.getDestSta());
+ destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
+ destSta.setUpdateTime(now);
+ if (!staService.updateById(destSta)) {
+ throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ }
break;
case TO_CHARGE:
case TO_STANDBY:
--
Gitblit v1.9.1