From f1753f9cc233ba3440cc91abb3c9f983a528ab0f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 10:38:54 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/stockOut.html | 2
src/main/webapp/views/pakStore/locDetlQuery.html | 3 +
src/main/webapp/static/js/pakStore/pakStore.js | 25 ++++++------
src/main/webapp/static/js/pakStore/stockOut.js | 45 +++++++++++-----------
4 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 655e8e8..db45c39 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -54,11 +54,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- if (!isNaN(obj.value)) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
- } else {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- }
+ updateMatCodeData(obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -124,15 +120,20 @@
}
function updateMatCodeData(matNo, count) {
- if (count > 0) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
- matCodeData[i]["count"] = count;
- }
- }
+ if (isNaN(count)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ if (count > 0) {
+ for (var i=0;i<matCodeData.length;i++){
+ if (matCodeData[i]["matNo"] === matNo){
+ matCodeData[i]["count"] = count;
+ }
+ }
+ } else {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ }
}
+
tableIns.reload({data: matCodeData,done:function (res) {
limit();
// 瑕嗙洊render鏂规硶鐨刣one
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index f23390c..e0e08e0 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -15,8 +15,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺锛堝彲璋冩暣锛�', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
+ {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
+ ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'matnr', align: 'center',title: '鐗╂枡'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
@@ -38,20 +38,16 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- if (!isNaN(obj.value)) {
- updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
- } else {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- }
+ updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(chooseData)', function (obj) {
- var data = table.checkStatus(obj.config.id).data;
+ var data = locDetlData;
switch (obj.event) {
case 'outbound':
if (data.length === 0){
- layer.msg('璇疯嚦灏戦�変腑涓�琛屾暟鎹�');
+ layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
@@ -77,7 +73,6 @@
if (res.code === 200){
getOutBound(); // 閲嶈浇鍑哄簱鍙�
layer.msg(res.msg);
-
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
@@ -108,20 +103,24 @@
}
});
- function updateLocDetlData(locNo, matnr, anfme) {
- if (anfme > 0) {
- for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
- if (anfme > locDetlData[i]["anfme"]) {
- layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
- } else {
- locDetlData[i]["anfme"] = anfme;
- }
- break;
- }
- }
+ function updateLocDetlData(locNo, matnr, count) {
+ if (isNaN(count)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ if (count > 0) {
+ for (var i=0;i<locDetlData.length;i++){
+ if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
+ if (count > locDetlData[i]["anfme"]) {
+ layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
+ } else {
+ locDetlData[i]["count"] = count;
+ }
+ break;
+ }
+ }
+ } else {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ }
}
tableIns.reload({data: locDetlData,done:function (res) {limit(); getOutBound();}});
}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index b30d55f..3dbec62 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -161,6 +161,9 @@
layer.msg("璇烽�夋嫨鏁版嵁");
return;
}
+ for (var i=0;i<data.length;i++){
+ data[i]["count"] = data[i]["anfme"];
+ }
parent.locDetlData.push.apply(parent.locDetlData, data);
parent.tableIns.reload({data: parent.locDetlData});
parent.layer.close(parent.locDetlLayerIdx);
diff --git a/src/main/webapp/views/pakStore/stockOut.html b/src/main/webapp/views/pakStore/stockOut.html
index efbd955..f74eb0a 100644
--- a/src/main/webapp/views/pakStore/stockOut.html
+++ b/src/main/webapp/views/pakStore/stockOut.html
@@ -94,7 +94,7 @@
<!-- 1.閫夋嫨鍑哄簱鍙� -->
<span id="staNoSpan">鍑哄簱鍙ｏ細</span>
<select id="staNoSelect" lay-verify="required">
- <option value="">璇烽�夋嫨绔欑偣</option>
+<!-- <option value="">璇烽�夋嫨绔欑偣</option>-->
</select>
<!-- 2.鍚姩鍑哄簱 -->
<button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
--
Gitblit v1.9.1