From a0dc6d318064e45557bf2426a8f3064dbd23d93e Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 15:25:45 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/task/CheckDeepScheduler.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
index c0b0338..6050b5d 100644
--- a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
+++ b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
@@ -49,6 +49,13 @@
@Scheduled(cron = "0/30 * * * * ?")
private void locMoveToDeep(){
if (!confirmDeep) return;
+
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("crn_no",1)
+ .last(" and wrk_sts in (2,3,4,11,12)")
+ );
+ if (wrkMasts.size() > 0) return;
+
List<LocMast> locMasts = locMastService.queryShallowLocFMast();
if (null == locMasts) return;
@@ -64,6 +71,7 @@
if (Cools.isEmpty(wrkMast) && destLoc.getLocSts().equals("O") &&
(sourceLoc.getLocSts().equals("F") || sourceLoc.getLocSts().equals("D"))) {
workService.locMove(sourceLoc.getLocNo(), deep, 1L);
+ break;
}
}
}
--
Gitblit v1.9.1