From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

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

diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 3bfcbea..efcdff9 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -103,7 +103,7 @@
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                 ,new EntityWrapper<AgvWrkMast>()
                         .eq("wrk_sts", 21)
-                        .like("loc_no","@")
+                        //.like("loc_no","@")
                         .andNew().eq("io_type", 101)
                         .or().eq("io_type", 103)
                         .or().eq("io_type", 11)
@@ -122,7 +122,7 @@
     /*
     瀹氭椂澶勭悊绛夊緟鎵ц鐨勪换鍔� 宸ヤ綔鐘舵�佷负21.鐢熸垚鍑哄簱浠诲姟 涓旂洰鏍囧簱浣嶄腑涓嶅惈@瀛楃
      */
-    @Scheduled(cron = "0/10 * * * * ? ")
+    //@Scheduled(cron = "0/10 * * * * ? ")
     public void dealWatiWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectReadyAgvWrkMast();
         if(!Cools.isEmpty(agvWrkMastList)){

--
Gitblit v1.9.1