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/Rental_Apply_Equipment_Set__c/fields/Borrow_day__c.field-meta.xml |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Borrow_day__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Borrow_day__c.field-meta.xml
index d4d1447..a799db5 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Borrow_day__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Borrow_day__c.field-meta.xml
@@ -5,21 +5,49 @@
 2018/08/28涔嬪墠锛�
 IF(AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),ISNULL(Asset_return_day2__c)), TODAY() - Bollow_Date__c, 
 IF(AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day2__c))) 
-,Asset_return_day2__c- Bollow_Date__c ,0))</description>
+,Asset_return_day2__c- Bollow_Date__c ,0))
+update lxy 2022/5/26 
+鏍规嵁DLIU-CES8B9淇敼</description>
     <externalId>false</externalId>
-    <formula>IF(AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),ISNULL(Asset_return_day2__c)), TODAY() - Bollow_Date__c, 
-IF(AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(	Asset_return_day_F__c)),First_Lost_item_check__c &lt;&gt; &apos;娆犲搧&apos;) 
-,Asset_return_day_F__c- Bollow_Date__c ,
-IF(
-AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day_F__c)),First_Lost_item_check__c  =  &apos;娆犲搧&apos;, First_RAESD__r.Lost_item_giveup__c  = FALSE)
-, TODAY()- Bollow_Date__c ,
-IF(
-AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day_F__c)),First_Lost_item_check__c  =  &apos;娆犲搧&apos;, First_RAESD__r.Lost_item_giveup__c  = TRUE)
-,  First_RAESD__r.Lost_item_check_day_F__c - Bollow_Date__c ,0
-)
+    <formula>IF( ((First_RAESD__r.Arrival_wh_day__c &gt; DATE(2022,2,28) &amp;&amp; Not(ISNULL(Final_reply_day_text__c)))
+	|| (ISNULL(First_RAESD__r.Arrival_wh_day__c) &amp;&amp; Not(ISNULL(Final_reply_day_text__c)))
+	|| (First_RAESD__r.Arrival_wh_day__c &lt;= DATE(2022,2,28) &amp;&amp; Final_reply_day_text__c &gt;= DATE(2022,3,1)))
+     &amp;&amp; First_RAESD__r.Over90DayObject__c = false, 
+	IF(
+		AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),ISNULL(Asset_return_day_F__c)), TODAY() - Bollow_Date__c, 
+		IF(
+			AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day_F__c)),First_Lost_item_check__c &lt;&gt; &apos;娆犲搧&apos;) 
+			,Asset_return_day_F__c- Bollow_Date__c ,
+			IF(
+				AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day_F__c)),First_Lost_item_check__c  =  &apos;娆犲搧&apos;, ISNULL(First_RAESD_LostReportApprovalDate__c), First_RAESD__r.Lost_item_giveup__c  = FALSE)
+				, TODAY()- Bollow_Date__c ,
+				IF(
+					AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day_F__c)),First_Lost_item_check__c  =  &apos;娆犲搧&apos;, NOT(ISNULL(First_RAESD_LostReportApprovalDate__c))),
+					First_RAESD_LostReportApprovalDate__c - Bollow_Date__c,
+					IF(
+						AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day_F__c)),First_Lost_item_check__c  =  &apos;娆犲搧&apos;, ISNULL(First_RAESD_LostReportApprovalDate__c),First_RAESD__r.Lost_item_giveup__c  = TRUE)
+						,  First_RAESD__r.Lost_item_check_day_F__c - Bollow_Date__c ,0
+					)
+				)
+			)
+		)
+	),
 
-))
+	IF(AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),ISNULL(Asset_return_day2__c)), TODAY() - Bollow_Date__c, 
+	IF(AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(	Asset_return_day_F__c)),First_Lost_item_check__c &lt;&gt; &apos;娆犲搧&apos;) 
+	,Asset_return_day_F__c- Bollow_Date__c ,
+	IF(
+	AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day_F__c)),First_Lost_item_check__c  =  &apos;娆犲搧&apos;, First_RAESD__r.Lost_item_giveup__c  = FALSE)
+	, TODAY()- Bollow_Date__c ,
+	IF(
+	AND(Not(ISNULL(Shipment_request_command__c)),Not(ISNULL(Bollow_Date__c)),Not(ISNULL(Asset_return_day_F__c)),First_Lost_item_check__c  =  &apos;娆犲搧&apos;, First_RAESD__r.Lost_item_giveup__c  = TRUE)
+	,  First_RAESD__r.Lost_item_check_day_F__c - Bollow_Date__c ,0
+	)
+
+	))
+	)
 )</formula>
+    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>宸插�熺敤鑷劧鏃�</label>
     <precision>18</precision>
     <required>false</required>

--
Gitblit v1.9.1