From 2f9fd9af98fb985428de5f766811c4aeb1989069 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 12 六月 2021 16:43:10 +0800
Subject: [PATCH] Merge branch 'htasrs0' of https://gitee.com/luxiaotao1123/zy-asrs into htasrs0
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 a45ed9b..c677e5c 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -28,27 +28,42 @@
}
@Override
+ public List<Integer> getAvailableOutSite(Integer typeNo) {
+ return this.baseMapper.getAvailableOutSite(typeNo);
+ }
+
+ @Override
public List<Integer> getAvailableEmptyOutSite() {
return this.baseMapper.getAvailableOutSite(110);
}
@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("绔欑偣涓嶅瓨鍦�");
+ throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
}
- 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(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+ }
+ if(station.getLoading()==null || !station.getLoading().equals("Y")) {
+ throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+ }
+ if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
+ throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+ }
+// if(!station.getInEnable().equals("Y")) {
+// throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��");
+// }
+ if(wrkMastService.getWorkingMast(devpNo)>0){
+ throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ }
}
return station;
}
--
Gitblit v1.9.1