From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 29 九月 2025 13:34:21 +0800
Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态，显示清楚 （完成） 4. 站点保存报错， 修改人，创建人员显示 错误（完成） 5. agv入库不显示 历史库位记录 (完成) 6. 任务类型，应该为入库 (完成)
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 1f87a7d..babb339 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -43,21 +43,24 @@
}
@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+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
}
--
Gitblit v1.9.1