From 1da336624f8928ecc382fc92dd9ada56fd932481 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 26 六月 2024 08:10:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 67 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 19720c1..0275339 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -40,8 +40,7 @@
.isNotNull("loc_type")
.ne("loc_type", "")
.eq("floor", 1)
- .eq("loc_sts","F")
- .orderBy("io_pri",false));
+ .eq("loc_sts","F"));
if (agvLocMasts.isEmpty()) {
return;
}
@@ -57,8 +56,8 @@
* ioType 108.鑷姩璋冩嫧
* crnNo :2鐩爣妤煎眰
*/
- @Scheduled(cron = "0/2 * * * * ? ")
- private void execute2(){
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private synchronized void execute2(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 22)
.andNew().eq("io_type",108)
@@ -120,6 +119,27 @@
for (AgvWrkMast agvWrkMast : agvWrkMastList) {
try{
autoMoveHandler.start3(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
+ }
+
+ }
+
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void execute4(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 22)
+ .andNew().eq("io_type",114)
+ .orderBy("io_pri",false)
+ .orderBy("appe_time",true)
+ );
+ if (agvWrkMastList.isEmpty()) {
+ return;
+ }
+ for (AgvWrkMast agvWrkMast : agvWrkMastList) {
+ try{
+ autoMoveHandler.start4(agvWrkMast);
} catch (Exception e){
log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
}
@@ -204,25 +224,22 @@
*/
@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack4(){
-// if (determineFloorConnection(2)){
- // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
- List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
- new EntityWrapper<AgvLocMast>()
- .ne("floor", 1)
- .eq("loc_sts","D")
- .eq("loc_type1",3)
- .orderBy("io_pri",false));
- if (agvLocMasts.isEmpty()) {
- return;
+ // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
+ new EntityWrapper<AgvLocMast>()
+ .ne("floor", 1)
+ .eq("loc_sts","D")
+ .eq("loc_type1",3));
+ if (agvLocMasts.isEmpty()) {
+ return;
+ }
+ for (AgvLocMast agvLocMast : agvLocMasts) {
+ try{
+ autoMoveHandler.autoEmptyBack4(agvLocMast);
+ } catch (Exception e){
+ log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
}
- for (AgvLocMast agvLocMast : agvLocMasts) {
- try{
- autoMoveHandler.autoEmptyBack4(agvLocMast);
- } catch (Exception e){
- log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
- }
- }
-// }
+ }
}
private boolean determineFloorConnection(Integer floor){
@@ -254,8 +271,7 @@
List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
.ne("floor", 1)
.eq("loc_sts", "F")
- .like("dev_no", "DB")
- .orderBy("io_pri",false));
+ .like("dev_no", "DB"));
if (agvBasDevps.isEmpty()) {
return;
}
@@ -277,8 +293,7 @@
List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
.eq("floor", 1)
.eq("loc_sts", "F")
- .like("dev_no", "DB")
- .orderBy("io_pri",false));
+ .like("dev_no", "DB"));
if (agvBasDevps.isEmpty()) {
return;
}
--
Gitblit v1.9.1