changeorg

buli

2023-07-18 df5aa8087c2c7328dc4188f05d762c8df1f0b07a

 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 &amp;&amp; 一周之内没有回寄   -- 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) = &apos;NG&apos;
  &amp;&amp; (
      (Not(ISNULL(Asset_return_day2__c)) &amp;&amp; DATEVALUE(Loaner_received_time__c + 7) &lt; Asset_return_day2__c)
    || (ISNULL(Asset_return_day2__c) &amp;&amp; Loaner_received_time__c + 7 &lt; now())
      (Not(ISNULL(Asset_return_day2__c)) &amp;&amp; DATEVALUE(Loaner_received_time__c + 7 + NULLVALUE(Condition_Seven_Days__c,0)) &lt; Asset_return_day2__c)
    || (ISNULL(Asset_return_day2__c) &amp;&amp; (Loaner_received_time__c + 7 + NULLVALUE(Condition_Seven_Days__c,0)) &lt; now())
  )
  &amp;&amp; Rental_Apply__r.DataMigration_Flag__c = FALSE,
  Min_Final_reply_day_Text__c,
  /* ELSE Not(收货NG) */
  IF(Demo_purpose2_T__c==&quot;已购待货&quot;&amp;&amp;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==&quot;索赔QIS&quot;&amp;&amp;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 ==&apos;0.删除&apos;,Min_Final_reply_day_Text__c,
            IF(Repair_Status_Text__c ==&apos;0.取消&apos;,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))) &amp;&amp; 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))&gt;NULLVALUE(RC_return_to_office__c, DATE(1900,10,10))+14&amp;&amp;NULLVALUE(Request_extend_day__c, DATE(1900,10,10))&gt;Rental_End_Date__c &amp;&amp; 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 */
                        &amp;&amp; (Rental_Apply__r.Repair__r.Repair_Ordered_Date__c &lt;= IF(Rental_Apply__r.Request_demo_day__c &lt; DATEVALUE(&apos;2019-07-01&apos;), Bollow_Date__c + 7, Bollow_Date_Add_7_WD__c)))
                    /* OLY_OCM-662 修理受理日为空的情况对应Start */
                    || (Rental_Apply__r.Request_demo_day__c &gt;= DATEVALUE(&apos;2019-07-01&apos;)
                        &amp;&amp; isblank(Bollow_Date_Add_7_WD__c)
                        &amp;&amp; NOT(isblank(Bollow_Date__c)))
                    /* 修理受理日为空的话如果没超过出库7内的话做一周内送修处理 */
                    || isblank(Rental_Apply__r.Repair__r.Repair_Ordered_Date__c) &amp;&amp; TODAY() &lt;= IF(Rental_Apply__r.Request_demo_day__c &lt; DATEVALUE(&apos;2019-07-01&apos;), 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==&apos;保修用户&apos;||Demo_purpose2_T__c==&apos;市场多年保修&apos;) &amp;&amp; Not(ISBLANK(Shippment_loaner_time2__c)) &amp;&amp; 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>