From b98c031f4bb9ccef46005694a0c4837b1b4d853b Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期四, 28 四月 2022 09:32:24 +0800
Subject: [PATCH] 修理触发条件、调用方法修改

---
 force-app/main/default/classes/NFM603Controller.cls |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/force-app/main/default/classes/NFM603Controller.cls b/force-app/main/default/classes/NFM603Controller.cls
index 579e136..d819d9c 100644
--- a/force-app/main/default/classes/NFM603Controller.cls
+++ b/force-app/main/default/classes/NFM603Controller.cls
@@ -495,7 +495,9 @@
             logstr += ex.getMessage();
             iflog.ErrorLog__c += ex.getMessage() + '\n';
             iflog.ErrorLog__c += ex.getStackTraceString() + '\n';
-            rowDataSFDC = NFMUtil.LogAutoSend(rowDataSFDC, ex, null);
+            if(!Test.isRunningTest()){
+                rowDataSFDC = NFMUtil.LogAutoSend(rowDataSFDC, ex, null);
+            }
         }
         iflog.Log__c = logstr;
         upsert iflog;
@@ -700,19 +702,19 @@
                         // }
                         //  2022/4/18    zhangyuheng update end
                         // 娴嬭瘯鐜娴嬭瘯鐢紝涓婄嚎鍓嶈娉ㄦ帀
-                        if (rpr.Repair_Firstestimated_Date__c != oldrpr.Repair_Firstestimated_Date__c) {
-                            if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
-                                NFM603Controller.NFM603_Ids.add(rpr.Id);
-                                // rprIds.add(rpr.Id);
-                                rprIdMap.put(rpr.Id, rpr.Id);
-                            }
-                        }
-                        if (rpr.Repair_Shipped_Date__c != oldrpr.Repair_Shipped_Date__c) {
-                            if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
-                                NFM603Controller.NFM603_Ids.add(rpr.Id);
-                                rprIdMap.put(rpr.Id, rpr.Id);
-                            }
-                        }
+                        // if (rpr.Repair_Firstestimated_Date__c != oldrpr.Repair_Firstestimated_Date__c) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         // rprIds.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        // if (rpr.Repair_Shipped_Date__c != oldrpr.Repair_Shipped_Date__c) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
                         // 娴嬭瘯鐜娴嬭瘯鐢紝涓婄嚎鍓嶈娉ㄦ帀
                     }
 
@@ -726,7 +728,7 @@
                 iflog.Type__c = LOG_TYPE;
                 iflog.Log__c = 'callout start\n';
                 insert iflog;
-                NFM603Controller.callout(iflog.Id, rprIds);
+                NFM603Controller.executefuture(iflog, rprIds);
             }
         } else {
             if (Trigger.isUpdate) {

--
Gitblit v1.9.1