From 2bd674963fda5c14685ab3fa973366d2c2ae527f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 29 一月 2021 14:19:26 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 5 ++++- 1 files changed, 4 insertions(+), 1 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 1f87a7d..c677e5c 100644 --- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java @@ -55,9 +55,12 @@ if(station.getLoading()==null || !station.getLoading().equals("Y")) { throw new CoolException(devpNo+"绔欑偣鏃犵墿"); } - if(station.getWrkNo()!=null && station.getWrkNo()>0) { + 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+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�"); } -- Gitblit v1.9.1