From fd4ceb219634c802a69828cdae2102278581ba9f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:58:02 +0800
Subject: [PATCH] 优化定时任务,添加自动接单(未完成,逻辑还不清楚),调整环境配置

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

diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index db4034f..2941e89 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -44,21 +44,21 @@
 
     // 璋冩嫧鍑哄簱
 //    @Scheduled(cron = "0/2 * * * * ? ")
-    private void execute(){
-        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
-                new EntityWrapper<AgvLocMast>()
-                        .isNotNull("loc_type")
-                        .ne("loc_type", "")
-                        .eq("floor", 1)
-                        .eq("loc_sts","F"));
-        if (agvLocMasts.isEmpty()) {
-            return;
-        }
-        for (AgvLocMast agvLocMast : agvLocMasts) {
-            ReturnT<String> returnT = autoMoveHandler.start(agvLocMast);
-        }
-
-    }
+//    private void execute(){
+//        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
+//                new EntityWrapper<AgvLocMast>()
+//                        .isNotNull("loc_type")
+//                        .ne("loc_type", "")
+//                        .eq("floor", 1)
+//                        .eq("loc_sts","F"));
+//        if (agvLocMasts.isEmpty()) {
+//            return;
+//        }
+//        for (AgvLocMast agvLocMast : agvLocMasts) {
+//            ReturnT<String> returnT = autoMoveHandler.start(agvLocMast);
+//        }
+//
+//    }
 
     /**
      * 鑷姩璋冩嫧浠诲姟锛屼粠1妤艰皟鎷ㄥ埌2妤硷紝3妤�
@@ -66,7 +66,7 @@
      * ioType 108.鑷姩璋冩嫧
      * crnNo :2鐩爣妤煎眰
      */
-    @Scheduled(cron = "0/3 * * * * ? ")
+    @Scheduled(cron = "0/1 * * * * ? ")
     private synchronized void execute2(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                 .eq("wrk_sts", 22)
@@ -82,7 +82,7 @@
             try{
                 autoMoveHandler.start2(agvWrkMast);
             } catch (Exception e){
-                log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+                //log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
             }
         }
 
@@ -130,7 +130,7 @@
             try{
                 autoMoveHandler.start3(agvWrkMast);
             } catch (Exception e){
-                log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+                //log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
             }
         }
 
@@ -344,7 +344,7 @@
 
             if (time3 > 0 && time3 < (1000* 60 * 10)) {
 
-                List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
+                List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1").eq("io_type",12));
                 if (maxTansk <= agvWrkMasts.size()){
                     return;
                 }
@@ -362,7 +362,7 @@
                     try{
                         autoMoveHandler.autoTransfers(agvLocMast,maxTansk);
                     } catch (Exception e){
-                        log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐�  搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+                        log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"瀹氭椂绉诲簱浠诲姟 鍚稿涓�妤� --> 鍚稿浜屾ゼ,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
                     }
                 }
             }

--
Gitblit v1.9.1