From 98610c8e9101b11678e6bc06bef2abfc45f5dc4c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 24 九月 2021 10:36:21 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/pda/combProAgv.html | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/views/pda/combProAgv.html b/src/main/webapp/views/pda/combProAgv.html
index cf49ff0..3d2c984 100644
--- a/src/main/webapp/views/pda/combProAgv.html
+++ b/src/main/webapp/views/pda/combProAgv.html
@@ -286,22 +286,24 @@
// 娣诲姞琛ㄦ牸鏁版嵁
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].matNo === matData[j].matNo && data[i].mnemonic === matData[j].mnemonic) {
+ matData[j].count = Number(matData[j].count) + Number(data[i].count);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data[i]);
+ sourceData.push({
+ matNo: data[i].matNo,
+ count: data[i].count,
+ supplier: data[i].supplier,
+ mnemonic: data[i].mnemonic,
+ });
}
}
- if (toPush) {
- matData.push(data);
- }
- tips("鎻愬彇鎴愬姛");
- tableIns.reload({data: matData});
}
@@ -320,7 +322,7 @@
return;
}
// 璧嬪�煎墠娓呯┖琛ㄦ牸
-// matData = [];
+ matData = [];
tableIns.reload({data: matData});
$.ajax({
--
Gitblit v1.9.1