From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject

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

diff --git a/force-app/main/default/objects/LastbuyProduct__c/fields/RemainingNumber__c.field-meta.xml b/force-app/main/default/objects/LastbuyProduct__c/fields/RemainingNumber__c.field-meta.xml
index cb97f6d..3d1caed 100644
--- a/force-app/main/default/objects/LastbuyProduct__c/fields/RemainingNumber__c.field-meta.xml
+++ b/force-app/main/default/objects/LastbuyProduct__c/fields/RemainingNumber__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>RemainingNumber__c</fullName>
     <externalId>false</externalId>
-    <formula>IF( ISBLANK( ActualQuantity__c ) ,  LastbuyQuantity__c ,  LastbuyQuantity__c  -  ActualQuantity__c )</formula>
+    <formula>IF( ActualQuantity__c = 0 ,IF( WIN_manual_number__c = 0,LastbuyQuantity__c , LastbuyQuantity__c  -  WIN_manual_number__c),  LastbuyQuantity__c  -  ActualQuantity__c )</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鍓╀綑鏁伴噺</label>
     <precision>18</precision>

--
Gitblit v1.9.1