From 370ef9917136dc8f53113a4bcb83a1f14976e50a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 六月 2025 15:16:16 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 6268698..d69ef4f 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -111,6 +111,10 @@
 
     @Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
     private void ShuttleOutTaskSend(){
+        List<WrkMast> wrkMastsMove = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
+        if (!wrkMastsMove.isEmpty()) {
+            return;
+        }
         List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                 .in("io_type", 1,10,53,54,57).eq("crn_no",7));
         if (!Cools.isEmpty(wrkMasts1)){
@@ -156,14 +160,14 @@
 
     @Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
     private void ShuttleMoveTaskSend(){
-        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11).eq("io_type",11));
+        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
         if (wrkMasts.isEmpty()) {
             return;
         }
         try {
             for (WrkMast wrkMast : wrkMasts) {
-                LocMast destLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
-                LocMast originLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("source_loc_no", wrkMast.getSourceLocNo()));
+                LocMast destLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+                LocMast originLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
                 if (originLoc == null || destLoc == null) {
                     throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
                 }
@@ -174,7 +178,7 @@
                 param.setOriginLoc(originLoc1);
                 param.setDestLoc(destLoc1);
                 param.setRecord(true);
-                param.setPriority("11");
+                param.setPriority("21");
                 String response = new HttpHandler.Builder()
                         .setUri(shuttleWcsUrl)
                         .setPath("/openapi/createLadenMoveTakeTask")

--
Gitblit v1.9.1