From df5aa8087c2c7328dc4188f05d762c8df1f0b07a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 18 七月 2023 09:19:12 +0800
Subject: [PATCH] changeorg

---
 force-app/main/default/objects/Repair__c/fields/AwareDate__c.field-meta.xml |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/objects/Repair__c/fields/AwareDate__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/AwareDate__c.field-meta.xml
index 933b556..9118f4e 100644
--- a/force-app/main/default/objects/Repair__c/fields/AwareDate__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/AwareDate__c.field-meta.xml
@@ -2,17 +2,15 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>AwareDate__c</fullName>
     <description>AE鎴栬�匢ntake鍒ゅ畾涓篜AE/UNKNOWN鏃讹紝鐢�&lt;闂鑱旂粶鏀跺埌鏃�&gt;
-Final鍒ゅ畾涓篜AE/UNKNOWN鏃讹紝鐢�&lt;鍒濇鎶ヤ环鏃�&gt;</description>
-    <externalId>false</externalId>
-    <formula>if( DOJ_Status__c = &apos;闈炲璞�&apos;,null,
+Final鍒ゅ畾涓篜AE/UNKNOWN鏃讹紝鐢�&lt;鍒濇鎶ヤ环鏃�&gt;
+/*if( DOJ_Status__c = &apos;闈炲璞�&apos;,null,
 	IF( AE_DetermineResult__c = &apos;AE&apos;,
 		if( !ISBLANK(MBC_AwareDate__c  ),
 			MBC_AwareDate__c, 
 			DateReceiptQuestions__c),
 		null
 	)
-)
-
+)*/
 /*if( DOJ_Status__c = &apos;闈炲璞�&apos;,null,
 	IF( AE_DetermineResult__c = &apos;AE&apos;,DateReceiptQuestions__c,
 		if( text( PAE_Determine__c) = &apos;PAE&apos; || text(PAE_Determine__c) = &apos;Unknown&apos;,
@@ -23,9 +21,22 @@
 			)
 		)
 	)
-)*/</formula>
+)*/20221020淇敼</description>
+    <externalId>false</externalId>
+    <formula>If( !ISBLANK(MBC_AwareDate__c),MBC_AwareDate__c,
+if( DOJ_Status__c = &apos;闈炲璞�&apos;,null,
+	IF( AE_DetermineResult__c = &apos;AE&apos;,DateReceiptQuestions__c,
+		if( text( PAE_Determine__c) = &apos;PAE&apos; || text(PAE_Determine__c) = &apos;Unknown&apos;,
+			DateReceiptQuestions__c,
+			IF(text( PAE_DetermineAC__c) = &apos;PAE&apos; || text(PAE_DetermineAC__c) = &apos;Unknown&apos;,
+                 Repair_Inspection_Date__c,
+				null
+			)
+		)
+	)
+))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
-    <label>AwareDate</label>
+    <label>AwareDate.</label>
     <required>false</required>
     <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>

--
Gitblit v1.9.1