From e61f054bf5bf18c8a0095b0ee4b5ff0ea0f0d2f1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 20 三月 2025 14:42:30 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 14544b6..641de6c 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.service.AgvBasDevpService;
@@ -18,6 +19,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -44,7 +46,7 @@
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 锛�1.鍏ュ簱 || 53锛屾嫞鏂欏叆搴� || 57.鐩樼偣鍏ュ簱 || 10.绌烘澘鍏ュ簱 || 11.鍗曞眰绉诲簱 || 12.璺ㄥ眰绉诲簱 || 108.鑷姩璋冩嫧 || 109.鎵嬪姩璋冩嫧)鐨勬暟鎹�
*/
//@Scheduled(cron = "0/1 * * * * ? ")
- @Scheduled(fixedDelay = 2000)
+ @Scheduled(fixedDelay = 1000)
public void excutePutwayWrk(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 205)
@@ -78,7 +80,7 @@
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
*/
//@Scheduled(cron = "0/1 * * * * ? ")
- @Scheduled(fixedDelay = 2000)
+ @Scheduled(fixedDelay = 1000)
public void excuteCarryWrk(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 206)
@@ -101,7 +103,7 @@
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
*/
//@Scheduled(cron = "0/1 * * * * ? ")
- @Scheduled(fixedDelay = 2000)
+ @Scheduled(fixedDelay = 1000)
public void excuteCarryWrk2(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 208)
@@ -124,8 +126,8 @@
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷ｆ枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
*/
//@Scheduled(cron = "0/1 * * * * ? ")
- @Scheduled(fixedDelay = 2000)
- public void startPutwayWrk(){
+ @Scheduled(fixedDelay = 3000)
+ public synchronized void startPutwayWrk(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
,new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 201)
@@ -159,7 +161,7 @@
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷ｆ枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
*/
//@Scheduled(cron = "0/1 * * * * ? ")
- @Scheduled(fixedDelay = 2000)
+ @Scheduled(fixedDelay = 1000)
public void startAllcationIn(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
,new EntityWrapper<AgvWrkMast>()
@@ -218,7 +220,7 @@
agvWrkMastWorking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
.eq("source_loc_no",agvWrkMast.getLocNo())
- .le("wrk_sts",204L));
+ .lt("wrk_sts",204L));
if(!Cools.isEmpty(agvWrkMastWorking)){
return;
@@ -250,7 +252,7 @@
鑷姩鐢熸垚绌烘澘鍑哄簱浠诲姟
*/
//@Scheduled(cron = "0/1 * * * * ? ")
- @Scheduled(fixedDelay = 2000)
+ @Scheduled(fixedDelay = 1000)
public void autoEmptyOut(){
boolean packageEmptyAutoOUt = Cools.eq("Y",Parameter.get().getPackageEmptyAutoOUt());
boolean mateEmptyAutoOut = Cools.eq("Y",Parameter.get().getMateEmptyAutoOut());
@@ -282,8 +284,8 @@
try {
agvWrkMastHandler.autoEmptyOut(agvBasDevp);
}catch (Exception e){
- log.error(e.getMessage());
- e.printStackTrace();
+ //log.error(e.getMessage());
+ //e.printStackTrace();
}
}
--
Gitblit v1.9.1