From 2a08feb00e3da1aacf1427751788fa37346dd2a2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 15 三月 2025 14:12:00 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/common/service/AgvCommonService.java |   91 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 9278a72..e09b94e 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -6,6 +6,8 @@
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.LocUtils;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +37,9 @@
     private LocRuleService locRuleService;
     @Autowired
     AgvBasDevpService agvBasDevpService;
+
+    @Autowired
+    private ConfigService configService;
 
     @Autowired
     private LocUtils locUtils;
@@ -146,9 +151,64 @@
     }
 
     /**
+     * 搴撲綅瑙勫垯鏌ユ壘锛屼細棰勭暀20涓簱浣�
+     */
+    public synchronized AgvLocMast getLocByLocRule20(int type, int floor, String factory, boolean flag) {
+
+        try {
+            EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
+            wrapper.eq("loc_sts", "O").eq("loc_type1", type);
+            List<AgvLocMast> agvLocMasts = new ArrayList<>();
+            //涓嶆槸绌烘澘浼樺厛鎵�2灞�
+            if (Cools.isEmpty(factory)) {
+                wrapper.eq("floor", floor).orderBy("lev1", true);
+            } else {
+                //B鏄簩鍘傦紝G鏄笁鍘�
+                if (factory.equals("B")) {
+                    wrapper.eq("floor", floor).orderBy("lev1", false).orderBy("row1", flag);
+
+                } else {
+                    wrapper.eq("floor", floor).orderBy("lev1", true);
+
+                }
+            }
+            int num = 20;
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LOC_3_NUM"));
+            if (config != null && !Cools.isEmpty(config.getValue())) {
+                num = Integer.parseInt(config.getValue());
+            }
+            agvLocMasts = agvLocMastService.selectList(wrapper);
+            int er = 0;
+            for (AgvLocMast agvLocMast : agvLocMasts) {
+                if (agvLocMast.getLev1() == 2) {
+                    er++;
+                }
+            }
+            for (AgvLocMast agvLocMast : agvLocMasts) {
+                AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
+                if (agvLocMast1.getLocSts().equals("O")) {
+                    if (agvLocMast1.getLev1() == 2) {
+                        if (er > num) {
+                            return agvLocMast1;
+                        }
+                    } else {
+                        return agvLocMast1;
+                    }
+
+                }
+            }
+            throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�");
+        } catch (Exception e) {
+            throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�");
+        }
+
+
+    }
+
+    /**
      * 搴撲綅瑙勫垯鏌ユ壘
      */
-    public AgvLocMast getLocByLocRule(int type, int floor, String factory) {
+    public synchronized AgvLocMast getLocByLocRule(int type, int floor, String factory, boolean flag) {
 
         try {
             EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
@@ -161,7 +221,7 @@
                 //B鏄簩鍘傦紝G鏄笁鍘�
                 switch (factory) {
                     case "B":
-                        wrapper.eq("floor", floor).orderBy("lev1", false);
+                        wrapper.eq("floor", floor).orderBy("lev1", false).orderBy("row1", flag);
                         break;
                     case "G":
                         wrapper.eq("floor", floor).orderBy("lev1", true);
@@ -183,6 +243,8 @@
         } catch (Exception e) {
             throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�");
         }
+
+
     }
 
     /**
@@ -343,6 +405,31 @@
         return null;
     }
 
+    public AgvLocMast getLocNoOnXiSuer20(int type, int floor) {
+        EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
+        wrapper.eq("loc_sts", "O").eq("loc_type1", type);
+        wrapper.eq("floor", floor).eq("lev1", 2);
+        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
+        if (Cools.isEmpty(agvLocMasts)) {
+            return null;
+        } else {
+            int num = 15;
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LOC_6_NUM"));
+            if (config != null && !Cools.isEmpty(config.getValue())) {
+                num = Integer.parseInt(config.getValue());
+            }
+            if (agvLocMasts.size()>num){
+                for (AgvLocMast agvLocMast : agvLocMasts) {
+                    AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
+                    if (agvLocMast1.getLocSts().equals("O")) {
+                        return agvLocMast1;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
 
     //闅忔満鍙栦竴涓揣浣�
     private AgvLocMast getLocNoRule(int type, int floor, boolean isEmpty, boolean isCurrLev) {

--
Gitblit v1.9.1