From cedcb836da53948de688e04539786d88904d5bd4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 六月 2020 15:56:45 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/pakStore.html | 45 +++++++++++++--
src/main/java/com/zy/asrs/service/BasDevpService.java | 4 +
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 4 +
src/main/java/com/zy/common/web/wms/WorkController.java | 25 ++++++++
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 6 ++
src/main/resources/mapper/BasDevpMapper.xml | 12 ++++
src/main/webapp/static/js/pakStore/pakStore.js | 26 ++++----
src/main/webapp/views/pakStore/matQuery.html | 25 --------
8 files changed, 104 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 4d945f7..0418ac6 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -5,8 +5,12 @@
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface BasDevpMapper extends BaseMapper<BasDevp> {
+ List<Integer> getAvailableDevp();
+
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 50b82aa..3c39b24 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -3,6 +3,10 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasDevp;
+import java.util.List;
+
public interface BasDevpService extends IService<BasDevp> {
+ List<Integer> getAvailableDevp();
+
}
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 ed80212..47c650d 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -6,7 +6,13 @@
import com.zy.asrs.service.BasDevpService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("basDevpService")
public class BasDevpServiceImpl extends ServiceImpl<BasDevpMapper, BasDevp> implements BasDevpService {
+ @Override
+ public List<Integer> getAvailableDevp() {
+ return this.baseMapper.getAvailableDevp();
+ }
}
diff --git a/src/main/java/com/zy/common/web/wms/WorkController.java b/src/main/java/com/zy/common/web/wms/WorkController.java
new file mode 100644
index 0000000..9faa37c
--- /dev/null
+++ b/src/main/java/com/zy/common/web/wms/WorkController.java
@@ -0,0 +1,25 @@
+package com.zy.common.web.wms;
+
+import com.core.common.R;
+import com.zy.asrs.service.BasDevpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by vincent on 2020/6/10
+ */
+@RestController
+public class WorkController {
+
+ @Autowired
+ private BasDevpService basDevpService;
+
+ @RequestMapping("available/put/site")
+ public R availablePutSite(){
+
+ // 鑾峰彇鏈夋晥鐨勫叆搴撶珯鐐�
+ return R.ok().add(basDevpService.getAvailableDevp());
+ }
+
+}
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 523d836..9d69db5 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -41,4 +41,16 @@
</resultMap>
+ <select id="getAvailableDevp" 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 = 1
+ and abd.in_enable = 'Y'
+ group by abd.dev_no
+
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 0f2a8d4..401c404 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -49,20 +49,20 @@
var data = checkStatus.data;
switch(obj.event) {
case 'comb':
- if (data.length === 0){
- layer.msg('璇烽�夋嫨鏁版嵁');
- } else {
- layer.open({
- type: 1,
- title: '缁勭洏',
- maxmin: true,
- shadeClose: true,
- content: $('#combDiv'),
- success: function (layero, index) {
-
- }
- })
+ if (matCodeData.length === 0) {
+ layer.msg("璇峰厛娣诲姞鐗╂枡");
+ return;
}
+ layer.open({
+ type: 1,
+ title: '閫夋嫨鍏ュ簱绔�',
+ maxmin: true,
+ shadeClose: true,
+ content: $('#combDiv'),
+ success: function (layero, index) {
+
+ }
+ })
break;
}
});
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index d43a665..de737e1 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -79,7 +79,7 @@
toolbar: '#toolbar',
cols: [[
{type: 'checkbox', fixed: 'left'},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', sort: 'true'},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'barcode', align: 'center', title: '鏉＄爜'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
{field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
@@ -106,29 +106,6 @@
}
}
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(matCode)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- matQueryTable.reload({
- where: searchData,
- page: {
- curr: 1
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- limit();
- }
- });
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 9026965..01e40f7 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -37,11 +37,15 @@
transition: 0.4s;
cursor: pointer;
letter-spacing: 3px;
- margin: 0 10px;
}
.function-btn:hover {
background-color: #2b425b;
color: #fff;
+ }
+
+ .layui-layer-page .layui-layer-content {
+ position: relative;
+ overflow: visible !important;
}
</style>
</head>
@@ -52,7 +56,7 @@
<!-- 绔欑偣閫夋嫨妗� group by -- 绌哄簱浣� -->
- <button id="mat-put" class="function-btn" onclick="putMat()">鍚姩鍏ュ簱</button>
+<!-- <button id="mat-put" class="function-btn" onclick="putMat()">鍚姩鍏ュ簱</button>-->
</div>
<hr>
@@ -63,7 +67,7 @@
<!-- 澶撮儴 -->
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal" id="btn-comb" lay-event="comb" style="">缁勭洏</button>
+ <button class="layui-btn layui-btn-normal" id="btn-comb" lay-event="comb" style="">鍏ュ簱</button>
</div>
</script>
@@ -85,17 +89,46 @@
<div id="combDiv" style="display: none; padding: 20px">
<div class="layui-form">
<div class="layui-form-item">
- <label class="layui-form-label" style="padding: 9px 0">鎵樼洏鏉＄爜</label>
+ <label class="layui-form-label" style="padding: 9px 0">鍏ュ簱绔欑偣锛�</label>
<div class="layui-input-block" style="margin-left: 90px;">
- <input type="text" id="tray" placeholder="蹇呭～" autocomplete="off" class="layui-input">
+ <select id="putSiteSelect" 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="combDo" lay-submit lay-filter="combDo">缁勭洏鍏ュ簱</button>
+ <button class="layui-btn layui-btn-radius layui-btn-normal" id="combDo" lay-submit lay-filter="combDo">鍚姩鍏ュ簱</button>
</div>
</div>
</div>
+
+<script type="text/template" id="putSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+<script>
+ $(function(){
+ $.ajax({
+ url: baseUrl+"/available/put/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#putSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#putSiteSelect').append(html);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ })
+</script>
</body>
</html>
--
Gitblit v1.9.1