From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 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 10da32e..01c6e7e 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,23 @@
}
@Override
- public List<Integer> getAvailableOutSite() {
- return this.baseMapper.getAvailableOutSite(101);
+ public List<Integer> getAvailableOutSite(Integer typeNo) {
+ return this.baseMapper.getAvailableOutSite(typeNo);
+ }
+
+ @Override
+ public List<Integer> getCrnAvailableOutSite(Integer typeNo) {
+ return this.baseMapper.getCrnAvailableOutSite(typeNo);
+ }
+
+ @Override
+ public List<Integer> getShuttleAvailableOutSite(Integer typeNo) {
+ return this.baseMapper.getShuttleAvailableOutSite(typeNo);
+ }
+
+ @Override
+ public List<Integer> getCtuAvailableOutSite(Integer typeNo) {
+ return this.baseMapper.getCtuAvailableOutSite(typeNo);
}
@Override
@@ -38,22 +53,53 @@
}
@Override
+ public List<Integer> getCrnAvailableEmptyOutSite() {
+ return this.baseMapper.getCrnAvailableOutSite(110);
+ }
+
+ @Override
+ public List<Integer> getShuttleAvailableEmptyOutSite() {
+ return this.baseMapper.getShuttleAvailableOutSite(110);
+ }
+
+ @Override
+ public List<Integer> getCtuAvailableEmptyOutSite() {
+ return this.baseMapper.getCtuAvailableOutSite(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("绔欑偣涓嶅瓨鍦�");
+ if (station == null) {
+ 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 (pakin) {
+ if (devpNo < 1100) {
+// if (station.getWrkNo() != null && station.getWrkNo() > 0 && station.getWrkNo() < 9990) {
+// throw new CoolException(devpNo + "绔欑偣宸叉湁宸ヤ綔鍙�");
+// }
+// if (!station.getInEnable().equals("Y")) {
+// throw new CoolException(devpNo + "绔欑偣涓嶆槸鍙叆鐘舵��");
+// }
+ if (!station.getCanining().equals("Y")) {
+ throw new CoolException(devpNo + "绔欑偣涓嶆槸鑳藉叆鐘舵��");
+ }
+ } else {
+ 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 (wrkMastService.getWorkingMast(devpNo) > 0) {
+ throw new CoolException(devpNo + "绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ }
}
return station;
}
--
Gitblit v1.9.1