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/objects/OPDPlan__c/fields/Is_Meetontime__c.field-meta.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/objects/OPDPlan__c/fields/Is_Meetontime__c.field-meta.xml b/force-app/main/default/objects/OPDPlan__c/fields/Is_Meetontime__c.field-meta.xml
index 32e18b3..23d56c1 100644
--- a/force-app/main/default/objects/OPDPlan__c/fields/Is_Meetontime__c.field-meta.xml
+++ b/force-app/main/default/objects/OPDPlan__c/fields/Is_Meetontime__c.field-meta.xml
@@ -4,15 +4,15 @@
     <description>2021.04.23  鏉庢椇淇敼   鈥樺鍝佺姸鎬�2鈥欏瓧娈�
 2021.04.26 鏉庢椇淇敼 瀛楁鍚嶇О 鍜� 鏄剧ず鍊�</description>
     <externalId>false</externalId>
-    <formula>IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;isBlank(Rental_Apply2__c),
+    <formula>IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;isBlank(Rental_Apply2__c),
   &apos;&apos;,
-  IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;琚姩鍙栨秷&apos;, 
+  IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;琚姩鍙栨秷&apos;, 
   &apos;5.鏈弧瓒�&apos;,
-  IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;涓诲姩鍙栨秷&apos;, 
+  IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;涓诲姩鍙栨秷&apos;, 
   &apos;&apos;,
-   IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;(!isBlank(Bollowdate__c)&amp;&amp;Bollowdate__c&lt;Requestshippingday__c),
+   IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;(!isBlank(Bollowdate__c)&amp;&amp;Bollowdate__c&lt;Requestshippingday__c),
     &apos;1.鎸夋椂婊¤冻&apos;, 
-     IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;)&amp;&amp;(!isBlank(Bollowdate__c)&amp;&amp;Bollowdate__c&gt;=Requestshippingday__c), 
+     IF((TEXT(Status__c)==&apos;瀹屾瘯鏈姤鍛�&apos;||TEXT(Status__c)==&apos;瀹屾瘯&apos;||TEXT(Status__c)==&apos;寰呮彁浜ゆ姤鍛�&apos;)&amp;&amp;(!isBlank(Bollowdate__c)&amp;&amp;Bollowdate__c&gt;=Requestshippingday__c), 
      &apos;2.鏈寜鏃舵弧瓒�&apos;, 
      IF((TEXT(Status__c)==&apos;鍙栨秷&apos;||TEXT(Status__c)==&apos;璁″垝涓�&apos;)&amp;&amp; TEXT(Rental_Apply2__r.Cancel_Reason__c)==&apos;琚姩鍙栨秷&apos;,
        &apos;5.鏈弧瓒�&apos;,  

--
Gitblit v1.9.1