From ca1c0956ec5d16a44bd0a2c10e0e49db37c0fb32 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:35:52 +0800
Subject: [PATCH] 20230307询价2期Batch增加入Schedule

---
 force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml b/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml
index e294da8..d8619fb 100644
--- a/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/validationRules/After_Request_shipping.validationRule-meta.xml
@@ -2,16 +2,22 @@
 <ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>After_Request_shipping</fullName>
     <active>true</active>
-    <description>鐜板満鍒拌揣纭鍚庯紝鎵嶅彲浠ユ搷浣滆鏈哄拰涓婁紶绛炬敹鍗�
+    <description>//鐜板満涓嶇‘璁ゆ垨鑰呮瑺鍝佺‘璁ゅ悗锛屼笉鑳戒笂浼犲尰闄㈡敹鍒扮瀛�
+鐜板満鍒拌揣纭鍚庯紝鎵嶅彲浠ユ搷浣滆鏈哄拰涓婁紶绛炬敹鍗�
 (Rental_Apply_Equipment_Set_Cnt__c - Loaner_received_ng_num__c    =    0 
 || ( Lost_item_finish__c &gt; 0  &amp;&amp;  Lost_product_cnt__c  &lt;&gt; Rental_Apply_Equipment_Set_Detail_Cnt__c)</description>
-    <errorConditionFormula>( Loaner_received_ng_num__c  &gt; 0 )
-&amp;&amp; (($User.ProfileId &lt;&gt;&apos;00e10000000Y3o5&apos;) &amp;&amp; ($User.ProfileId &lt;&gt;&apos;00e10000000xo1D&apos;)) 
-&amp;&amp; (ISCHANGED(HP_received_sign_day__c ) || ISCHANGED(HP_received_sign_text__c) ) 
-&amp;&amp; NOT($User.Batch_User__c) 
-&amp;&amp; $User.ProfileId &lt;&gt;&apos;00e10000000dEQx&apos; 
-&amp;&amp; $User.ProfileId &lt;&gt;&apos;00e10000000xnoY&apos; 
-&amp;&amp; $User.ProfileId &lt;&gt;&apos;00ep0000000O4tG&apos; 
+    <errorConditionFormula>( Loaner_received_ng_num__c  &gt; 0)
+&amp;&amp; 
+(($User.ProfileId &lt;&gt;&apos;00e10000000Y3o5&apos;)
+    &amp;&amp; ($User.ProfileId &lt;&gt;&apos;00e10000000xo1D&apos;)
+) 
+&amp;&amp; 
+(ISCHANGED(HP_received_sign_day__c )
+    || ISCHANGED(HP_received_sign_text__c) 
+)
+&amp;&amp; NOT($User.Batch_User__c) &amp;&amp; $User.ProfileId &lt;&gt;&apos;00e10000000dEQx&apos;
+&amp;&amp; $User.ProfileId &lt;&gt;&apos;00e10000000xnoY&apos;
+&amp;&amp; $User.ProfileId &lt;&gt;&apos;00ep0000000O4tG&apos;
 &amp;&amp; DataMigration_Flag__c = False</errorConditionFormula>
     <errorMessage>鐜板満鍒拌揣纭鍚庯紝鎵嶅彲浠ユ搷浣滆鏈哄拰涓婁紶绛炬敹鍗�</errorMessage>
 </ValidationRule>

--
Gitblit v1.9.1