fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/QIS_Report__c/fields/ComplaintStatus__c.field-meta.xml

@@ -5,8 +5,8 @@
    <externalId>false</externalId>
    <formula>IF(OR(TEXT(QIS_Status__c)=&apos;草案中&apos;,TEXT(QIS_Status__c)=&apos;FSE填写完毕&apos;,TEXT(QIS_Status__c)=&apos;取消申请&apos;,TEXT(QIS_Status__c)=&apos;取消&apos;,QIS_Submit_day__c&lt;DATE(2020,04,20)),
   &apos;非对象&apos;, 
   /*add by rentx 2020-10-23 start*/
    if((is_CNBuy__c = &apos;true&apos;), 
   /*add by rentx 2020-10-23 start;20220413 ljh Is_Box__c*/
    if((is_CNBuy__c = &apos;true&apos; || Is_Box__c), 
      &apos;非对象&apos;, 
      IF((ETQ_UPLOAD_STATUS__c = &apos;3&apos;),
        &apos;EtQ同步失败&apos;,
@@ -23,7 +23,9 @@
                &apos;待EtQ Response&apos;,
              if(And(QIS_Determine__c = &apos;要&apos;,isblank(Text(if_QIS_Allowed__c))),&apos;待进行QIS判定&apos;,
               
              IF(AND(ISNULL(QIS_Reply_day__c),ISNULL(QIS_OSH_answerdate__c)) ,
              IF( OR(AND(ISNULL(QIS_Reply_day__c),ISNULL(QIS_OSH_answerdate__c)),
                     AND(!ISNULL(QIS_Reply_day__c),ISNULL(OCSM_RC_CordingDate__c),RC_problem_not_found__c = true),
                     AND(!ISNULL(QIS_Reply_day__c),PAE_reappear_confirm__c !=&apos;已确认&apos;,RC_problem_not_found__c = true)),
                 &apos;待分析&apos;, 
                 IF( OR(AND(!ISNULL(QIS_Reply_day__c),ISNULL(OCSM_RC_CordingDate__c),RC_problem_not_found__c != true),
                        AND(!ISNULL(QIS_Reply_day__c),PAE_reappear_confirm__c !=&apos;已确认&apos;,RC_problem_not_found__c != true),