From 956f99c17ceef2b08f284e566a6a08b7b007286a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 08:55:44 +0800
Subject: [PATCH] qw

---
 src/main/java/com/zy/asrs/controller/BasDevpController.java    |    2 +-
 src/main/java/com/zy/asrs/controller/WorkController.java       |    2 +-
 src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java |   36 +++++++++++++++++++++---------------
 src/main/java/com/zy/common/service/CommonService.java         |    1 +
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index 5182bc4..9503d71 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -134,7 +134,7 @@
     public R query(String condition) {
         EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
         wrapper.like("dev_no", condition);
-        Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
+        Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 1000), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (BasDevp basDevp : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 47fc6fb..3d98e4c 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -67,7 +67,7 @@
     @RequestMapping("/available/take/site")
     @ManagerAuth()
     public R availableTakeSite() {
-        Set<Map<String, Object>> result = new TreeSet<>();
+        Set<Map<String, Object>> result = new HashSet<>();
         EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
         // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
         //RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
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 821c707..01c6e7e 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -75,24 +75,30 @@
     @Override
     public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) {
         BasDevp station = selectById(devpNo);
-        if (station == null){
-            throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
+        if (station == null) {
+            throw new CoolException(devpNo + "绔欑偣涓嶅瓨鍦�");
         }
         if (pakin) {
-            if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
-                throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+            if (devpNo < 1100) {
+//                if (station.getWrkNo() != null && station.getWrkNo() > 0 && station.getWrkNo() < 9990) {
+//                    throw new CoolException(devpNo + "绔欑偣宸叉湁宸ヤ綔鍙�");
+//                }
+//                if (!station.getInEnable().equals("Y")) {
+//                    throw new CoolException(devpNo + "绔欑偣涓嶆槸鍙叆鐘舵��");
+//                }
+                if (!station.getCanining().equals("Y")) {
+                    throw new CoolException(devpNo + "绔欑偣涓嶆槸鑳藉叆鐘舵��");
+                }
+            } else {
+                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.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+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+            if (wrkMastService.getWorkingMast(devpNo) > 0) {
+                throw new CoolException(devpNo + "绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
             }
         }
         return station;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9cc149f..ed4ce5f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -150,6 +150,7 @@
             }
 
         }catch (Exception e){
+            e.printStackTrace();
             log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
         }
         return null;

--
Gitblit v1.9.1