From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新

---
 force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/Over_Loaner_Detail_Status__c.field-meta.xml |   87 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/Over_Loaner_Detail_Status__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/Over_Loaner_Detail_Status__c.field-meta.xml
index bd6cbbd..c543af6 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/Over_Loaner_Detail_Status__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set_Detail__c/fields/Over_Loaner_Detail_Status__c.field-meta.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Over_Loaner_Detail_Status__c</fullName>
-    <externalId>false</externalId>
-    <formula>IF(Lost_item_giveup__c = TRUE,&apos;閬楀け&apos;,
+    <description>update lxy 2022/5/26 鏍规嵁DLIU-CES8B9淇敼
+鍘熸湁閫昏緫锛�
+IF(Lost_item_giveup__c = TRUE,&apos;閬楀け&apos;,
 
 IF(
   AND(RAES_Final_reply_day__c &lt; TODAY(),
@@ -36,8 +37,86 @@
 )
 )
 )
-)</formula>
-    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+)</description>
+    <externalId>false</externalId>
+    <formula>IF(((Arrival_wh_day__c &gt; DATE(2022,2,28) &amp;&amp; !ISBLANK(RAES_Final_reply_day__c))
+      || (ISBLANK(Arrival_wh_day__c) &amp;&amp; !ISBLANK(RAES_Final_reply_day__c))
+      || (Arrival_wh_day__c &lt;= DATE(2022,2,28) &amp;&amp; RAES_Final_reply_day__c &gt;= DATE(2022,3,1)))
+     &amp;&amp; Over90DayObject__c = false, 
+
+IF(
+	OR(AND(NOT(ISBLANK(LostReport_Detail__c)),NOT(ISBLANK(LostReport_Detail__r.LostReport_approval_time__c))),
+	Lost_item_giveup__c = TRUE),&apos;閬楀け&apos;,
+
+IF(
+  AND(RAES_Final_reply_day__c &lt; TODAY(),
+  Not(ISBLANK(Shipment_request_time2__c)),
+  Not(ISBLANK(Bollow_Date__c)),  
+  ISBLANK(Return_DeliverySlip__c)
+  
+  ),&apos;閫炬湡鍑哄��&apos;,
+
+IF(
+  AND(RAES_Final_reply_day__c &gt;= TODAY(), 
+  Not(ISBLANK(Shipment_request_time2__c)) ,
+  Not(ISBLANK(Bollow_Date__c)),  
+  ISBLANK(Return_DeliverySlip__c)
+  ) ,&apos;姝ｅ父鍑哄��&apos;,
+
+IF( 
+AND(NOT(ISBLANK(Shipment_request_time2__c)), 
+Not(ISBLANK(Bollow_Date__c)),
+NOT(ISBLANK(Return_DeliverySlip__c)),
+RAES_Final_reply_day__c &lt; Asset_return_Day__c 
+), &apos;閫炬湡杩斿洖&apos;, 
+
+IF( 
+AND(NOT(ISBLANK(Shipment_request_time2__c)),
+Not(ISBLANK(Bollow_Date__c)), 
+NOT(ISBLANK(Return_DeliverySlip__c)), 
+RAES_Final_reply_day__c &gt;= Asset_return_Day__c
+), &apos;姝ｅ父杩斿洖&apos;, &apos;&apos;
+)
+)
+)
+)
+), 
+
+IF(Lost_item_giveup__c = TRUE,&apos;閬楀け&apos;,
+
+IF(
+  AND(RAES_Final_reply_day__c &lt; TODAY(),
+  Not(ISBLANK(Shipment_request_time2__c)),
+  Not(ISBLANK(Bollow_Date__c)),  
+  ISBLANK(Return_DeliverySlip__c)
+  
+  ),&apos;閫炬湡鍑哄��&apos;,
+
+IF(
+  AND(RAES_Final_reply_day__c &gt;= TODAY(), 
+  Not(ISBLANK(Shipment_request_time2__c)) ,
+  Not(ISBLANK(Bollow_Date__c)),  
+  ISBLANK(Return_DeliverySlip__c)
+  ) ,&apos;姝ｅ父鍑哄��&apos;,
+
+IF( 
+AND(NOT(ISBLANK(Shipment_request_time2__c)), 
+Not(ISBLANK(Bollow_Date__c)),
+NOT(ISBLANK(Return_DeliverySlip__c)),
+RAES_Final_reply_day__c &lt; Asset_return_Day__c 
+), &apos;閫炬湡杩斿洖&apos;, 
+
+IF( 
+AND(NOT(ISBLANK(Shipment_request_time2__c)),
+Not(ISBLANK(Bollow_Date__c)), 
+NOT(ISBLANK(Return_DeliverySlip__c)), 
+RAES_Final_reply_day__c &gt;= Asset_return_Day__c
+), &apos;姝ｅ父杩斿洖&apos;, &apos;&apos;
+)
+)
+)
+)
+))</formula>
     <label>鍊熷嚭鐘舵��(鏄庣粏)</label>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1