From cb4bae31a02af72fea30e1a57c1d498eabef5d01 Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期四, 16 三月 2023 10:17:12 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/classes/NewQuoteIraiController.cls | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/NewQuoteIraiController.cls b/force-app/main/default/classes/NewQuoteIraiController.cls
index 510f981..a681f61 100644
--- a/force-app/main/default/classes/NewQuoteIraiController.cls
+++ b/force-app/main/default/classes/NewQuoteIraiController.cls
@@ -310,6 +310,15 @@
} else {
// 宸茬粡瀛樺湪鎶ヤ环
if (String.isNotBlank(oppquoid)) {
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start
+ Quote quo2 = new Quote();
+ List<Quote> quote = [select Id,Agency1__c,Agency2__c From Quote Where Id =:oppquoid];
+ if(quote.size()>0){
+ quo2=quote[0];
+ }
+ quo.Agency1_entrust__c = quo2.Agency1__c;
+ quo.Agency2_entrust__c = quo2.Agency2__c;
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end
// 鎶ヤ环鍟嗗搧鍙栧緱
// CHAN-BHNBX6 2019/11/20 START//fy lastbuy 20220310 PricebookEntry.Product2.LastbuyProductFLG__c
List<QuoteLineItem> qlis = [select id,PricebookEntry.Product2Id,PricebookEntry.Product2.LastbuyProductFLG__c,Quantity__c,CurrencyIsoCode,GuaranteePeriod__c from QuoteLineItem where QuoteId = :oppquoid];
@@ -426,6 +435,7 @@
[ SELECT Id,Name,Cancel_Decide__c,Agency_Hospital_Link__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,Agency1_entrust__c,cancelMultiyearInsurance__c,
Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Noteplus__c,Lead__c,Opportunity__c,
TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
+ Agency2_entrust__c,//DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy
Print_HP_Name__c,Account__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
, urgent__c //20230104 lt DB202212427301
FROM QuoteIrai__c Where Id =:quoId];
@@ -1022,7 +1032,7 @@
}
}
}
- System.debug('---lt123---descriptions---'+descriptions);
+ // System.debug('---lt123---descriptions---'+descriptions);
if (descriptions.size() <= 0) {
errorflg = true;
errorMessage = '娌℃湁瑕佸鎵樼殑浜у搧銆�';
@@ -1059,7 +1069,7 @@
}
i += 1;
}
- System.debug('---lt123---description---'+description);
+ // System.debug('---lt123---description---'+description);
//obsap 鏂板缁忛攢鍟�1瀛楁 fy start
if (!String.isBlank(quo.Agency1_entrust__c)) {
Account quoteAeName = [select Id,Name from Account where Id =:quo.Agency1_entrust__c];
@@ -1068,6 +1078,13 @@
descriptionsendEmailbody += '\r\n' + '绗竴缁忛攢鍟嗗悕绉�' + '锛�' + quoteAeName.Name;
//20230116 fy end
}
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start
+ if (!String.isBlank(quo.Agency2_entrust__c)) {
+ Account quoteAeName2 = [select Id,Name from Account where Id =:quo.Agency2_entrust__c];
+ description += '\r\n' + '绗簩缁忛攢鍟嗗悕绉�' + '锛�' + quoteAeName2.Name;
+ descriptionsendEmailbody += '\r\n' + '绗簩缁忛攢鍟嗗悕绉�' + '锛�' + quoteAeName2.Name;
+ }
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end
if (quo.QuoteProportion__c!=null) {
description += '\r\n' + '鎶ヤ环姣斾緥' + '锛�' + quo.QuoteProportion__c;
//20230116 fy start
@@ -1119,6 +1136,12 @@
descriptionsendEmailbody += '\r\n' + '绗竴缁忛攢鍟�' + '锛�' + baseUrl + '/' + quo.Agency1_entrust__c;
//20230116 fy end
}
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start
+ if (!String.isBlank(quo.Agency2_entrust__c)) {
+ description += '\r\n' + '绗簩缁忛攢鍟�' + '锛�' + baseUrl + '/' + quo.Agency2_entrust__c;
+ descriptionsendEmailbody += '\r\n' + '绗簩缁忛攢鍟�' + '锛�' + baseUrl + '/' + quo.Agency2_entrust__c;
+ }
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end
//SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
if (!String.isBlank(tenderid)&&!description.contains('鎷涙爣椤圭洰') ) {
description += '\r\n' + '鎷涙爣椤圭洰' + '锛�' + baseUrl + '/' + tenderid;
@@ -1304,7 +1327,7 @@
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
quo =[ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start cancelMultiyearInsurance__c,
Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,
- TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
+ TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,Agency2_entrust__c,//DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy
Print_HP_Name__c,Account__c,Agency_Hospital_Link__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
, urgent__c //20230104 lt DB202212427301
FROM QuoteIrai__c Where Id =:quoId];
@@ -1327,6 +1350,25 @@
if(String.isNotBlank(leadid)){
lea.Id = leadid;
lea.OfferToEntrust__c = 1;
+
+ //20230227 lt DB202302251962 start
+ Map<Date,String> lm = new Map<Date,String>();
+ for(OlympusCalendar__c oc:[SELECT Id,Date__c FROM OlympusCalendar__c WHERE Date__c =: Date.today()]){
+ lm.put(oc.Date__c,oc.Id);
+ }
+ String datestr =String.valueOf(Date.today());
+ String dt = lm.get(Date.valueOf(datestr.substring(0,10)));
+
+ List<Lead> leadlist = [select Id,FirstDate_Quote_Irai__c from Lead where Id = :leadid];
+ // System.debug('lt123鏃ユ湡1'+ leadlist[0].FirstDate_Quote_Irai__c);
+ // System.debug('lt123鏃ユ湡2'+ lea.FirstDate_Quote_Irai__c);
+ if(leadlist.size() > 0){
+ if(leadlist[0].FirstDate_Quote_Irai__c == null){
+ lea.FirstDate_Quote_Irai__c = dt;
+ }
+ }
+ //20230227 lt DB202302251962 end
+
update lea;
}
//XLIU-CHY4KW 20220907 lt end
@@ -1668,7 +1710,7 @@
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy Noteplus__c
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
qs = [select Id,Account__c,Agency_Hospital_Link__c,Name,IraiUser__c,IraiSubject__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,
- Preferential_Trading_Price__c,Discount__c,Pricing__c,Unit_Price__c,Offer_Amount__c,TOTAL__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
+ Preferential_Trading_Price__c,Discount__c,Pricing__c,Unit_Price__c,Offer_Amount__c,TOTAL__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,Agency2_entrust__c,//DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy
Contract__c,Print_HP_Name__c,Quote_Expiration_Date__c,Quote_Comment__c,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
, urgent__c //20230104 lt DB202212427301
From QuoteIrai__c Where Id =:quoId];
@@ -1697,6 +1739,9 @@
//obsap 鏂板缁忛攢鍟�1瀛楁 fy staty
q.Agency1_entrust__c = quo.Agency1_entrust__c;
//obsap 鏂板缁忛攢鍟�1瀛楁 fy staty
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start
+ q.Agency2_entrust__c = quo.Agency2_entrust__c;
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end
// SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
q.cancelMultiyearInsurance__c = quo.cancelMultiyearInsurance__c;
// SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
@@ -1738,7 +1783,7 @@
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
quo =[ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start cancelMultiyearInsurance__c,
Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,Headquarters__c,//DB202301106714 銆愭姤浠峰鎵樻敼鍠勩�慜BSAP閫氱煡閭欢鍙戦�侀偖绠变慨鏀� fy Headquarters__c
- TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
+ TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,Agency2_entrust__c,//DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy
Print_HP_Name__c,Account__c,Agency_Hospital_Link__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
, urgent__c //20230104 lt DB202212427301
FROM QuoteIrai__c Where Id =:q.Id];
--
Gitblit v1.9.1