From a191c8358b35f54342da53db820ede118720230a Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期二, 22 三月 2022 15:15:27 +0800
Subject: [PATCH] 【委托】经销商ET账号显示界面维护-广东汇晨

---
 force-app/main/default/classes/ConsumableOrderTriggerTest.cls  |    2 +-
 force-app/main/default/triggers/ConsumableOrderTrigger.trigger |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/classes/ConsumableOrderTriggerTest.cls b/force-app/main/default/classes/ConsumableOrderTriggerTest.cls
index 3c7ef30..046b7aa 100644
--- a/force-app/main/default/classes/ConsumableOrderTriggerTest.cls
+++ b/force-app/main/default/classes/ConsumableOrderTriggerTest.cls
@@ -10,7 +10,7 @@
         if (rectCotac.size() == 0) {
             return;
         }
-        Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�'];
+        Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'];
         Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '鏈夊姽');
         Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '鏈夊姽');
         insert new Product2[]{prod01,prod02};
diff --git a/force-app/main/default/triggers/ConsumableOrderTrigger.trigger b/force-app/main/default/triggers/ConsumableOrderTrigger.trigger
index 11d6bfe..85f86c0 100644
--- a/force-app/main/default/triggers/ConsumableOrderTrigger.trigger
+++ b/force-app/main/default/triggers/ConsumableOrderTrigger.trigger
@@ -1,7 +1,10 @@
 trigger ConsumableOrderTrigger on Consumable_order__c (before insert, before update) {
-	if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
-		return;
-	}
+	// CHAN-CBYBBF 銆愬鎵樸�戠粡閿�鍟咵T璐﹀彿鏄剧ず鐣岄潰缁存姢-骞夸笢姹囨櫒 start
+	// 娉ㄩ噴璺宠繃 鍙戣揣鏃惰璁$畻 SAP鍚堝悓鍙�
+	// if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
+	// 	return;
+	// }
+	// CHAN-CBYBBF 銆愬鎵樸�戠粡閿�鍟咵T璐﹀彿鏄剧ず鐣岄潰缁存姢-骞夸笢姹囨櫒 end
 	//add by rentx 20210618 start
 	if (StaticParameter.ConsumableOrderTrigger) {
 		return;

--
Gitblit v1.9.1