From 2652245dcba9a47e1159550304e7a9b0b332b42a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 16:02:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 11 ++++++++---
1 files changed, 8 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 a66375b..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,8 +18,13 @@
private WrkMastService wrkMastService;
@Override
- public List<Integer> getAvailableDevp() {
- return this.baseMapper.getAvailableDevp();
+ public List<Integer> getAvailableInSite() {
+ return this.baseMapper.getAvailableInSite();
+ }
+
+ @Override
+ public List<Integer> getAvailableOutSite() {
+ return this.baseMapper.getAvailableOutSite();
}
@Override
@@ -34,7 +39,7 @@
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){
--
Gitblit v1.9.1