From 18de8211837f496c75178fdb501d241597bb36ce Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 24 二月 2021 17:08:32 +0800 Subject: [PATCH] # --- src/main/webapp/views/pda/stockIn.html | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html index fb98996..da1014e 100644 --- a/src/main/webapp/views/pda/stockIn.html +++ b/src/main/webapp/views/pda/stockIn.html @@ -113,8 +113,8 @@ cellMinWidth: 50, cols: [[ {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50}, - {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'}, - {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'} + {field: 'matnr', align: 'center', title: '鍟嗗搧缂栫爜'}, + {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'} ]], done: function (res, curr, count) { @@ -137,7 +137,7 @@ success: function (res) { if (res.code === 200) { if (res.data != null) { - console.log(res.data); + addTableData(res.data) } } else if (res.code === 403) { top.location.href = baseUrl + "/pda"; @@ -176,22 +176,20 @@ // 娣诲姞琛ㄦ牸鏁版嵁 var matData = []; function addTableData(data) { - if (isEmpty(data.matName)){ - tips("鎻愬彇澶辫触", true); - return; - } - let toPush = true; - for (var j=0;j<matData.length;j++){ - if (data.matNo === matData[j].matNo) { - matData[j].count = Number(matData[j].count) + Number(data.count); - toPush = false; + for (var i=0;i<data.length;i++) { + var toPush = true; + for (var j=0;j<matData.length;j++){ + if (data[i].matnr === matData[j].matnr) { + matData[j].count = Number(matData[j].count) + Number(data[i].anfme); + toPush = false; + } + } + if (toPush) { + matData.push(data[i]); } } - if (toPush) { - matData.push(data); - } - tips("鎻愬彇鎴愬姛"); tableIns.reload({data: matData}); + $("#comb-btn").focus(); } // 閲嶇疆 -- Gitblit v1.9.1