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/NFM007.trigger | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/triggers/NFM007.trigger b/force-app/main/default/triggers/NFM007.trigger
index 7959c43..9a39663 100644
--- a/force-app/main/default/triggers/NFM007.trigger
+++ b/force-app/main/default/triggers/NFM007.trigger
@@ -1,4 +1,9 @@
trigger NFM007 on Opportunity (before update, after update) { // after insert 銈掕�冩叜銇椼仾銇�
+ // SWAG-CE55BX 棰勬祴浼樺寲 start
+ if (StaticParameter.EscapeOppandStaTrigger) {
+ return;
+ }
+ // SWAG-CE55BX 棰勬祴浼樺寲 end
if (StaticParameter.EscapeNFM007Trigger) {
System.debug('Escape銆丒scapeNFM007Trigger:::::' + StaticParameter.EscapeNFM007Trigger);
return;
@@ -27,21 +32,30 @@
List<String> quoteIds = new List<String>();
for(Opportunity opp : Trigger.new) {
// 鍙ゃ亜銉囥兗銈裤伄鏇存柊銈掔姝�
- Boolean noChange;
- for (String colApiName : ControllerUtil.oppColumnList) {
- colApiName = colApiName.trim();
- if (opp.oldData_flg__c && Trigger.oldMap.get(opp.Id).get(colApiName) != Trigger.newMap.get(opp.Id).get(colApiName)) {
- noChange = true; break;
- }
- }
- noChange = false;
- if (noChange) {
- opp.addError('涓嶈兘淇敼鏃ф暟鎹�'); continue;
- }
+ //20221229 lt DB202211430986 璇环鍘嗗彶涓嶄娇鐢ㄥ瓧娈�
+ // Boolean noChange;
+ // for (String colApiName : ControllerUtil.oppColumnList) {
+ // colApiName = colApiName.trim();
+ // if (opp.oldData_flg__c && Trigger.oldMap.get(opp.Id).get(colApiName) != Trigger.newMap.get(opp.Id).get(colApiName)) {
+ // noChange = true; break;
+ // }
+ // }
+ // noChange = false;
+ // if (noChange) {
+ // opp.addError('涓嶈兘淇敼鏃ф暟鎹�'); continue;
+ // }
+ //20221229 lt DB202211430986 璇环鍘嗗彶涓嶄娇鐢ㄥ瓧娈�
// SAPWIN銇儨銈裤兂銇у嫊銇忋仒銈冦仾銇忋�佹墜鍕曘仹銉併偋銉冦偗鈬掍繚瀛樸仩銇嬨倝銆乯s鐒＄悊
if (Trigger.oldMap.get(opp.Id).get('SAP_Send_OK__c') == false && opp.SAP_Send_OK__c == true) {
-
+ //SWAG-CG88AG銆愬鎵樸�戞彁鍑轰环鏍肩敵璇锋槸鍦ㄥ崗璁湁鏁堟湡鍐咃紝鍏佽WIN fy start
+ if(string.isNotBlank(opp.Estimation_No__c)){
+ Boolean judge = OpportunityWebService.judgeIsAssistantAppliedOutTime(opp.Estimation_No__c);
+ if(!judge){
+ opp.addError('缁忛攢鍟嗗崗璁凡杩囨湡锛岃閲嶆柊鍋氭姤浠疯绠楀拰鍚堝悓鐢宠');
+ }
+ }
+ //SWAG-CG88AG銆愬鎵樸�戞彁鍑轰环鏍肩敵璇锋槸鍦ㄥ崗璁湁鏁堟湡鍐咃紝鍏佽WIN fy end
//CHAN-BCNCRB XHL If_Have_EPT1__c
if (opp.If_Have_EPT1__c == true && opp.If_UploadT1Detailed__c == false) {
opp.addError('璇环浜у搧涓寘鍚獷P-T1浜у搧锛屼絾娌′笂浼燭1娓呭崟锛屾棤娉曡繘琛孲AP涓婁紶锛圵IN锛夛紝璇蜂笂浼燭1娓呭崟');
@@ -283,7 +297,18 @@
insert iflog;
iflog = [Select Id, Name from BatchIF_Log__c where Id = :iflog.Id];
System.debug(Logginglevel.DEBUG, 'NFM007_' + iflog.Name + ' start'); // callout 銇腑 end 銇甽og銈掑嚭銇椼伨銇�
- NFM007Controller.callout(iflog.Id, oppIds, purposeOfAdviceMap);
+
+ // 20220921 ljh SWAG-CG2A7S update start
+ // NFM007Controller.callout(iflog.Id, oppIds, purposeOfAdviceMap);
+ String uid = UserInfo.getUserId();
+ String iUid = System.Label.interfaceUserID;
+ if (uid.substring(0,15) == iUid.substring(0,15)) {
+ NFM007Controller.calloutNotfuture(iflog.Id, oppIds, purposeOfAdviceMap);
+ }else{
+ NFM007Controller.callout(iflog.Id, oppIds, purposeOfAdviceMap);
+ }
+ // 20220921 ljh SWAG-CG2A7S update end
+
}
if(System.Test.isRunningTest()){
--
Gitblit v1.9.1