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/Final_reply_day__c.field-meta.xml | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day__c.field-meta.xml
index 9844104..491ca62 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/Final_reply_day__c.field-meta.xml
@@ -14,15 +14,14 @@
)</description>
<externalId>false</externalId>
<formula>/* IF 鏀惰揣NG && 涓�鍛ㄤ箣鍐呮病鏈夊洖瀵� -- OCSM_BP3-11 */
-IF(NOT(ISBLANK(Extend_Date__c)), Extend_Date__c,
+(IF(NOT(ISBLANK(Extend_Date__c)), Extend_Date__c,
IF(TEXT(Received_Confirm__c) = 'NG'
&& (
- (Not(ISNULL(Asset_return_day2__c)) && DATEVALUE(Loaner_received_time__c + 7) < Asset_return_day2__c)
- || (ISNULL(Asset_return_day2__c) && Loaner_received_time__c + 7 < now())
+ (Not(ISNULL(Asset_return_day2__c)) && DATEVALUE(Loaner_received_time__c + 7 + NULLVALUE(Condition_Seven_Days__c,0)) < Asset_return_day2__c)
+ || (ISNULL(Asset_return_day2__c) && (Loaner_received_time__c + 7 + NULLVALUE(Condition_Seven_Days__c,0)) < now())
)
&& Rental_Apply__r.DataMigration_Flag__c = FALSE,
Min_Final_reply_day_Text__c,
- /* ELSE Not(鏀惰揣NG) */
IF(Demo_purpose2_T__c=="宸茶喘寰呰揣"&&Not(isblank(Rental_Apply__r.Follow_UP_Opp__r.Shipping_Finished_Day_Func__c)),
Min_Final_reply_day_Text__c,
IF(Demo_purpose2_T__c=="绱㈣禂QIS"&&Not(isblank(QIS_Final_reply_day_Text__c)),
@@ -31,31 +30,18 @@
IF(Not(isblank(Guzhangpaicha_Final_reply_day_Text__c)), Min_Final_reply_day_Text__c,
IF(Repair_Status_Text__c =='0.鍒犻櫎',Min_Final_reply_day_Text__c,
IF(Repair_Status_Text__c =='0.鍙栨秷',Min_Final_reply_day_Text__c,
- /* OLY_OCM-636 Start 娣诲姞鎴栬�呮潯浠�, 鍥犱负杩旈�侀璁″綊杩樻棩鐨勬潯浠跺彉浜�,鍏ㄥ姞杩囨潵浼氳秴5000 */
IF((Not(isblank(RC_return_to_office__c)) || Not(isblank(Return_to_office_Final_reply_day_Text__c))) && NOT(ISBLANK(Min_Final_reply_day_Text__c)),Min_Final_reply_day_Text__c,
- /* OLY_OCM-636 End */
IF(NULLVALUE(Request_extend_day__c, DATE(1900,10,10))>NULLVALUE(RC_return_to_office__c, DATE(1900,10,10))+14&&NULLVALUE(Request_extend_day__c, DATE(1900,10,10))>Rental_End_Date__c && NOT(ISBLANK(Min_Final_reply_day_Text__c)),
- /* 鏈夊欢杩熺殑璇� */
Min_Final_reply_day_Text__c,
- /* 娌℃湁鏈夊欢杩熺殑璇� */
IF((Not(isblank(Rental_Apply__r.Repair__r.Repair_Ordered_Date__c))
- /* OLY_OCM-645 鑷劧鏃ヨ皟鏁翠负宸ヤ綔鏃ョ殑纭 Start 涓�鍛ㄤ箣鍐呴�佷慨 Bollow_Date__c = Shippment_loaner_time2__c */
&& (Rental_Apply__r.Repair__r.Repair_Ordered_Date__c <= IF(Rental_Apply__r.Request_demo_day__c < DATEVALUE('2019-07-01'), Bollow_Date__c + 7, Bollow_Date_Add_7_WD__c)))
- /* OLY_OCM-662 淇悊鍙楃悊鏃ヤ负绌虹殑鎯呭喌瀵瑰簲Start */
|| (Rental_Apply__r.Request_demo_day__c >= DATEVALUE('2019-07-01')
&& isblank(Bollow_Date_Add_7_WD__c)
&& NOT(isblank(Bollow_Date__c)))
- /* 淇悊鍙楃悊鏃ヤ负绌虹殑璇濆鏋滄病瓒呰繃鍑哄簱7鍐呯殑璇濆仛涓�鍛ㄥ唴閫佷慨澶勭悊 */
|| isblank(Rental_Apply__r.Repair__r.Repair_Ordered_Date__c) && TODAY() <= IF(Rental_Apply__r.Request_demo_day__c < DATEVALUE('2019-07-01'), Bollow_Date__c + 7, Bollow_Date_Add_7_WD__c)
- /* OLY_OCM-662 淇悊鍙楃悊鏃ヤ负绌虹殑鎯呭喌瀵瑰簲End */
- /* OLY_OCM-645 End */
,NULLVALUE(Add_Day_For_RC__c,Rental_End_Date__c),
- /* ELSE 涓�鍛ㄤ箣鍐呮湭閫佷慨 */
IF((Demo_purpose2_T__c=='淇濅慨鐢ㄦ埛'||Demo_purpose2_T__c=='甯傚満澶氬勾淇濅慨') && Not(ISBLANK(Shippment_loaner_time2__c)) && NOT(ISBLANK(Min_Final_reply_day_Text__c)),
- /* 淇濅慨鐢ㄦ埛 涓�鍛ㄤ箣鍐呮湭閫佷慨 -- OCSM_BP3-11 */
- /* 澶囧搧涓績鍑哄簱鏃堕棿涓嶄负绌� -- OLY_OCM-595 */
Min_Final_reply_day_Text__c,
- /* ELSE Not锛堜繚淇敤鎴凤級*/
NULLVALUE(Add_Day_For_RC__c,Rental_End_Date__c)
)
)
@@ -68,7 +54,7 @@
)
)
))
-)</formula>
+)) + Delay_Final_Reply_Days_By_Holiday__c</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
<label>鏈�鏂伴瀹氬綊杩樻棩</label>
<required>false</required>
--
Gitblit v1.9.1