From 3938d3f6f568583e8e1cd40d48c89ba979331ed2 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 09 二月 2022 12:31:40 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pda/comb.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 28825c2..5a324f5 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -102,7 +102,7 @@
         }
         let toPush = true;
         for (var j=0;j<matData.length;j++){
-            if (data.matNo === matData[j].matNo) {
+            if (data.matNo === matData[j].matNo && data.supplier === matData[j].supplier) {
                 matData[j].count = Number(matData[j].count) + Number(data.count);
                 toPush  = false;
             }

--
Gitblit v1.9.1