From 95a72f4ec28372111895751f2198b58d3af8fecf Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期四, 12 五月 2022 09:28:21 +0800
Subject: [PATCH] 询价字段
---
force-app/main/default/classes/RollupToHPBatch.cls | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/classes/RollupToHPBatch.cls b/force-app/main/default/classes/RollupToHPBatch.cls
index beff30c..504a438 100644
--- a/force-app/main/default/classes/RollupToHPBatch.cls
+++ b/force-app/main/default/classes/RollupToHPBatch.cls
@@ -766,8 +766,7 @@
Today_Rate__c, Trade__c, convertCurrency(Forecast_Amount_All_F__c), convertCurrency(ShippedAmount__c),
Opp_Actual_ThousandY__c, BO_Forecast_ThousandY__c,
OP_ThousandY__c, Opp_Forecast_ThousandY__c,
- //Opportunity_ThousandY__c, //lt 20220318 娉ㄩ噴
- Amount_Without_Tax_Thousand_F__c,
+ Opportunity_ThousandY__c, Amount_Without_Tax_Thousand_F__c,
Hospital__c, Department_Class__c
, OCSM_RMB_Without_Tax_1000TR__c//20220111 SWAG-C8MBB6 鍔�7.璇环 lt
from Opportunity
@@ -793,10 +792,7 @@
Decimal o2 = opp.BO_Forecast_ThousandY__c == null ? 0 : opp.BO_Forecast_ThousandY__c;
Decimal o3 = opp.OP_ThousandY__c == null ? 0 : opp.OP_ThousandY__c;
Decimal o4 = opp.Opp_Forecast_ThousandY__c == null ? 0 : opp.Opp_Forecast_ThousandY__c;
- //Decimal o5 = opp.Opportunity_ThousandY__c == null ? 0 : opp.Opportunity_ThousandY__c;//lt 20220318 娉ㄩ噴
- //lt 20220318 start
- Decimal o5 = 0 ;
- //lt 20220318 start
+ Decimal o5 = opp.Opportunity_ThousandY__c == null ? 0 : opp.Opportunity_ThousandY__c;
Decimal o6 = opp.Amount_Without_Tax_Thousand_F__c == null ? 0 : opp.Amount_Without_Tax_Thousand_F__c;
//20220111 SWAG-C8MBB6 鍔�7.璇环 lt start
Decimal o7 = opp.OCSM_RMB_Without_Tax_1000TR__c == null ? 0 : opp.OCSM_RMB_Without_Tax_1000TR__c;
@@ -1376,7 +1372,7 @@
acc.OP_ThousandY__c = 0;
acc.Opp_Forecast_ThousandY__c = 0;
- //acc.Opportunity_ThousandY__c = 0;//lt 20220318 娉ㄩ噴
+ acc.Opportunity_ThousandY__c = 0;
acc.Amount_Without_Tax_Thousand__c = 0;
//20220111 SWAG-C8MBB6 鍔�7.璇环 lt start
@@ -1768,7 +1764,7 @@
acc.BO_Forecast_ThousandY__c += o2;
acc.OP_ThousandY__c += o3;
acc.Opp_Forecast_ThousandY__c += o4;
- //acc.Opportunity_ThousandY__c += o5;//lt 20220318 娉ㄩ噴
+ acc.Opportunity_ThousandY__c += o5;
acc.Amount_Without_Tax_Thousand__c += o6;
//20220111 SWAG-C8MBB6 鍔�7.璇环 lt start
acc.AllOP_ThousandY__c += o7;
--
Gitblit v1.9.1