From c31bf5a8902485b750b5814a0d1c54ecc65d2c96 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 31 八月 2024 10:12:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 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..babb339 100644 --- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java @@ -43,21 +43,24 @@ } @Override - public BasDevp checkSiteStatus(Integer devpNo, boolean put) { + public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) { BasDevp station = selectById(devpNo); if (station == null){ throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�"); } - if (put) { + 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) { + 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