From e15139e4ec5daffb4e4d4a8e48fb1237baeb5fad Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 14:02:03 +0800
Subject: [PATCH] 新增电视机显示小车异常异常信息提示
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 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 0de9f62..c7cb82b 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,44 @@
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(String devpNo) {
+ public List<Integer> getAvailableEmptyInSite() {
+ return this.baseMapper.getAvailableInSite(10);
+ }
+
+ @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 pakin) {
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 (pakin) {
+ if(station.getCanining()==null || !station.getAutoing().equals("Y")) {
+ throw new CoolException(devpNo+"绔欑偣涓嶆槸鑳藉叆鐘舵��");
+ }
+// if(wrkMastService.getWorkingMast(devpNo)>0){
+// throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+// }
}
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException("鍏ュ簱绔欑偣鏃犵墿");
- }
- if(station.getWrkNo()>0) {
- throw new CoolException("鍏ュ簱绔欑偣宸叉湁宸ヤ綔鍙�");
- }
- if(wrkMastService.getWorkingMast(devpNo)>0){
- throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
- }
+ return station;
}
}
--
Gitblit v1.9.1