From 1b3fb93f787b8b546a307bf063183f5295d183f8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 16:53:25 +0800
Subject: [PATCH] merge

---
 force-app/main/default/objects/Statu_Achievements__c/fields/UnshippedAmount_without_tax_Thousand_DN__c.field-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Statu_Achievements__c/fields/UnshippedAmount_without_tax_Thousand_DN__c.field-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/fields/UnshippedAmount_without_tax_Thousand_DN__c.field-meta.xml
index fcc2b85..ae5796c 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/fields/UnshippedAmount_without_tax_Thousand_DN__c.field-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/fields/UnshippedAmount_without_tax_Thousand_DN__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>UnshippedAmount_without_tax_Thousand_DN__c</fullName>
     <externalId>false</externalId>
-    <formula>(ContractAmountNoGurantee__c- ABS(NetWorthNoProviston_DN__c)- ABS(AdjustnetWorthNoProviston_DN__c) - ABS(Case( Opportunity__r.Trade__c,
+    <formula>(ContractAmountNoGurantee__c- IF(AND( ISPICKVAL(Opportunity__r.Trade__c, &quot;澶栬部&quot;),ISNULL(DeliveryDate__c)), 0, ABS(NetWorthNoProviston_DN__c)) - IF(AND( ISPICKVAL(Opportunity__r.Trade__c, &quot;澶栬部&quot;),ISNULL(DeliveryDate__c)), 0, ABS(AdjustnetWorthNoProviston_DN__c)) - ABS(Case( Opportunity__r.Trade__c,
 &quot;鍐呰部&quot;,ShippedAmount_ZM__c/ Opportunity__r.Tax_Intra_F_Copy__c ,
 &quot;澶栬部&quot;,ShippedAmount_ZM__c* Opportunity__r.Tax_Foreign_F_Copy__c,
 ShippedAmount_ZM_153P__c))

--
Gitblit v1.9.1