From fba1d7c01607270707f6bdd5cd255bea0e141cf3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 27 七月 2020 14:40:45 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 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 d213561..fbee059 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -39,21 +39,28 @@
@Override
public BasDevp checkSiteStatus(Integer devpNo) {
+ return checkSiteStatus(devpNo, false);
+ }
+
+ @Override
+ public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
BasDevp station = selectById(devpNo);
if (station == null){
throw new CoolException("绔欑偣涓嶅瓨鍦�");
}
- if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException("绔欑偣涓嶆槸鑷姩鐘舵��");
- }
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException("绔欑偣鏃犵墿");
- }
- if(station.getWrkNo()!=null && station.getWrkNo()>0) {
- throw new CoolException("绔欑偣宸叉湁宸ヤ綔鍙�");
- }
- if(wrkMastService.getWorkingMast(devpNo)>0){
- throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ if (put) {
+ if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
+ throw new CoolException("绔欑偣涓嶆槸鑷姩鐘舵��");
+ }
+ if(station.getLoading()==null || !station.getLoading().equals("Y")) {
+ throw new CoolException("绔欑偣鏃犵墿");
+ }
+ if(station.getWrkNo()!=null && station.getWrkNo()>0) {
+ throw new CoolException("绔欑偣宸叉湁宸ヤ綔鍙�");
+ }
+ if(wrkMastService.getWorkingMast(devpNo)>0){
+ throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ }
}
return station;
}
--
Gitblit v1.9.1