From fc12e6bbc12d0346076fefe7320e99fd14d13193 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 14 四月 2026 11:10:39 +0800
Subject: [PATCH] wms初始化

---
 src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 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 c751422..a2267ba 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -49,24 +49,24 @@
             throw new CoolException(devpNo + "绔欑偣涓嶅瓨鍦�");
         }
         if (pakin) {
-            if(station.getCanining()==null || !station.getAutoing().equals("Y")) {
+            if(station.getCanining()==null || !station.getCanining().equals("Y")) {
                 throw new CoolException(devpNo+"绔欑偣涓嶆槸鑳藉叆鐘舵��");
             }
-//            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 + "绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
-//            }
+            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