From 3fa0f0b6707a0f6f696659c6e0797f8377c5e6dc Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 17:03:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

---
 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 3bf8d47..6b30542 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -77,7 +77,7 @@
     }
 
     // 绌烘澘鑷姩鍥炲簱  搴撲綅-鎺ラ┏鐐�
-    @Scheduled(cron = "0/2 * * * * ? ")
+    //@Scheduled(cron = "0/2 * * * * ? ")
     private void autoEmptyBack(){
         // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
         List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
@@ -93,13 +93,13 @@
         }
     }
     // 绌烘澘鑷姩鍥炲簱  鎺ラ┏鐐� - 1妤煎簱浣�
-    @Scheduled(cron = "0/2 * * * * ? ")
+    //@Scheduled(cron = "0/2 * * * * ? ")
     private void autoEmptyBack3(){
         // 宸ヤ綔妗d负201 涓� 鍏ュ嚭搴撶被鍨嬩负109
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                 .eq("wrk_sts", 201)
                 .eq("loc_no","")
-                .or().eq("io_type",109)
+                .eq("io_type",109)
                 .or().eq("io_type",112));
         if (agvWrkMastList.isEmpty()) {
             return;
@@ -110,7 +110,7 @@
     }
 
     // 绌烘澘鑷姩鍥炲簱
-    //@Scheduled(cron = "0/2 * * * * ? ")
+    @Scheduled(cron = "0/2 * * * * ? ")
     private void autoEmptyBack2(){
         // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
         List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(

--
Gitblit v1.9.1