From 035bd551cd55080e71687e79c8f5ea59ff542c7a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 09:51:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/BasDevpService.java | 4 ++++
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 6 +++---
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 2a40586..8a51227 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -31,6 +31,10 @@
*/
List<Integer> getAvailableEmptyOutSite();
+ /**
+ * 鐩爣绔欑偣鐘舵�佹娴�
+ * @param devpNo
+ */
BasDevp checkSiteStatus(Integer devpNo);
}
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..d213561 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -44,13 +44,13 @@
throw new CoolException("绔欑偣涓嶅瓨鍦�");
}
if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException("鍏ュ簱绔欑偣涓嶆槸鑷姩鐘舵��");
+ throw new CoolException("绔欑偣涓嶆槸鑷姩鐘舵��");
}
if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException("鍏ュ簱绔欑偣鏃犵墿");
+ throw new CoolException("绔欑偣鏃犵墿");
}
if(station.getWrkNo()!=null && station.getWrkNo()>0) {
- throw new CoolException("鍏ュ簱绔欑偣宸叉湁宸ヤ綔鍙�");
+ throw new CoolException("绔欑偣宸叉湁宸ヤ綔鍙�");
}
if(wrkMastService.getWorkingMast(devpNo)>0){
throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 2f9fe0b..1fb1303 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -200,7 +200,7 @@
title: '璇︽儏',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
+ shadeClose: true,
content: 'wrkDetl_detail.html',
success: function(layero, index){
setFormVal(layer.getChildFrame('#detail', index), data, true);
--
Gitblit v1.9.1