From dec96e2f8b84ea04d773c0c520c39b0822912ee3 Mon Sep 17 00:00:00 2001
From: D C <chenbangcai@prec-tech.com>
Date: 星期五, 26 五月 2023 10:32:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Maintenance_Price_Amount__c.field-meta.xml |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Maintenance_Price_Amount__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Maintenance_Price_Amount__c.field-meta.xml
index 30bff12..bd6295e 100644
--- a/force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Maintenance_Price_Amount__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract_Asset__c/fields/Maintenance_Price_Amount__c.field-meta.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Maintenance_Price_Amount__c</fullName>
-    <description>if(OR( Return_Flag__c , ChangeAcc_flag__c )
-,Asset__r.Maintenance_Price_Year__c *  Asset__r.Guarantee_period_year__c / ( endDateGurantee_Text__c -  startDateGurantee_Text__c )
-,Asset__r.Maintenance_Price_Year__c *  Asset__r.Guarantee_period_year__c)</description>
+    <description>/*宸插け鏁堢殑浜у搧锛岀淮淇姤浠锋�婚涓�0*/
+if( Invalid__c ,0,if(Return_Flag__c
+,Asset__r.Maintenance_Price_Year__c * Asset__r.Guarantee_period_year__c *(endDateGurantee_Text__c - startDateGurantee_Text__c)/ guarantee_period__c
+,IF(ChangeAcc_flag__c ,Asset__r.Maintenance_Price_Year__c * Asset__r.Guarantee_period_year__c *(endDateGurantee_Text__c - startDateGurantee_Text__c)/ Asset__r.guarantee_period__c,Asset__r.Maintenance_Price_Year__c * Asset__r.Guarantee_period_year__c)))</description>
     <externalId>false</externalId>
     <formula>/*宸插け鏁堢殑浜у搧锛岀淮淇姤浠锋�婚涓�0*/
-if( Invalid__c ,0,if(Return_Flag__c 
-,Asset__r.Maintenance_Price_Year__c *  Asset__r.Guarantee_period_year__c *(endDateGurantee_Text__c -  startDateGurantee_Text__c)/ guarantee_period__c
-,IF(ChangeAcc_flag__c ,Asset__r.Maintenance_Price_Year__c *  Asset__r.Guarantee_period_year__c *(endDateGurantee_Text__c -  startDateGurantee_Text__c)/ Asset__r.guarantee_period__c,Asset__r.Maintenance_Price_Year__c *  Asset__r.Guarantee_period_year__c)))</formula>
+if( Invalid__c || (General_Branch_Changeflag__c &amp;&amp; !ISNULL(endDateGurantee_changeAcc__c)),0,if(Return_Flag__c
+,Asset__r.Maintenance_Price_Year__c * Asset__r.Guarantee_period_year__c *(endDateGurantee_Text__c - startDateGurantee_Text__c)/ guarantee_period__c
+,IF(ChangeAcc_flag__c &amp;&amp; !General_Branch_Changeflag__c,Asset__r.Maintenance_Price_Year__c * Asset__r.Guarantee_period_year__c *(endDateGurantee_Text__c - startDateGurantee_Text__c)/ Asset__r.guarantee_period__c,Asset__r.Maintenance_Price_Year__c * Asset__r.Guarantee_period_year__c)))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>缁翠慨鎶ヤ环鎬婚</label>
     <precision>18</precision>

--
Gitblit v1.9.1