From 5e1164518df7f1d3fe1870f9c29b073e33048e4a Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 05 六月 2024 16:47:04 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 1c82e8f..5c9af68 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -203,24 +203,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));
-            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){

--
Gitblit v1.9.1