From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/webapp/static/js/pakStore/stockOut.js | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 5946e13..fdd9bd7 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -3,11 +3,27 @@
function getCol() {
var cols = [
// {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
- {field: 'anfme', align: 'center',title: '鏁伴噺'}
+ {field: 'anfme', align: 'center',title: '鍑哄簱鏁伴噺',edit:'text',style:'color: blue;font-weight: bold'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'qty', align: 'center',title: '搴撳瓨鏁伴噺'}
+ ,{field: 'source', title: '鏉ユ簮', align: 'center'}
+ ,{field: 'vendor', title: '渚涘簲鍟�', align: 'center'}
+ ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'allQty', title: '鎬绘暟閲�(PCS)', align: 'center'}
+ ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)'}
+ ,{field: 'allWeight', title: '鎬婚噸閲�(KG)', align: 'center'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ // ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
];
- arrRemove(detlCols, 'field', 'anfme');
- cols.push.apply(cols, detlCols);
+ //arrRemove(detlCols, 'field', 'qty');
+ // cols.push.apply(cols, detlCols);
// cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
}
@@ -34,7 +50,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
+ updateLocDetlData(obj.data.locNo, obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -43,7 +59,7 @@
switch (obj.event) {
case 'outbound':
if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
+ layer.msg('璇峰厛娣诲姞搴撲綅浜у搧');
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
@@ -52,7 +68,7 @@
}
var locDetls = [];
data.forEach(function(elem) {
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
+ locDetls.push({locNo: elem.locNo, matNo: elem.matNo, count: elem.count});
});
let param = {
outSite: staNo,
@@ -87,7 +103,7 @@
switch (obj.event) {
case 'remove':
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
locDetlData.splice(i, 1);
}
}
@@ -97,16 +113,19 @@
});
function updateLocDetlData(locNo, matnr, count) {
+ debugger;
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
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"]) {
+ if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matNo"] === matnr){
+
+ if (count > locDetlData[i]["qty"]) {
layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
} else {
locDetlData[i]["count"] = count;
+ locDetlData[i]["anfme"] = count;
}
break;
}
@@ -142,7 +161,7 @@
}
})
-// 鎻愬彇鐗╂枡
+// 鎻愬彇浜у搧
var locDetlLayerIdx;
function getLocDetl() {
locDetlLayerIdx = layer.open({
@@ -162,7 +181,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].matNo === locDetlData[j].matNo && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -170,7 +189,7 @@
if (pass) {
data.splice(i--, 1);
} else {
- data[i]["count"] = data[i]["anfme"];
+ data[i]["count"] = data[i]["qty"];
}
}
--
Gitblit v1.9.1