From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
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 <> '娆犲搧')
-,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 = '娆犲搧', 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 = '娆犲搧', 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 > DATE(2022,2,28) && Not(ISNULL(Final_reply_day_text__c)))
+ || (ISNULL(First_RAESD__r.Arrival_wh_day__c) && Not(ISNULL(Final_reply_day_text__c)))
+ || (First_RAESD__r.Arrival_wh_day__c <= DATE(2022,2,28) && Final_reply_day_text__c >= DATE(2022,3,1)))
+ && 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 <> '娆犲搧')
+ ,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 = '娆犲搧', 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 = '娆犲搧', 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 = '娆犲搧', 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 <> '娆犲搧')
+ ,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 = '娆犲搧', 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 = '娆犲搧', 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