From 18177a0121022fed55c578471785e4c2c6b9691b Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期一, 21 三月 2022 18:00:52 +0800
Subject: [PATCH] 修理触发器的修改
---
force-app/main/default/classes/RepairTrigger.cls | 19 +++++++------------
force-app/main/default/triggers/Repair.trigger | 26 ++++++++++++--------------
2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/force-app/main/default/classes/RepairTrigger.cls b/force-app/main/default/classes/RepairTrigger.cls
index 4d36d5f..14a9d14 100644
--- a/force-app/main/default/classes/RepairTrigger.cls
+++ b/force-app/main/default/classes/RepairTrigger.cls
@@ -706,13 +706,14 @@
List<Repair__c> updateRepairList = new List<Repair__c>();
System.debug('newList1:' + newList);
for(Repair__c rep : newList){
- Repair__c oldRep = oldMap.get(rep.Id);
if(rep.Repair_Quotation_Id__c != null){
RepairQuotationIdList.add(rep.Repair_Quotation_Id__c);
}else{
NoRepairQuotationList.add(rep);
}
}
+ System.debug('RepairQuotationIdList1:' + RepairQuotationIdList);
+ System.debug('NoRepairQuotationList1:' + NoRepairQuotationList);
//鍚屾湡涓殑淇悊淇悊鎶ヤ环鏈夊�兼椂锛岀湅鎶ヤ环涓婄殑鍏堟鏍囪瘑杩涜璧嬪��
if(RepairQuotationIdList.size() > 0){
RepairQuotationList = [select Id, Is_RecognitionModel__c from Repair_Quotation__c where Id IN :RepairQuotationIdList];
@@ -721,7 +722,7 @@
for(Repair__c rep : newList){
if(rq.Id == rep.Repair_Quotation_Id__c){
rep.Advance_Payment_Flag__c = rq.Is_RecognitionModel__c;
- updateRepairList.add(rep);
+ // updateRepairList.add(rep);
}
}
}
@@ -738,19 +739,13 @@
for(Repair__c rep : newList){
if(rep.Dealer__c == dealer.Id){
rep.Advance_Payment_Flag__c = dealer.FirstParagraphEnd__c;
- updateRepairList.add(rep);
+ // updateRepairList.add(rep);
}
}
}
- Savepoint sp = Database.setSavepoint();
- try {
- if(updateRepairList.size() > 0){
- update updateRepairList;
- }
- } catch (System.Exception e) {
- Database.rollback(sp);
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, e.getMessage()));
- }
+ // if(updateRepairList.size() > 0){
+ // update updateRepairList;
+ // }
}
//鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220318 end
diff --git a/force-app/main/default/triggers/Repair.trigger b/force-app/main/default/triggers/Repair.trigger
index d520d7a..4f47e47 100644
--- a/force-app/main/default/triggers/Repair.trigger
+++ b/force-app/main/default/triggers/Repair.trigger
@@ -18,16 +18,18 @@
//wangweipeng 20210727 end
if ((Trigger.isAfter && Trigger.isInsert) || (Trigger.isAfter && Trigger.isUpdate) || (Trigger.isAfter && Trigger.isDelete)) {
- if(!(System.isFuture()||System.isBatch())){// Add By Lijun 20220303 to avoid mutiple execute
- NFM103Controller.NFM103Trigger(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
- NFM603Controller.NFM603Trigger(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
- RepairTrigger.UpdateAssert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
- }
+ NFM103Controller.NFM103Trigger(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ NFM603Controller.NFM603Trigger(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ RepairTrigger.UpdateAssert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
}
// ----------------------------------------------------------------------
// 銇撱亾銈堛倞銆佷慨鐞嗐伄銈点兗銉撱偣銈炽兂銉堛儵銈儓闋呯洰銈掕嚜鍕曠殑銇洿鏂般仚銈嬨儹銈搞儍銈�
// ----------------------------------------------------------------------
- if ( Trigger.isBefore && (Trigger.isInsert || Trigger.isUpdate)) {
+ if (Trigger.isBefore && (Trigger.isInsert || Trigger.isUpdate)) {
+ //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220318 start
+ RepairTrigger.AdvancePaymentFlagUpsert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220318 end
+
// 绱嶅叆姗熷櫒ID銈掍竴鎰忋伀鏍肩磵銇欍倠 Set銇с仚銆�
Set<ID> assetIds = new Set<Id>();
@@ -68,7 +70,7 @@
boolean defaultFlag = true;
//add wangweipeng 2021/12/09 end
// 鑽夋涓慨鐞嗐仩銇戞洿鏂�
- // GZW 鐗规畩澶勭悊 璺宠繃缁翠慨涓績鑷姩璧嬪�硷紝浠ユ墜閫変负鍑� start
+ // GZW 鐗规畩澶勭悊 璺宠繃缁翠慨涓績鑷姩璧嬪�硷紝浠ユ墜閫変负鍑� start
// 鍒ゆ柇鏉′欢杩藉姞 && repair.Exc_work_location__c == false
if(repair.Exc_work_location__c){
defaultFlag = false;
@@ -78,7 +80,7 @@
if ((repair.Status__c == '鑽夋涓�' || String.isBlank(repair.Status__c)) == false) {
// if (Trigger.isUpdate && repair.SAP_Transfer_time__c == null) {
if (Trigger.isUpdate && repair.SAP_Transfer_time__c == null && repair.Exc_work_location__c == false) {
-
+
repair = RepairTrigger.updateWorkLocationSelect(repair, null);
defaultFlag = false;
}
@@ -272,16 +274,12 @@
//杩佺Щ杩涚▼鐢熸垚鍣ㄤ腑repair Alltime鍔熻兘 End
/****************************************************************************************************/
}
- }
- //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220318 start
- RepairTrigger.AdvancePaymentFlagUpsert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
- //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220318 end
+ }
}
// ----------------------------------------------------------------------
// 銇撱亾銇俱仹銆併偟銉笺儞銈广偝銉炽儓銉┿偗銉堥爡鐩倰鑷嫊鐨勩伀鏇存柊銇欍倠銉偢銉冦偗
// ----------------------------------------------------------------------
-
-
+
// ----------------------------------------------------------------------
// 銇撱倢銈堛倞銆丱n-Call銇�孫n-Call璺熻繘缁撴灉銆嶃倰鏇存柊銇欍倠銉偢銉冦偗
--
Gitblit v1.9.1