From 7a1c46f05f616990ac4e6691473a1f18fa783522 Mon Sep 17 00:00:00 2001
From: cjw <1063165173@qq.com>
Date: Tue, 1 Jun 2021 11:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=8F=91=E6=96=99=20DetailSu?=
 =?UTF-8?q?m()=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../icspda/activity/OutSourceActivity.java    | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/icssoft/icspda/activity/OutSourceActivity.java b/app/src/main/java/com/icssoft/icspda/activity/OutSourceActivity.java
index 3cd34d9..da2e48b 100644
--- a/app/src/main/java/com/icssoft/icspda/activity/OutSourceActivity.java
+++ b/app/src/main/java/com/icssoft/icspda/activity/OutSourceActivity.java
@@ -764,24 +764,31 @@ public class OutSourceActivity extends AppCompatActivity {
     }
 
     private void DetailSum() {
-        List<OutSourceDetailData> newDataDetailList = new ArrayList<>();
-        for (OutSourceDetailData row : dataDetailList) {
-            if (newDataDetailList != null) {
-                if (newDataDetailList.size() > 0) {
-                    for (OutSourceDetailData item : newDataDetailList) {
-                        if (item.getINVCODE().toUpperCase().equals(row.getINVCODE().toUpperCase())
-                                && item.getVouchRow().equals(row.getVouchRow())) {
-                            item.setCurrentQty((Double.parseDouble(item.getCurrentQty()) + Double.parseDouble(row.getCurrentQty())) + "");
-                        } else {
-                            newDataDetailList.add(row);
+        try {
+            List<OutSourceDetailData> newDataDetailList = new ArrayList<>();
+            for (OutSourceDetailData row : dataDetailList) {
+                if (newDataDetailList != null) {
+                    if (newDataDetailList.size() > 0) {
+                        boolean lotExist = false;
+                        for (OutSourceDetailData item : newDataDetailList) {
+                            if (item.getINVCODE().toUpperCase().equals(row.getINVCODE().toUpperCase())
+                                    && item.getVouchRow().equals(row.getVouchRow())) {
+                                item.setCurrentQty((Double.parseDouble(item.getCurrentQty()) + Double.parseDouble(row.getCurrentQty())) + "");
+                                lotExist = true;
+                                break;
+                            }
                         }
+                        if (!lotExist){newDataDetailList.add(row);}
+                    } else {
+                        newDataDetailList.add(row);
                     }
-                } else {
-                    newDataDetailList.add(row);
                 }
             }
+            dataDetailList = newDataDetailList;
+        } catch (NumberFormatException ex) {
+            ErrorMsg = ex.getMessage();
+            handler.sendEmptyMessage(99);
         }
-        dataDetailList = newDataDetailList;
     }
 
     private void MaterialOutSource() {