From 1cc03a3d52f01b885d629ce96018516a212f2ae2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 16:29:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 5 -
src/main/webapp/views/pakStore/locMove.html | 11 ---
src/main/java/com/zy/asrs/controller/LocMastController.java | 2
src/main/webapp/static/js/pakStore/locMove.js | 121 +++++++++++++++++++++-------------------
4 files changed, 69 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 38a49db..347c43f 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -41,7 +41,7 @@
@PostMapping(value = "/group/empty/stock")
@ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
- public R getGroupEmptyStock(@RequestParam String sourceLocNo) {
+ public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
return R.ok().add(locMastService.queryGroupEmptyStock(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 260df2a..c90868c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -2,7 +2,6 @@
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;
@@ -26,11 +25,11 @@
@Override
public List<String> queryGroupEmptyStock(String sourceLocNo) {
if (Cools.isEmpty(sourceLocNo)) {
- throw new CoolException("婧愬簱浣嶄笉鑳戒负绌�");
+ return null;
}
LocMast sourceStock = this.selectById(sourceLocNo);
if (Cools.isEmpty(sourceStock)) {
- throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
+ return null;
}
return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
}
diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 3667bcb..c611890 100644
--- a/src/main/webapp/static/js/pakStore/locMove.js
+++ b/src/main/webapp/static/js/pakStore/locMove.js
@@ -3,7 +3,6 @@
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
- var layer = layui.layer;
var form = layui.form;
// 鏁版嵁娓叉煋
@@ -62,7 +61,6 @@
}
});
-
});
// 鎼滅储搴撲綅鐗╂枡
@@ -72,20 +70,21 @@
, where: {loc_no: el.value}
, done:function (res) {
limit();
- }
- });
- http.post(baseUrl + "/locMast/"+el.value+"/auth", null, function (res) {
- if (res.data != null) {
+ $("#targetLocNo").empty();
+ layui.form.render('select');
// 鑾峰彇鍚屼竴鍫嗗灈鏈虹殑绌哄簱浣�
http.post(baseUrl + "/group/empty/stock", {sourceLocNo: el.value}, function (res) {
- var tpl = $("#emptyLocStock").html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- $('#targetLocNo').append(html);
- layui.form.render('select');
+ if (res.data != null) {
+ var tpl = $("#emptyLocStock").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#targetLocNo').append(html);
+ layui.form.render('select');
+ }
});
}
- })
+ });
+
}
// 绉诲簱鍚姩
@@ -96,16 +95,16 @@
$("#sourceLocNo").css("border-color", "red");
setTimeout(function () {
$("#sourceLocNo").css("border-color", "#b8b8b8");
- }, 2000);
- layer.msg("璇疯緭鍏ュ簱浣�");
+ }, 1000);
+ layer.msg("璇疯緭鍏ユ簮搴撲綅");
return;
}
if (targetLocNo === null || targetLocNo === "") {
- $("#targetLocNo").css("border-color", "red");
+ $(".layui-select-title .layui-input").css("border-color", "red");
setTimeout(function () {
- $("#targetLocNo").css("border-color", "#b8b8b8");
- }, 2000);
- layer.msg("璇疯緭鍏ュ簱浣�");
+ $(".layui-select-title .layui-input").css("border-color", "#b8b8b8");
+ }, 1000);
+ layer.msg("璇疯緭鍏ョ洰鏍囧簱浣�");
return;
}
$.ajax({
@@ -120,9 +119,17 @@
success: function (res) {
if (res.code === 200) {
$("#sourceLocNo").val("");
- $("#targetLocNo").val("");
+ $("#targetLocNo").empty();
+ layui.form.render('select');
layer.closeAll();
layer.msg(res.msg);
+ tableIns.reload({
+ data: [],
+ url: '',
+ done:function (res) {
+ limit();
+ }
+ });
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -132,41 +139,41 @@
})
}
-// 搴撲綅鐘舵�佽幏鍙�
-var tips;
-function locStatus(el) {
- let val = el.value;
- if (val === null|| val === ""){
- return;
- }
- $.ajax({
- url: baseUrl+"/locMast/"+val+"/auth",
- headers: {'token': localStorage.getItem('token')},
- dataType:'json',
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var status;
- if (res.data != null) {
- status = res.data.locType$;
- } else {
- status = "鏈壘鍒板簱浣�";
- }
- tips = layer.tips(
- "<span style='color:#333;text-overflow: clip;'>"+status+"</span>",
- el,
- {
- tipsMore: true,
- area: ['160px'],
- tips: [3,'#fff'],
- time:0
- ,maxWidth:500
- });
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg);
- }
- }
- });
-}
+// // 搴撲綅鐘舵�佽幏鍙�
+// var tips;
+// function locStatus(el) {
+// let val = el.value;
+// if (val === null|| val === ""){
+// return;
+// }
+// $.ajax({
+// url: baseUrl+"/locMast/"+val+"/auth",
+// headers: {'token': localStorage.getItem('token')},
+// dataType:'json',
+// method: 'POST',
+// success: function (res) {
+// if (res.code === 200) {
+// var status;
+// if (res.data != null) {
+// status = res.data.locType$;
+// } else {
+// status = "鏈壘鍒板簱浣�";
+// }
+// tips = layer.tips(
+// "<span style='color:#333;text-overflow: clip;'>"+status+"</span>",
+// el,
+// {
+// tipsMore: true,
+// area: ['160px'],
+// tips: [3,'#fff'],
+// time:0
+// ,maxWidth:500
+// });
+// } else if (res.code === 403) {
+// top.location.href = baseUrl+"/";
+// } else {
+// layer.msg(res.msg);
+// }
+// }
+// });
+// }
diff --git a/src/main/webapp/views/pakStore/locMove.html b/src/main/webapp/views/pakStore/locMove.html
index 4f3678e..c6b5506 100644
--- a/src/main/webapp/views/pakStore/locMove.html
+++ b/src/main/webapp/views/pakStore/locMove.html
@@ -75,19 +75,13 @@
<!-- 婧愬簱浣� -->
<div class="layui-inline">
<div class="layui-input-inline">
- <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">
+ <input id="sourceLocNo" value="0100203" class="layui-input" onkeyup="getLoc(this)" type="text" placeholder="婧愬簱浣�" 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>-->
<div class="layui-input-inline">
<select id="targetLocNo" name="modules" lay-verify="required" lay-search="">
- <option value="">鐩爣搴撲綅</option>
+ <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>
@@ -109,7 +103,6 @@
<option value="{{this}}">{{this}}</option>
{{/each}}
</script>
-
<div id="locMoveWindow" style="height: 100%;display: none">
<div style="float: left;width: 35%;height: 100%">
--
Gitblit v1.9.1