From 3346e1339149e51cae9b2f98547110ea4c8a5b2d Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期一, 23 六月 2025 08:33:48 +0800 Subject: [PATCH] #盘点 --- src/main/webapp/static/js/pakStore/locCheckOut.js | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js index d2e5b58..638a859 100644 --- a/src/main/webapp/static/js/pakStore/locCheckOut.js +++ b/src/main/webapp/static/js/pakStore/locCheckOut.js @@ -3,7 +3,8 @@ var locDetlData = []; function getCol() { var cols = [ - {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'} + {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}, + {field: 'anfme', align: 'center',title: '鏁伴噺'} ]; cols.push.apply(cols, detlCols); return cols; @@ -27,6 +28,8 @@ even: true, toolbar: '#toolbar', cellMinWidth: 50, + limit: 500, + page:false, cols: [getCol()], done: function(res, curr, count) { tableMerge.render(this); @@ -115,24 +118,26 @@ }) -// 娣诲姞琛ㄦ牸鏁版嵁 function addTableData(data) { - for (let i=0;i<data.length;i++){ - let pass = false; - for (let j=0;j<locDetlData.length;j++){ - if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) { - pass = true; - break; - } - } - if (pass) { - data.splice(i--, 1); - } else { - data[i]["count"] = data[i]["anfme"]; - } + let newData = []; + for (let i = 0; i < data.length; i++) { + let item = data[i]; + let exist = locDetlData.some(old => + old.matnr === item.matnr && + old.batch === item.batch && + (old.locNo$ === item.locNo$ || old.locNo === item.locNo) + ); + + if (!exist) { + item.count = item.anfme; + newData.push(item); + } } - locDetlData.push.apply(locDetlData, data); + + locDetlData = locDetlData.concat(newData); + console.log("浼犲叆琛ㄦ牸鏁版嵁闀垮害锛�", locDetlData.length, locDetlData); tableIns.reload({data: locDetlData}); layer.close(locDetlLayerIdx); } + -- Gitblit v1.9.1