From 2b613ec7306bf62b6bebde76fe6b4cccc4fc64ff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 15:02:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 0de9f62..01c628a 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -18,12 +18,17 @@
private WrkMastService wrkMastService;
@Override
- public List<Integer> getAvailableDevp() {
- return this.baseMapper.getAvailableDevp();
+ public List<Integer> getAvailableInSite() {
+ return this.baseMapper.getAvailableInSite();
}
@Override
- public void checkSiteStatus(String devpNo) {
+ public List<Integer> getAvailableOutSite() {
+ return this.baseMapper.getAvailableOutSite();
+ }
+
+ @Override
+ public BasDevp checkSiteStatus(Integer devpNo) {
BasDevp station = selectById(devpNo);
if (station == null){
throw new CoolException("绔欑偣涓嶅瓨鍦�");
@@ -34,11 +39,12 @@
if(station.getLoading()==null || !station.getLoading().equals("Y")) {
throw new CoolException("鍏ュ簱绔欑偣鏃犵墿");
}
- if(station.getWrkNo()>0) {
+ if(station.getWrkNo()!=null && station.getWrkNo()>0) {
throw new CoolException("鍏ュ簱绔欑偣宸叉湁宸ヤ綔鍙�");
}
if(wrkMastService.getWorkingMast(devpNo)>0){
throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
}
+ return station;
}
}
--
Gitblit v1.9.1