From a78f80c36b64a69b1293289dad908abcb12858a8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 30 六月 2020 13:39:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 8bf09f4..d213561 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -18,27 +18,43 @@
private WrkMastService wrkMastService;
@Override
- public List<Integer> getAvailableDevp() {
- return this.baseMapper.getAvailableDevp();
+ public List<Integer> getAvailableInSite() {
+ return this.baseMapper.getAvailableInSite(1);
}
@Override
- public void checkSiteStatus(Integer devpNo) {
+ public List<Integer> getAvailableEmptyInSite() {
+ return this.baseMapper.getAvailableInSite(10);
+ }
+
+ @Override
+ public List<Integer> getAvailableOutSite() {
+ return this.baseMapper.getAvailableOutSite(101);
+ }
+
+ @Override
+ public List<Integer> getAvailableEmptyOutSite() {
+ return this.baseMapper.getAvailableOutSite(110);
+ }
+
+ @Override
+ public BasDevp checkSiteStatus(Integer devpNo) {
BasDevp station = selectById(devpNo);
if (station == null){
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()>0) {
- 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