From d18505cc87fa30a5b202057bbcc4236986efc80a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 13:16:55 +0800
Subject: [PATCH] 纽维盛wms初始化-截至现在wms2.0已完善(带数据库)

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

--
Gitblit v1.9.1