From d79692c7b03e3b96016598ac03766c29ca094709 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 15:34:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 21 ++++++++++
src/main/webapp/views/pakStore/locMove.html | 30 +++++++-------
src/main/java/com/zy/asrs/controller/LocMastController.java | 6 +++
src/main/java/com/zy/common/config/AdminInterceptor.java | 4 +-
src/main/webapp/static/js/pakStore/locMove.js | 30 ++++++++-------
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 6 +++
src/main/java/com/zy/asrs/service/LocMastService.java | 8 ++++
src/main/resources/application.yml | 4 +-
8 files changed, 76 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index af143d0..38a49db 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -39,6 +39,12 @@
return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
}
+ @PostMapping(value = "/group/empty/stock")
+ @ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
+ public R getGroupEmptyStock(@RequestParam String sourceLocNo) {
+ return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo));
+ }
+
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 6f84c0d..51376b7 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -4,7 +4,10 @@
import com.zy.asrs.entity.LocMast;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
+
+import java.util.List;
@Mapper
@Repository
@@ -12,4 +15,7 @@
LocMast queryFreeLocMast(@Param("row") Integer row);
+ @Select("select loc_no from asr_loc_mast where 1=1 and loc_type = 'O' and crn_no = #{crnNo}")
+ List<String> queryGroupEmptyStock(Integer crnNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index fe1da34..95932ad 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocMast;
+import java.util.List;
+
public interface LocMastService extends IService<LocMast> {
/**
@@ -10,4 +12,10 @@
*/
LocMast queryFreeLocMast(Integer row);
+ /**
+ * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
+ * @param sourceLocNo 婧愬簱浣�
+ * @return 鍚岀粍绌哄簱浣嶉泦鍚�
+ */
+ List<String> queryGroupEmptyStock(String sourceLocNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 45c15df..260df2a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,16 +1,37 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.RowLastnoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
+ @Autowired
+ private RowLastnoService rowLastnoService;
+
@Override
public LocMast queryFreeLocMast(Integer row) {
return this.baseMapper.queryFreeLocMast(row);
}
+
+ @Override
+ public List<String> queryGroupEmptyStock(String sourceLocNo) {
+ if (Cools.isEmpty(sourceLocNo)) {
+ throw new CoolException("婧愬簱浣嶄笉鑳戒负绌�");
+ }
+ LocMast sourceStock = this.selectById(sourceLocNo);
+ if (Cools.isEmpty(sourceStock)) {
+ throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
+ }
+ return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
+ }
}
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index a727bce..b3b9fd4 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -96,8 +96,8 @@
User user = userService.selectById(userLogin.getUserId());
String deToken = Cools.deTokn(token, user.getPassword());
long timestamp = Long.parseLong(deToken.substring(0, 13));
- // 1澶╁悗杩囨湡
- if (System.currentTimeMillis() - timestamp > 86400000){
+ // 15鍒嗛挓鍚庤繃鏈�
+ if (System.currentTimeMillis() - timestamp > 900000){
Http.response(response, BaseRes.DENIED);
return false;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6a612ee..a57f7ef 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,8 +28,8 @@
mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
path: /stock/out/logs
diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 1730885..581bc6d 100644
--- a/src/main/webapp/static/js/pakStore/locMove.js
+++ b/src/main/webapp/static/js/pakStore/locMove.js
@@ -4,7 +4,6 @@
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
// 鏁版嵁娓叉煋
@@ -14,8 +13,8 @@
// url: baseUrl+'/locDetl/list/auth',
data:[],
page: true,
- limit: 10,
- skin: 'line',
+ limit: 16,
+ limits: [16, 50, 100, 200, 500],
even: true,
cellMinWidth: 50,
cols: [[
@@ -66,23 +65,26 @@
});
// 鎼滅储搴撲綅鐗╂枡
-function getLoc() {
- let locNo = $("#locNo\\$").val();
- if (locNo === undefined || locNo === null || locNo === "") {
- layer.msg("璇峰～鍐欏簱浣嶅彿");
- $('.search-input').css("border-color", "red");
- setTimeout(function () {
- $('.search-input').css("border-color", "#b8b8b8");
- }, 2000);
- return;
- }
+function getLoc(el) {
tableIns.reload({
url: baseUrl+'/locDetl/list/auth'
- , where: {loc_no: locNo}
+ , where: {loc_no: el.value}
, done:function (res) {
limit();
}
});
+ http.post(baseUrl + "/locMast/"+el.value+"/auth", null, function (res) {
+ if (res.data != null) {
+ // 鑾峰彇鍚屼竴鍫嗗灈鏈虹殑绌哄簱浣�
+ http.post(baseUrl + "/group/empty/stock", {sourceLocNo: el.value}, function (res) {
+ var tpl = $("#emptyLocStock").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ console.log(html);
+ $('.layui-anim.layui-anim-upbit').append(html);
+ });
+ }
+ })
}
// 绉诲簱鍚姩
diff --git a/src/main/webapp/views/pakStore/locMove.html b/src/main/webapp/views/pakStore/locMove.html
index 867c005..1783d9b 100644
--- a/src/main/webapp/views/pakStore/locMove.html
+++ b/src/main/webapp/views/pakStore/locMove.html
@@ -71,27 +71,24 @@
</head>
<body>
-<div class="function-area" style="border-right: 1px solid #d5d5d5">
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="locNo$" class="layui-input cool-auto-complete-div search-input" type="text" placeholder="搴撲綅鍙�" autocomplete="off" style="cursor: initial">
- </div>
- </div>
- <button id="loc-query-btn" class="function-btn" onclick="getLoc()">鎼滅储</button>
-</div>
-<div class="function-area">
+<div class="function-area layui-form">
<!-- 婧愬簱浣� -->
<div class="layui-inline">
<div class="layui-input-inline">
- <input id="sourceLocNo" class="layui-input cool-auto-complete-div" onkeyup="locStatus(this)" type="text" placeholder="婧愬簱浣�" style="width: 150px;cursor: initial" autocomplete="off">
+ <input id="sourceLocNo" value="0100203" class="layui-input cool-auto-complete-div" onkeyup="getLoc(this)" type="text" placeholder="婧愬簱浣�" style="width: 150px;cursor: initial" autocomplete="off">
</div>
</div>
<div class="layui-form-mid" style="float: none; display: inline-block; margin-left: 10px">-</div>
<!-- 鐩爣搴撲綅 -->
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input id="targetLocNo" class="layui-input cool-auto-complete-div" onkeyup="locStatus(this)" type="text" placeholder="鐩爣搴撲綅" style="width: 150px;cursor: initial" autocomplete="off">
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="targetLocNo" class="layui-input cool-auto-complete-div" onkeyup="locStatus(this)" type="text" placeholder="鐩爣搴撲綅" style="width: 150px;cursor: initial" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-input-inline">
+ <select id="targetLocNo" name="modules" lay-verify="required" lay-search="">
+ <option value="">鐩爣搴撲綅</option>
+ </select>
</div>
<button id="loc-move-btn" class="function-btn" onclick="locMove()" style="background: #4476A7;text-shadow: inherit;height: 45px;font-size: 15px;margin-left: 20px">搴撲綅绉昏浆</button>
</div>
@@ -107,7 +104,10 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pakStore/locMove.js" charset="utf-8"></script>
-<script type="text/template" id="">
+<script type="text/template" id="emptyLocStock">
+ {{#each data}}
+ <dd lay-value="{{this}}" class>{{this}}</dd>
+ {{/each}}
</script>
<div id="locMoveWindow" style="height: 100%;display: none">
--
Gitblit v1.9.1