From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/triggers/OpportunityTrigger.trigger | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/triggers/OpportunityTrigger.trigger b/force-app/main/default/triggers/OpportunityTrigger.trigger
index b9400d4..2254c50 100644
--- a/force-app/main/default/triggers/OpportunityTrigger.trigger
+++ b/force-app/main/default/triggers/OpportunityTrigger.trigger
@@ -1,13 +1,23 @@
trigger OpportunityTrigger on Opportunity (before update, after update,before insert, after insert) {
+ // SWAG-CE55BX 棰勬祴浼樺寲 start
+ if (StaticParameter.EscapeOppandStaTrigger) {
+ return;
+ }
+ // SWAG-CE55BX 棰勬祴浼樺寲 end
if (Trigger.isAfter && Trigger.isUpdate) {
OpportunityTrigger.lockOpportunityFile(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
// CHAN-AYTCE6 璇环椤甸潰涓殑缁忛攢鍟�1鍙樻洿鍚庢洿鏂版姤浠蜂腑缁忛攢鍟�1 2018/5/25 start
OpportunityTrigger.changeQuoteAgency1(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
// CHAN-AYTCE6 璇环椤甸潰涓殑缁忛攢鍟�1鍙樻洿鍚庢洿鏂版姤浠蜂腑缁忛攢鍟�1 2018/5/25 end
-
+ //SWAG-CHL67J 銆愬鎵樸�戙�怓Y23璇环鏀瑰杽銆�-璇环椤甸潰/鎷涙爣椤圭洰澧炲姞缁熻瀛楁 fy start
+ // OpportunityTrigger.UpdateBidNumber(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ //SWAG-CHL67J 銆愬鎵樸�戙�怓Y23璇环鏀瑰杽銆�-璇环椤甸潰/鎷涙爣椤圭洰澧炲姞缁熻瀛楁 fy end
//LastBuy 棰勭暀浜у搧 lt 20220315 start
OpportunityTrigger.ReservedProFlg(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
//LastBuy 棰勭暀浜у搧 lt 20220315 end
+
+ //璇环璺熻繘浠诲姟寮�鍙� - 3.鍒涘缓澶卞崟浠诲姟 sx 20220617 start
+ OpportunityTrigger.createTaskByOppConfirmationofAward(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
}
if (Trigger.isBefore && Trigger.isUpdate) {
OpportunityTrigger.changeConsumableOrderStatus(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
@@ -21,6 +31,9 @@
// 鏇存柊鍓嶆搷浣� 鍒ゆ柇WIN涓篢RUE鐨勬椂鍊� 娓呴櫎鎺�"鍙栨秷WIN鍘熷洜"
OpportunityTrigger.removeCancelWinReason(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
// SWAG-C7P4XB shashiming 2021-12-15 end
+
+ //璇环璺熻繘浠诲姟寮�鍙� - FY23璇环鏀瑰杽,璇环鍚勭鐘舵�佹洿鏂� sx 20220705
+ OpportunityTrigger.opportunityTasks(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
}
if (Trigger.isBefore && Trigger.isInsert) {
//鍗冮噷椹� - 鎷涙姇鏍囩姸鎬佹洿鏂癇atch mzy 2021-05-13 start
@@ -31,5 +44,8 @@
// 鎷涙爣-璇环鍏宠仈淇敼 鏂板杩炴帴淇℃伅 20210817 start
OpportunityTrigger.changeLastLinkedTender(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
// 鎷涙爣-璇环鍏宠仈淇敼 鏂板杩炴帴淇℃伅 20210817 end
+ //SWAG-CHL67J 銆愬鎵樸�戙�怓Y23璇环鏀瑰杽銆�-璇环椤甸潰/鎷涙爣椤圭洰澧炲姞缁熻瀛楁 fy start
+ // OpportunityTrigger.UpdateBidNumber(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+ //SWAG-CHL67J 銆愬鎵樸�戙�怓Y23璇环鏀瑰杽銆�-璇环椤甸潰/鎷涙爣椤圭洰澧炲姞缁熻瀛楁 fy end
}
}
\ No newline at end of file
--
Gitblit v1.9.1