From 580eaad456dc829d829514218a0a5c52f38ef073 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 16:39:05 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/emptyOut.js | 2
src/main/webapp/static/js/pakStore/emptyIn.js | 36 ++++++++++++
src/main/java/com/zy/asrs/service/BasDevpService.java | 16 +++++
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 5 +
src/main/webapp/views/pakStore/emptyIn.html | 39 +++++++++++++
src/main/webapp/views/pakStore/emptyOut.html | 2
src/main/java/com/zy/asrs/controller/WorkController.java | 16 +++-
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 11 ++-
src/main/resources/mapper/BasDevpMapper.xml | 4
9 files changed, 116 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 9d1a866..a060e06 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -25,15 +25,21 @@
private BasDevpService basDevpService;
@RequestMapping("/available/put/site")
- @ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫叆搴撶珯鐐�")
+ @ManagerAuth(memo = "鑾峰彇鍏ュ簱绔欑偣")
public R availablePutSite(){
return R.ok().add(basDevpService.getAvailableInSite());
}
- @RequestMapping("/available/take/site")
- @ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫嚭搴撶珯鐐�")
- public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite());
+ @RequestMapping("/available/empty/put/site")
+ @ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣")
+ public R availableEmptyPutSite(){
+ return R.ok().add(basDevpService.getAvailableEmptyInSite());
+ }
+
+ @RequestMapping("/available/empty/take/site")
+ @ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
+ public R availableEmptyTakeSite(){
+ return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
@RequestMapping("/full/store/put/start")
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 91fb5a3..668d2ca 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasDevp;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,7 +12,7 @@
@Repository
public interface BasDevpMapper extends BaseMapper<BasDevp> {
- List<Integer> getAvailableInSite();
+ List<Integer> getAvailableInSite(@Param("typeNo") Integer typeNo);
- List<Integer> getAvailableOutSite();
+ List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 7f26600..6a701f1 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -7,9 +7,23 @@
public interface BasDevpService extends IService<BasDevp> {
+ /**
+ * 鍏ュ簱绔�
+ * @return
+ */
List<Integer> getAvailableInSite();
- List<Integer> getAvailableOutSite();
+ /**
+ * 绌烘澘鍏ュ簱绔�
+ * @return
+ */
+ List<Integer> getAvailableEmptyInSite();
+
+ /**
+ * 绌烘澘鍑哄簱绔�
+ * @return
+ */
+ List<Integer> getAvailableEmptyOutSite();
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 01c628a..a45ed9b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -19,12 +19,17 @@
@Override
public List<Integer> getAvailableInSite() {
- return this.baseMapper.getAvailableInSite();
+ return this.baseMapper.getAvailableInSite(1);
}
@Override
- public List<Integer> getAvailableOutSite() {
- return this.baseMapper.getAvailableOutSite();
+ public List<Integer> getAvailableEmptyInSite() {
+ return this.baseMapper.getAvailableInSite(10);
+ }
+
+ @Override
+ public List<Integer> getAvailableEmptyOutSite() {
+ return this.baseMapper.getAvailableOutSite(110);
}
@Override
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 303d769..0546242 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -47,7 +47,7 @@
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 = 1
+ and asd.type_no = #{typeNo}
and abd.in_enable = 'Y'
group by abd.dev_no
</select>
@@ -58,7 +58,7 @@
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 asd.type_no = #{typeNo}
and abd.out_enable = 'Y'
group by abd.dev_no
</select>
diff --git a/src/main/webapp/static/js/pakStore/emptyIn.js b/src/main/webapp/static/js/pakStore/emptyIn.js
new file mode 100644
index 0000000..305f2a3
--- /dev/null
+++ b/src/main/webapp/static/js/pakStore/emptyIn.js
@@ -0,0 +1,36 @@
+var pageCurr;
+layui.use(['table','laydate', 'form'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ getInBound();
+
+ // 鑾峰彇鍏ュ簱鍙�
+ function getInBound(){
+ $.ajax({
+ url: baseUrl+"/available/empty/put/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ asymc: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#putSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#inSiteSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
+
+})
+
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index 43b9467..6e11bd3 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -9,7 +9,7 @@
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
$.ajax({
- url: baseUrl+"/available/take/site",
+ url: baseUrl+"/available/empty/take/site",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
asymc: false,
diff --git a/src/main/webapp/views/pakStore/emptyIn.html b/src/main/webapp/views/pakStore/emptyIn.html
index 933bee4..bd82cff 100644
--- a/src/main/webapp/views/pakStore/emptyIn.html
+++ b/src/main/webapp/views/pakStore/emptyIn.html
@@ -10,10 +10,41 @@
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
+ html {
+ height: 100%;
+ padding: 10px;
+ background-color: #f1f1f1;
+ }
+ body {
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ }
+
+ .function-area {
+ padding: 20px 50px;
+ }
</style>
</head>
<body>
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="padding: 9px 0">绌烘澘鍏ュ簱鍙ｏ細</label>
+ <div class="layui-input-block" style="margin-left: 90px;">
+ <select id="inSiteSelect" lay-verify="required" lay-search="">
+ <option value="">璇烽�夋嫨绔欑偣</option>
+ </select>
+ </div>
+ </div>
+
+ <div style="text-align: center; margin-top: 20px">
+ <button class="layui-btn layui-btn-radius layui-btn-normal" id="btn-inbound" lay-submit lay-filter="inbound">鍏ュ簱鍚姩</button>
+ </div>
+ </div>
+</div>
@@ -22,6 +53,14 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pakStore/emptyIn.js" charset="utf-8"></script>
+
+<script type="text/template" id="putSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+
</body>
</html>
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index 4ec0098..4674627 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -98,7 +98,7 @@
<div class="layui-form">
<div class="layui-btn-container">
<!-- 1.閫夋嫨鍑哄簱鍙� -->
- <span id="staNoSpan">鍑哄簱鍙ｏ細</span>
+ <span id="staNoSpan">绌烘澘鍑哄簱鍙ｏ細</span>
<select id="staNoSelect" lay-verify="required">
<option value="">璇烽�夋嫨绔欑偣</option>
</select>
--
Gitblit v1.9.1