From dbc2514aad6b2b70b08e81f33d45f64aae175ccf Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 16:31:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 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 5622335..9f914a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -18,6 +18,11 @@
private WrkMastService wrkMastService;
@Override
+ public Integer selectWaitNecessary(List<Integer> devNos,Integer wrkNo){
+ return this.baseMapper.selectWaitNecessary(devNos,wrkNo);
+ }
+
+ @Override
public List<Integer> getAvailableInSite() {
return this.baseMapper.getAvailableInSite(1);
}
@@ -28,8 +33,8 @@
}
@Override
- public List<Integer> getAvailableOutSite() {
- return this.baseMapper.getAvailableOutSite(101);
+ public List<Integer> getAvailableOutSite(Integer typeNo) {
+ return this.baseMapper.getAvailableOutSite(typeNo);
}
@Override
@@ -43,21 +48,50 @@
}
@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(devpNo+"绔欑偣涓嶅瓨鍦�");
}
- if (put) {
+ if (pakin) {
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) {
+ 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;
+ }
+
+ @Override
+ public BasDevp checkSiteStatusEmpty(Integer devpNo, boolean pakin) {
+ BasDevp station = selectById(devpNo);
+ if (station == null){
+ throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
+ }
+ if (pakin) {
+// 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+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
}
--
Gitblit v1.9.1