From b3dc8e8ce0a120b4f484ef787abd21832c40ec63 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期日, 24 四月 2022 10:07:34 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/classes/NFM603Controller.cls |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/classes/NFM603Controller.cls b/force-app/main/default/classes/NFM603Controller.cls
index bebff41..579e136 100644
--- a/force-app/main/default/classes/NFM603Controller.cls
+++ b/force-app/main/default/classes/NFM603Controller.cls
@@ -559,7 +559,7 @@
 
     public static Set < Id > NFM603_Ids = new Set < Id > ();
     // public static Map<Id,Id> rprIdMap = new Map<Id,Id>();
-
+    
     public static void NFM603Trigger(List < Repair__c > newList, Map < Id, Repair__c > newMap, List < Repair__c > oldList, Map < Id, Repair__c > oldMap) {
         List < String > rprIds = new List < String > ();
         Map < Id, Id > rprIdMap = new Map < Id, Id > ();
@@ -584,13 +584,121 @@
                     Repair__c oldrpr = oldMap.get(rpr.Id);
                     // 淇悊鏈夋姤淇瓙鍗曞彿锛屽苟涓� 寰呭彂閫丄WS涓篺alse 鍙戦�佺粰AWS
                     if (String.isNotBlank(rpr.RepairSubOrder__c) && !rpr.AwaitToSendAWS__c) {
-                        if (((rpr.status__c == '0.鐢宠瀹屾瘯' || rpr.status__c == '1.鍙楃悊瀹屾瘯') && (oldrpr.SAP_Transfer_time__c == null && rpr.SAP_Transfer_time__c != null)) || (rpr.Address_type__c == 'X' && (rpr.Address_Type_Index__c != oldrpr.Address_Type_Index__c))) {
+                        if (((rpr.status__c == '0.鐢宠瀹屾瘯' || rpr.status__c == '1.鍙楃悊瀹屾瘯') && (oldrpr.SAP_Transfer_time__c == null && rpr.SAP_Transfer_time__c != null)) || 
+                            (rpr.Address_type__c == 'X' && (rpr.Address_Type_Index__c != oldrpr.Address_Type_Index__c)) || 
+                            //  2022/4/6    zhangyuheng update start
+                            (rpr.OTSRepairOrder__c != oldrpr.OTSRepairOrder__c) || // OTS璁㈠崟鍙锋湁鍊硷紝鍙戦�丄WS
+                            //  2022/4/6    zhangyuheng update end
+                            //  2022/4/7    zhangyuheng update start
+                            (rpr.DeliveryLogisticsNo__c != oldrpr.DeliveryLogisticsNo__c) || // 閫佷慨鐗╂祦鍗曞彿鏈夊�硷紝鍙戦�丄WS
+                            // ((rpr.Discount_Price_formula__c != oldrpr.Discount_Price_formula__c) && rpr.Repair_Firstestimated_Date_formula__c != null) || // 鎶ヤ环閲戦鍙戠敓鏀瑰彉涓斿垵娆℃姤浠锋棩鏈夊�硷紝鍙戦�丄WS
+                            ((rpr.Returns_Product_waySAP__c != oldrpr.Returns_Product_waySAP__c) && rpr.Repair_Shipped_DateTime__c != null) || // 閫佷慨鏂瑰紡鍙戠敓鏀瑰彉涓斿瘎閫佹棩鏈夊�硷紝鍙戦�丄WS
+                            //  2022/4/7    zhangyuheng update end
+                            //  2022/4/18    zhangyuheng update start
+                            (rpr.FSE_ApplyForRepair_time__c != oldrpr.FSE_ApplyForRepair_time__c) ||                   // FSE鐢宠淇悊鏃ュ彂鐢熸敼鍙橈紝鍙戦�丄WS
+                            (rpr.Repair_Ordered_DateTime__c != oldrpr.Repair_Ordered_DateTime__c) ||                   // 4.淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級鍙戠敓鏀瑰彉锛屽彂閫丄WS
+                            (rpr.Repair_Firstestimated_Date__c != oldrpr.Repair_Firstestimated_Date__c) ||             // 鍒濇鎶ヤ环鏃ワ紙涓嶇敤锛夊彂鐢熸敼鍙橈紝鍙戦�丄WS
+                            (rpr.Repair_Shipped_DateTime__c != oldrpr.Repair_Shipped_DateTime__c) ||                   // 11.RC淇悊鍝佽繑閫佹棩锛堝皬绋嬪簭锛夊彂鐢熸敼鍙橈紝鍙戦�丄WS
+                            (rpr.Repair_Final_Inspection_DateTime__c != oldrpr.Repair_Final_Inspection_DateTime__c) || // 10.鏈�缁堟娴嬫棩锛堝皬绋嬪簭锛夊彂鐢熸敼鍙橈紝鍙戦�丄WS
+                            (rpr.Agreed_DateTime__c != oldrpr.Agreed_DateTime__c) ||                                   //7.鐢ㄦ埛鍚屾剰鏃ワ紙灏忕▼搴忥級鍙戠敓鏀瑰彉锛屽彂閫丄WS
+                            (rpr.Agreed_Date__c != oldrpr.Agreed_Date__c) ||                                           // 7.鐢ㄦ埛鍚屾剰鏃ュ彂鐢熸敼鍙橈紝鍙戦�丄WS
+                            (rpr.engineerSendDate__c != oldrpr.engineerSendDate__c)                                    //淇悊鍝佸瘎閫佹棩鍙戠敓鏀瑰彉锛屽彂閫丄WS
+                            //  2022/4/18    zhangyuheng update start
+                            ) {
 
                             if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
                                 NFM603Controller.NFM603_Ids.add(rpr.Id);
                                 rprIdMap.put(rpr.Id, rpr.Id);
                             }
                         }
+                        //  2022/4/19    zhangyuheng update start
+                        // 濡傛灉鍚屾湡涓殑淇悊鎶ヤ环锛圧epair_Quotation_Id__c锛変负绌猴紝鍒ゆ柇鍒濇鎶ヤ环鏃ュ拰鎶ヤ环閲戦
+                        if (rpr.Repair_Quotation_Id__c != oldrpr.Repair_Quotation_Id__c) {
+                            if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                                NFM603Controller.NFM603_Ids.add(rpr.Id);
+                                rprIdMap.put(rpr.Id, rpr.Id);
+                            }
+                        }
+                        if (rpr.Repair_Quotation_Id__c == null) {
+                            // 濡傛灉鍒濇鎶ヤ环鏃ワ紙涓嶇敤锛夋垨鎶樻墸鍚庨噾棰濓紙涓嶇敤锛夊彂鐢熸敼鍙橈紝鍙戦�丄WS
+                            if (rpr.Discount_Price__c != oldrpr.Discount_Price__c || rpr.Repair_Estimated_Date__c != oldrpr.Repair_Estimated_Date__c) {
+                                if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                                    NFM603Controller.NFM603_Ids.add(rpr.Id);
+                                    rprIdMap.put(rpr.Id, rpr.Id);
+                                }
+                            }
+                        }
+                        // 濡傛灉鍚屾湡涓殑淇悊鎶ヤ环锛圧epair_Quotation_Id__c锛変笉涓虹┖锛屽湪RepairQuoteTrigger.ChangeRepair杩涜鍒ゆ柇瑙﹀彂
+                        //  2022/4/19    zhangyuheng update end
+                        
+                        //  2022/4/6    zhangyuheng update start
+                        //OTS璁㈠崟鍙锋湁鍊硷紝鍙戦�丄WS
+                        // if ((oldrpr.OTSRepairOrder__c == null && String.isNotBlank(rpr.OTSRepairOrder__c)) || rpr.OTSRepairOrder__c != oldrpr.OTSRepairOrder__c) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        //  2022/4/6    zhangyuheng update end
+                        //  2022/4/7    zhangyuheng update start
+                        //閫佷慨鐗╂祦鍗曞彿鏈夊�硷紝鍙戦�丄WS
+                        // if ((oldrpr.DeliveryLogisticsNo__c == null && String.isNotBlank(rpr.DeliveryLogisticsNo__c))  || rpr.DeliveryLogisticsNo__c != oldrpr.DeliveryLogisticsNo__c) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        //鎶ヤ环閲戦鍙戠敓鏀瑰彉涓斿垵娆℃姤浠锋棩鏈夊�硷紝鍙戦�丄WS
+                        // if ((rpr.Discount_Price_formula__c != oldrpr.Discount_Price_formula__c) && rpr.Repair_Firstestimated_Date_formula__c != null) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        // if ((rpr.Returns_Product_waySAP__c != oldrpr.Returns_Product_waySAP__c) && rpr.Repair_Shipped_DateTime__c != null) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        //  2022/4/7    zhangyuheng update end
+                        //  2022/4/18    zhangyuheng update start
+                        // FSE鐢宠淇悊鏃ュ彂鐢熸敼鍙橈紝鍙戦�丄WS
+                        // if (rpr.FSE_ApplyForRepair_time__c != oldrpr.FSE_ApplyForRepair_time__c) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        // 4.淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級鍙戠敓鏀瑰彉锛屽彂閫丄WS
+                        // if (rpr.Repair_Ordered_DateTime__c != oldrpr.Repair_Ordered_DateTime__c) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        // 鍒濇鎶ヤ环鏃ワ紙涓嶇敤锛夊彂鐢熸敼鍙橈紝鍙戦�丄WS
+                        // 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);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        // 11.RC淇悊鍝佽繑閫佹棩锛堝皬绋嬪簭锛夊彂鐢熸敼鍙橈紝鍙戦�丄WS
+                        // if (rpr.Repair_Shipped_DateTime__c != oldrpr.Repair_Shipped_DateTime__c) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        // 10.鏈�缁堟娴嬫棩锛堝皬绋嬪簭锛夊彂鐢熸敼鍙橈紝鍙戦�丄WS
+                        // if (rpr.Repair_Final_Inspection_DateTime__c != oldrpr.Repair_Final_Inspection_DateTime__c) {
+                        //     if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+                        //         NFM603Controller.NFM603_Ids.add(rpr.Id);
+                        //         rprIdMap.put(rpr.Id, rpr.Id);
+                        //     }
+                        // }
+                        //  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) {

--
Gitblit v1.9.1