From d73aea22606a34be4d704c130f1a8444af58f5a8 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 15 十一月 2023 11:14:09 +0800
Subject: [PATCH] agv任务生成逻辑更改
---
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index 40200f9..6a4fe27 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -100,7 +100,8 @@
.eq("station_code", stationCode)
.like("dev_no", "0" + i + "@");
- if("CS-305".equals(stationCode) || "CS-306".equals(stationCode) || "CS-307".equals(stationCode)){
+ List<String> list = this.selectCacheShelvesStationCodeByFloor(3);
+ if(list.contains(stationCode)){
wrapper.orderBy("dev_no",false);
}
@@ -206,4 +207,19 @@
return this.selectList(new EntityWrapper<AgvBasDevp>().eq("cache_shelves","N"));
}
+ @Override
+ public List<String> selectCacheShelvesStationCodeByFloor(int floor) {
+ //Object o = this.selectList(new EntityWrapper<AgvBasDevp>().setSqlSelect("station_code").eq("floor",floor).eq("cache_shelves","Y").groupBy("station_code"));
+ return this.baseMapper.selectCacheShelvesStationCodeByFloor(floor);
+ }
+
+ public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode){
+ return this.baseMapper.selectDevNoAndNumBystationCode(stationCode);
+ }
+
+ @Override
+ public List<String> selectAllStationCode() {
+ return this.baseMapper.selectAllStationCode();
+ }
+
}
--
Gitblit v1.9.1