From 2790d2558ef656ccddb4dbc94409decc8d227a1e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 九月 2024 10:10:02 +0800
Subject: [PATCH] #许可证
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 fbee059..babb339 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -28,8 +28,8 @@
}
@Override
- public List<Integer> getAvailableOutSite() {
- return this.baseMapper.getAvailableOutSite(101);
+ public List<Integer> getAvailableOutSite(Integer typeNo) {
+ return this.baseMapper.getAvailableOutSite(typeNo);
}
@Override
@@ -43,23 +43,26 @@
}
@Override
- public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
+ public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) {
BasDevp station = selectById(devpNo);
if (station == null){
- throw new CoolException("绔欑偣涓嶅瓨鍦�");
+ throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
}
- if (put) {
+ if (pakin) {
if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException("绔欑偣涓嶆槸鑷姩鐘舵��");
+ throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
}
if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException("绔欑偣鏃犵墿");
+ throw new CoolException(devpNo+"绔欑偣鏃犵墿");
}
- if(station.getWrkNo()!=null && station.getWrkNo()>0) {
- throw new CoolException("绔欑偣宸叉湁宸ヤ綔鍙�");
+ 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("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
}
}
return station;
--
Gitblit v1.9.1