From 2a08feb00e3da1aacf1427751788fa37346dd2a2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 15 三月 2025 14:12:00 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 538c254..07c5c74 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -66,7 +66,7 @@
* ioType 108.鑷姩璋冩嫧
* crnNo :2鐩爣妤煎眰
*/
- @Scheduled(cron = "0/1 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
private synchronized void execute2() {
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("wrk_sts", 22).andNew().eq("io_type", 108).andNew().eq("crn_no", 2).or().eq("crn_no", 3).orderBy("io_pri", false).orderBy("appe_time", true));
if (agvWrkMastList.isEmpty()) {
@@ -110,7 +110,7 @@
* wrkSts 22.璋冩嫧寰呭垎閰�
* ioType 111.鎵嬪姩璋冩嫧
*/
- @Scheduled(cron = "0/2 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
private void execute3() {
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("wrk_sts", 22).andNew().eq("io_type", 111).orderBy("io_pri", false).orderBy("appe_time", true));
if (agvWrkMastList.isEmpty()) {
@@ -215,20 +215,48 @@
*/
@Scheduled(cron = "0/30 * * * * ? ")
private void autoEmptyBack4() {
- // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
// TODO 鍥涙湡
.eq("loc_sts", "D").eq("loc_type1", 3).andNew().ne("floor", 1).or().ne("lev1", 1));
if (agvLocMasts.isEmpty()) {
return;
}
+
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_3_TIME"));
for (AgvLocMast agvLocMast : agvLocMasts) {
- try {
- autoMoveHandler.autoEmptyBack4(agvLocMast);
- } catch (Exception e) {
- log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ if (agvLocMast.getLocNo().contains("02F1")) {
+ boolean flag = false;
+ if (config != null && !Cools.isEmpty(config.getValue())) {
+ try {
+
+ // 鍒ゆ柇鏄惁鍦ㄦ墽琛屾椂闂村唴
+ ProcesTimeData procesTimeData = JSONObject.parseObject(config.getValue(), ProcesTimeData.class);
+ if (procesTimeData != null && config.getStatus() == 1 && TimeUtils.between(procesTimeData)) {
+ flag = true;
+ }
+ } catch (Exception e) {
+ log.error("6绫诲瀷绌鸿揣鏋惰繑鍥炵殑鎵ц鏃堕棿鐐硅В鏋愬紓甯革細===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ flag = true;
+ }
+ }
+ if (flag) {
+ try {
+ autoMoveHandler.autoEmptyBack4(agvLocMast);
+ } catch (Exception e) {
+ //log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ }
+ }
+ } else {
+ try {
+ autoMoveHandler.autoEmptyBack4(agvLocMast);
+ } catch (Exception e) {
+ //log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ }
}
+
}
+
+
}
--
Gitblit v1.9.1