From 20ac29cc18640bd9e7d7cc16a5da546606bd2c69 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 14:31:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 1 +
src/main/webapp/static/js/pakStore/stockAdjust.js | 15 +++++++++------
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 1 +
src/main/java/com/zy/asrs/controller/WorkController.java | 6 +++---
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 837c299..f653ef2 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -85,11 +85,11 @@
return R.ok("绉诲簱鍚姩鎴愬姛");
}
- @RequestMapping("/loc/detl/adjust/start")
+ @RequestMapping("/locDdetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
- public R locDetlAdjustStart(LocDetlAdjustParam param) {
+ public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
workService.adjustLocDetl(param, getUserId());
- return R.ok("绉诲簱鍚姩鎴愬姛");
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@RequestMapping("/hand/control/wrkMast")
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index 3a41947..877da71 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -53,4 +53,5 @@
public void setList(List<LocDetlAdjust> list) {
this.list = list;
}
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index 7f20af6..f55851b 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -64,4 +64,5 @@
this.count = count;
}
}
+
}
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 2e4721f..28bbd96 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -61,10 +61,10 @@
}
layer.confirm('纭畾璋冩暣'+currLocNo+'搴撲綅鐨勬槑缁嗗悧锛�', {shadeClose: true}, function(){
$.ajax({
- url: baseUrl+"/full/store/put/start",
+ url: baseUrl+"/locDdetl/adjust/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- devpNo: $('#putSiteSelect').val(),
+ locNo: currLocNo,
list: matCodeData
}),
contentType:'application/json;charset=UTF-8',
@@ -72,9 +72,8 @@
async: false,
success: function (res) {
if (res.code === 200){
- layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
- matCodeData = [];
- tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
+ layer.msg(currLocNo + res.msg);
+ reset();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -129,11 +128,15 @@
// 閲嶇疆浜嬩欢
form.on('submit(reset)', function (data) {
+ reset();
+ });
+
+ function reset() {
clearFormVal($('#search-box'));
matCodeData = [];
tableReload();
locTips(false);
- });
+ }
// 閲嶈浇琛ㄦ牸
function tableReload() {
--
Gitblit v1.9.1