From 64c424ba723f97ae3f002b1bc5e88e718ba52781 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 25 十一月 2024 11:15:19 +0800
Subject: [PATCH] agv站点修改

---
 src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java |   80 ++++++++++++++++++++++++++++++++-------
 1 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 01c628a..821c707 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -19,31 +19,81 @@
 
     @Override
     public List<Integer> getAvailableInSite() {
-        return this.baseMapper.getAvailableInSite();
+        return this.baseMapper.getAvailableInSite(1);
     }
 
     @Override
-    public List<Integer> getAvailableOutSite() {
-        return this.baseMapper.getAvailableOutSite();
+    public List<Integer> getAvailableEmptyInSite() {
+        return this.baseMapper.getAvailableInSite(10);
+    }
+
+    @Override
+    public List<Integer> getAvailableOutSite(Integer typeNo) {
+        return this.baseMapper.getAvailableOutSite(typeNo);
+    }
+
+    @Override
+    public List<Integer> getCrnAvailableOutSite(Integer typeNo) {
+        return this.baseMapper.getCrnAvailableOutSite(typeNo);
+    }
+
+    @Override
+    public List<Integer> getShuttleAvailableOutSite(Integer typeNo) {
+        return this.baseMapper.getShuttleAvailableOutSite(typeNo);
+    }
+
+    @Override
+    public List<Integer> getCtuAvailableOutSite(Integer typeNo) {
+        return this.baseMapper.getCtuAvailableOutSite(typeNo);
+    }
+
+    @Override
+    public List<Integer> getAvailableEmptyOutSite() {
+        return this.baseMapper.getAvailableOutSite(110);
+    }
+
+    @Override
+    public List<Integer> getCrnAvailableEmptyOutSite() {
+        return this.baseMapper.getCrnAvailableOutSite(110);
+    }
+
+    @Override
+    public List<Integer> getShuttleAvailableEmptyOutSite() {
+        return this.baseMapper.getShuttleAvailableOutSite(110);
+    }
+
+    @Override
+    public List<Integer> getCtuAvailableEmptyOutSite() {
+        return this.baseMapper.getCtuAvailableOutSite(110);
     }
 
     @Override
     public BasDevp checkSiteStatus(Integer devpNo) {
+        return checkSiteStatus(devpNo, false);
+    }
+
+    @Override
+    public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) {
         BasDevp station = selectById(devpNo);
         if (station == null){
-            throw new CoolException("绔欑偣涓嶅瓨鍦�");
+            throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
         }
-        if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
-            throw new CoolException("鍏ュ簱绔欑偣涓嶆槸鑷姩鐘舵��");
-        }
-        if(station.getLoading()==null || !station.getLoading().equals("Y")) {
-            throw new CoolException("鍏ュ簱绔欑偣鏃犵墿");
-        }
-        if(station.getWrkNo()!=null && station.getWrkNo()>0) {
-            throw new CoolException("鍏ュ簱绔欑偣宸叉湁宸ヤ綔鍙�");
-        }
-        if(wrkMastService.getWorkingMast(devpNo)>0){
-            throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+        if (pakin) {
+            if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
+                throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+            }
+            if(station.getLoading()==null || !station.getLoading().equals("Y")) {
+                throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+            }
+//            if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
+//                throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+//            }
+//            if(!station.getInEnable().equals("Y")) {
+//                throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��");
+//            }
+            if(wrkMastService.getWorkingMast(devpNo)>0){
+                throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+            }
         }
         return station;
     }

--
Gitblit v1.9.1