From 5f6fba9c89b4e5e2ca3e9073dc43beb293f85a03 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 31 三月 2022 08:18:16 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/stockOut.js | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index e129b84..af9afd9 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -64,24 +64,19 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(chooseData)', function (obj) {
- var data = locDetlData;
switch (obj.event) {
case 'outbound':
- if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
+ if (locDetlData.length === 0){
+ layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2});
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
- layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {icon: 2});
return;
}
- var locDetls = [];
- data.forEach(function(elem) {
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
- });
let param = {
outSite: staNo,
- locDetls: locDetls
+ locDetls: locDetlData
}
$.ajax({
url: baseUrl+"/plate/out/start",
@@ -93,11 +88,11 @@
if (res.code === 200){
locDetlData = [];
tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
- layer.msg(res.msg);
+ layer.msg(res.msg, {icon: 1});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
}
});
@@ -141,7 +136,7 @@
}
})
-// 鎻愬彇鐗╂枡
+
var locDetlLayerIdx;
function getLocDetl() {
locDetlLayerIdx = layer.open({
@@ -162,7 +157,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -172,7 +167,6 @@
} else {
data[i]["count"] = data[i]["anfme"];
}
-
}
locDetlData.push.apply(locDetlData, data);
tableIns.reload({data: locDetlData});
--
Gitblit v1.9.1