From ea6a4eec81a6a74e214aefc5971d701242c3e7d3 Mon Sep 17 00:00:00 2001
From: Thhto <997058689@qq.com>
Date: 星期四, 17 十一月 2022 14:40:04 +0800
Subject: [PATCH] SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy
---
force-app/main/default/classes/SI_NewQuoteEntryController.cls | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/classes/SI_NewQuoteEntryController.cls b/force-app/main/default/classes/SI_NewQuoteEntryController.cls
index 04bda2a..9d2c622 100644
--- a/force-app/main/default/classes/SI_NewQuoteEntryController.cls
+++ b/force-app/main/default/classes/SI_NewQuoteEntryController.cls
@@ -367,8 +367,8 @@
}
} else {
//娣诲姞琛�
- List<Quote> quoList =
- [ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,
+ List<Quote> quoList =//SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start QuotationChange__c,MainEngineWithoutMonitor__c,Interdepartmental__c,
+ [ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,QuotationChange__c,MainEngineWithoutMonitor__c,Interdepartmental__c,
Dealer_Final_Price__c,TotalPrice__c,Estimation_List_Price__c,QuoteNumber,
CreatedByid,Queto_Confirm_Date__c,
QuoteToName,Quote_Expiration_Date__c,Quote_Comment__c,Stocking_Price__c,Unit_Price__c,
@@ -433,6 +433,7 @@
if (copyQuoId == null) {
quo = quoList[0];
quoteOwner = quo.CreatedByid;
+
//SWAG-C5DBAL 銆愬鎵樸�� [绱ф�SI璇环鑲栧瘨鏃犳硶淇敼鎶ヤ环鍗� 绮剧悽鎶�鏈� 2021/07/30 start
//娉ㄩ噴鍘熼�昏緫
if(quo.Queto_Confirm_Date__c != null ||
@@ -717,6 +718,11 @@
}
// vivek end
system.debug('鍒濆鍖栨椂鐨勯泦鍚堬細'+activities);
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ quo.Offer_Amount__c = true;
+ quo.TOTAL__c = true;
+ quo.Preferential_Gurantee_Period__c = true;
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
return null;
}
@@ -2017,7 +2023,13 @@
Boolean error = false;
errorflg = false;
errormessage = null;
-
+ //obsap 鏈�缁堢敤鎴峰悎鍚岄噾棰濋獙璇� fy start
+ if (quo.Dealer_Final_Price_Page__c == null) {
+ quo.Dealer_Final_Price__c.addError(System.Label.Error_Message3);
+ error = true;
+ errormessage = System.Label.Error_Message3;
+ }
+ //obsap 鏈�缁堢敤鎴峰悎鍚岄噾棰濋獙璇� fy end
if (checkAgentsDeleteFlag() == false) {
return false;
}
@@ -2289,11 +2301,11 @@
error = true;
errormessage = System.Label.Error_Message3;
}
- if (quo.Dealer_Final_Price_Page__c == null) {
- quo.Dealer_Final_Price__c.addError(System.Label.Error_Message3);
- error = true;
- errormessage = System.Label.Error_Message3;
- }
+ // if (quo.Dealer_Final_Price_Page__c == null) {
+ // quo.Dealer_Final_Price__c.addError(System.Label.Error_Message3);
+ // error = true;
+ // errormessage = System.Label.Error_Message3;
+ // }
if (qb.Quote_Adjust_Calculate == null) {
quo.Quote_Adjust_Calculate__c.addError(System.Label.Error_Message3);
error = true;
@@ -2470,8 +2482,8 @@
}
} else {
- List<Quote> qs = New List<Quote>();
- qs = [select Id,OpportunityId,Pricebook2Id,Name,Estimation_List_Price__c,Dealer_Final_Price__c,
+ List<Quote> qs = New List<Quote>();//SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start QuotationChange__c,MainEngineWithoutMonitor__c,Interdepartmental__c,
+ qs = [select Id,OpportunityId,Pricebook2Id,Name,Estimation_List_Price__c,Dealer_Final_Price__c,QuotationChange__c,MainEngineWithoutMonitor__c,Interdepartmental__c,
Stocking_Price__c,Discount_Amount__c,Discount_Amount_Calculate__c,Quote_Adjust_Amount__c,Quote_Adjust_Calculate__c,
Agency1__c,OCM_Agent1_Price__c,Agency1_Profit__c,Agency1_Profit_Rate__c,Quote_No__c,
Agency2__c,Agent1_Agent2_Price__c,Agency2_Profit__c,Agency2_Profit_Rate__c,
@@ -2558,6 +2570,12 @@
q.Quote_Comment__c = quo.Quote_Comment__c;
q.Installation_location__c = quo.Installation_location__c;
+
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
+ q.QuotationChange__c = quo.QuotationChange__c;
+ q.MainEngineWithoutMonitor__c = quo.MainEngineWithoutMonitor__c;
+ q.Interdepartmental__c = quo.Interdepartmental__c;
+ //SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
/*
if (hasType3Machine) {
q.Installation_location__c = '';
--
Gitblit v1.9.1