From 944c35175669e8af1c4dc47ce7921e0134978c6d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 14:42:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/BasDevpService.java | 4 +++-
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 3 ++-
src/main/webapp/static/js/staDesc/staDesc.js | 4 ++--
src/main/java/com/zy/asrs/controller/WorkController.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 9 +++++++--
src/main/resources/mapper/BasDevpMapper.xml | 13 ++++++++++++-
src/main/webapp/views/staDesc/staDesc_detail.html | 4 ++--
7 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index c71cf17..51c7407 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -26,13 +26,13 @@
@RequestMapping("/available/put/site")
@ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫叆搴撶珯鐐�")
public R availablePutSite(){
- return R.ok().add(basDevpService.getAvailableDevp());
+ return R.ok().add(basDevpService.getAvailableInSite());
}
@RequestMapping("/available/take/site")
@ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫嚭搴撶珯鐐�")
public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableDevp());
+ return R.ok().add(basDevpService.getAvailableOutSite());
}
@RequestMapping("/full/store/start")
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 0418ac6..91fb5a3 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -11,6 +11,7 @@
@Repository
public interface BasDevpMapper extends BaseMapper<BasDevp> {
- List<Integer> getAvailableDevp();
+ List<Integer> getAvailableInSite();
+ List<Integer> getAvailableOutSite();
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index bb560d7..7f26600 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -7,7 +7,9 @@
public interface BasDevpService extends IService<BasDevp> {
- List<Integer> getAvailableDevp();
+ List<Integer> getAvailableInSite();
+
+ List<Integer> getAvailableOutSite();
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 6bc4f97..01c628a 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -18,8 +18,13 @@
private WrkMastService wrkMastService;
@Override
- public List<Integer> getAvailableDevp() {
- return this.baseMapper.getAvailableDevp();
+ public List<Integer> getAvailableInSite() {
+ return this.baseMapper.getAvailableInSite();
+ }
+
+ @Override
+ public List<Integer> getAvailableOutSite() {
+ return this.baseMapper.getAvailableOutSite();
}
@Override
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 7e2b95f..303d769 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -41,7 +41,7 @@
</resultMap>
- <select id="getAvailableDevp" resultType="java.lang.Integer">
+ <select id="getAvailableInSite" resultType="java.lang.Integer">
select
abd.dev_no
from asr_bas_devp abd
@@ -52,4 +52,15 @@
group by abd.dev_no
</select>
+ <select id="getAvailableOutSite" resultType="java.lang.Integer">
+ select
+ abd.dev_no
+ from asr_bas_devp abd
+ left join asr_sta_desc asd on abd.dev_no = asd.stn_no
+ where 1=1
+ and asd.type_no = 110
+ and abd.out_enable = 'Y'
+ group by abd.dev_no
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/js/staDesc/staDesc.js b/src/main/webapp/static/js/staDesc/staDesc.js
index d62f4de..4068640 100644
--- a/src/main/webapp/static/js/staDesc/staDesc.js
+++ b/src/main/webapp/static/js/staDesc/staDesc.js
@@ -22,10 +22,10 @@
// ,{field: 'typeId', align: 'center',title: '璺緞ID'}
,{field: 'typeNo$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
// ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'}
- ,{field: 'stnNo$', align: 'center',title: '璧峰绔欑偣'}
+ ,{field: 'stnNo$', align: 'center',title: '浣滀笟绔欑偣'}
,{field: 'stnDesc', align: 'center',title: '绔欑偣鍚嶇О', edit:'text'}
,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'crnStn$', align: 'center',title: '鐩爣绔欑偣'}
+ ,{field: 'crnStn$', align: 'center',title: '鍫嗗灈鏈虹珯鐐�'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
// ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
// ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/views/staDesc/staDesc_detail.html b/src/main/webapp/views/staDesc/staDesc_detail.html
index 9270087..70ebbde 100644
--- a/src/main/webapp/views/staDesc/staDesc_detail.html
+++ b/src/main/webapp/views/staDesc/staDesc_detail.html
@@ -48,7 +48,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>璧峰绔欑偣锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>浣滀笟绔欑偣锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="stnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none">
<input id="stnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
@@ -78,7 +78,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐩爣绔欑偣锛�</label>
+ <label class="layui-form-label">鍫嗗灈鏈虹珯鐐癸細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="crnStn" class="layui-input" type="text" lay-verify="number" style="display: none">
<input id="crnStn$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
--
Gitblit v1.9.1