From 035bd551cd55080e71687e79c8f5ea59ff542c7a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 09:51:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 01c628a..d213561 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -19,12 +19,22 @@
@Override
public List<Integer> getAvailableInSite() {
- return this.baseMapper.getAvailableInSite();
+ return this.baseMapper.getAvailableInSite(1);
+ }
+
+ @Override
+ public List<Integer> getAvailableEmptyInSite() {
+ return this.baseMapper.getAvailableInSite(10);
}
@Override
public List<Integer> getAvailableOutSite() {
- return this.baseMapper.getAvailableOutSite();
+ return this.baseMapper.getAvailableOutSite(101);
+ }
+
+ @Override
+ public List<Integer> getAvailableEmptyOutSite() {
+ return this.baseMapper.getAvailableOutSite(110);
}
@Override
@@ -34,13 +44,13 @@
throw new CoolException("绔欑偣涓嶅瓨鍦�");
}
if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException("鍏ュ簱绔欑偣涓嶆槸鑷姩鐘舵��");
+ throw new CoolException("绔欑偣涓嶆槸鑷姩鐘舵��");
}
if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException("鍏ュ簱绔欑偣鏃犵墿");
+ throw new CoolException("绔欑偣鏃犵墿");
}
if(station.getWrkNo()!=null && station.getWrkNo()>0) {
- throw new CoolException("鍏ュ簱绔欑偣宸叉湁宸ヤ綔鍙�");
+ throw new CoolException("绔欑偣宸叉湁宸ヤ綔鍙�");
}
if(wrkMastService.getWorkingMast(devpNo)>0){
throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
--
Gitblit v1.9.1