From 572b3f4b0248130d692621827ac167e6981bc771 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期一, 28 三月 2022 18:27:00 +0800
Subject: [PATCH] UpdateContractAimAmountHandler,NFM601修改
---
force-app/main/default/triggers/Repair.trigger | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/triggers/Repair.trigger b/force-app/main/default/triggers/Repair.trigger
index 303efaa..379fc9e 100644
--- a/force-app/main/default/triggers/Repair.trigger
+++ b/force-app/main/default/triggers/Repair.trigger
@@ -18,14 +18,20 @@
//wangweipeng 20210727 end
if ((Trigger.isAfter && Trigger.isInsert) || (Trigger.isAfter && Trigger.isUpdate) || (Trigger.isAfter && Trigger.isDelete)) {
- 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(!(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);
+ }
}
// ----------------------------------------------------------------------
// 銇撱亾銈堛倞銆佷慨鐞嗐伄銈点兗銉撱偣銈炽兂銉堛儵銈儓闋呯洰銈掕嚜鍕曠殑銇洿鏂般仚銈嬨儹銈搞儍銈�
// ----------------------------------------------------------------------
if ( Trigger.isBefore && (Trigger.isInsert || Trigger.isUpdate)) {
+ //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220322 start
+ RepairTrigger.AdvancePaymentFlagUpsert(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ //鍏堟鍚庝慨-淇悊澧炲姞鍏堟鏍囪瘑 thh 20220322 end
+
// 绱嶅叆姗熷櫒ID銈掍竴鎰忋伀鏍肩磵銇欍倠 Set銇с仚銆�
Set<ID> assetIds = new Set<Id>();
@@ -66,7 +72,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;
@@ -76,7 +82,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;
}
@@ -275,7 +281,6 @@
// ----------------------------------------------------------------------
// 銇撱亾銇俱仹銆併偟銉笺儞銈广偝銉炽儓銉┿偗銉堥爡鐩倰鑷嫊鐨勩伀鏇存柊銇欍倠銉偢銉冦偗
// ----------------------------------------------------------------------
-
// ----------------------------------------------------------------------
--
Gitblit v1.9.1