From 6298f178c71f1eb95d4066ffe88d4becd6fc6bfc Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 11 七月 2024 08:34:42 +0800
Subject: [PATCH] #MES上报

---
 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java |   10 ++++++----
 1 files changed, 6 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 26a801d..cc83782 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -63,7 +63,7 @@
                 .andNew().eq("io_type",108)
                         .andNew()
                         .eq("crn_no",2).or().eq("crn_no",3)
-                        .orderBy("appe_time",true)
+                        .orderBy("io_pri",false).orderBy("appe_time",true)
                 );
         if (agvWrkMastList.isEmpty()) {
             return;
@@ -72,7 +72,7 @@
             try{
                 autoMoveHandler.start2(agvWrkMast);
             } catch (Exception e){
-                log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+                //log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
             }
         }
 
@@ -110,6 +110,7 @@
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                 .eq("wrk_sts", 22)
                 .andNew().eq("io_type",111)
+                .orderBy("io_pri",false)
                 .orderBy("appe_time",true)
         );
         if (agvWrkMastList.isEmpty()) {
@@ -119,7 +120,7 @@
             try{
                 autoMoveHandler.start3(agvWrkMast);
             } catch (Exception e){
-                log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+                //log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
             }
         }
 
@@ -158,7 +159,8 @@
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                 .eq("wrk_sts", 214)
                 .eq("loc_no","")
-                .eq("io_type",113));
+                .eq("io_type",113)
+                .orderBy("io_pri",false));
         if (agvWrkMastList.isEmpty()) {
             return;
         }

--
Gitblit v1.9.1