From 9beae5f38c4cfe95560601fc4638923a34f393e9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 14 二月 2025 13:17:57 +0800
Subject: [PATCH] 兼容四期

---
 src/main/java/com/zy/asrs/utils/LocUtils.java         |    2 +-
 src/main/java/com/zy/asrs/entity/Agv.java             |    3 +++
 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java |    4 ++--
 src/main/java/com/zy/asrs/task/AgvWarnScheduler.java  |   10 ++++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Agv.java b/src/main/java/com/zy/asrs/entity/Agv.java
index 4279954..7800c35 100644
--- a/src/main/java/com/zy/asrs/entity/Agv.java
+++ b/src/main/java/com/zy/asrs/entity/Agv.java
@@ -16,4 +16,7 @@
 
     @TableField("region")
     private String region;
+
+    @TableField("flag")
+    private Integer flag;
 }
diff --git a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
index fd5450b..bc086b1 100644
--- a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
@@ -92,7 +92,11 @@
             }
             if (DateUtil.offsetMinute(new Date(), -warnTime).after(begin)) {
                 buffer = new StringBuffer();
-                buffer.append(processRegion(agvs, agvWarn.getRobotCode()) + "[" + agvWarn.getRobotCode() + "]鍙稟GV灏忚溅鎶ヨ浜哱n");
+                String s = processRegion(agvs, agvWarn.getRobotCode());
+                if (s == null) {
+                    continue;
+                }
+                buffer.append(s + "[" + agvWarn.getRobotCode() + "]鍙稟GV灏忚溅鎶ヨ浜哱n");
                 buffer.append("鎶ヨ绫诲瀷锛�" + agvWarn.getWarnContent() + "\n");
                 if (!Cools.isEmpty(agvWarn.getSourceLocNo())) {
                     buffer.append("浠�:[" + agvWarn.getSourceLocNo() + "]鍒癧" + agvWarn.getLocNo() + "]\n");
@@ -107,7 +111,6 @@
                 data.put("content", buffer.toString());
                 param.put("msgtype", "text");
                 param.put("text", data);
-
                 sendData.put(agvWarn.getRobotCode() + agvWarn.getWarnContent(), param);
             }
             for (HashMap.Entry<String, Object> entry : sendData.entrySet()) {
@@ -155,6 +158,9 @@
         }
         for (Agv agv : agvs) {
             if (agv.getAgvNo() != null && agv.getAgvNo().equals(agvNo)) {
+                if (!Cools.isEmpty(agv.getFlag()) && agv.getFlag() == 1) {
+                    return null;
+                }
                 return agv.getRegion();
             }
         }
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 0c9018b..0df018b 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -418,13 +418,13 @@
                     return;
                 }
                 for (AgvLocMast agvLocMast : agvLocMasts) {
-                    if (agvLocMast.getLev1() == 1 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("2")) {
+                    if (agvLocMast.getLev1() == 1 && agvLocMast.getFloor() == 1 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("2")) {
                         try {
                             autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
                         } catch (Exception e) {
                             log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "鍥涙湡瀹氭椂绉诲簱浠诲姟 鍚稿 --> 鍚稿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
                         }
-                    } else if (agvLocMast.getLev1() == 2 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("1")) {
+                    } else if (agvLocMast.getLev1() == 2 && agvLocMast.getFloor() == 1 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("1")) {
                         try {
                             autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
                         } catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/utils/LocUtils.java b/src/main/java/com/zy/asrs/utils/LocUtils.java
index 87db780..ed83fb8 100644
--- a/src/main/java/com/zy/asrs/utils/LocUtils.java
+++ b/src/main/java/com/zy/asrs/utils/LocUtils.java
@@ -65,7 +65,7 @@
             EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
             wrapper.eq("loc_sts", "O").eq("loc_type1", type);
             if (floor == 4) {
-                wrapper.orderBy("lev1", false);
+                wrapper.orderBy("lev1", false).orderBy("row1", true);
             } else {
                 wrapper.orderBy("lev1", true);
             }

--
Gitblit v1.9.1