From 7f68ed6f7658db35544204ab5dcf6a3800e1b756 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期二, 22 三月 2022 17:49:57 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/triggers/ConsumableOrderTrigger.trigger |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

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