From cab42ace3a936a3c6f4e7ca56f747ccaccf760b6 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期四, 11 四月 2024 15:48:56 +0800
Subject: [PATCH] 123
---
force-app/main/default/classes/lexNewQuoteEntryController.cls | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/lexNewQuoteEntryController.cls b/force-app/main/default/classes/lexNewQuoteEntryController.cls
index 46726f3..00c5590 100644
--- a/force-app/main/default/classes/lexNewQuoteEntryController.cls
+++ b/force-app/main/default/classes/lexNewQuoteEntryController.cls
@@ -1614,6 +1614,9 @@
//chenjingwu DB202308355043 2023.8.25 start
,Category5__c
//chenjingwu DB202308355043 2023.8.25 end
+ //chenjingwu 20240411 start
+ ,ProductCategory__c
+ //chenjingwu 20240411 end
,Estimated_ConsumptionDueDate__c
//DB202312560765 you 鍚︽湁EndoRapid璧勮川妫�鏌� start
,IFEndoRapidFlag__c
@@ -1676,6 +1679,7 @@
//chenjingwu DB202308355043 2023.8.25 end
//chenjingwu 20240411 start
, 0
+ ,prd.ProductCategory__c
//chenjingwu 20240411 end
//fy DB202312538864 2024.02.02 start
,prd.LastbuyProductFLG__c
@@ -1708,6 +1712,7 @@
//chenjingwu DB202308355043 2023.8.25 end
//chenjingwu 20240411 start
, 0
+ ,prd.ProductCategory__c
//chenjingwu 20240411 end
//fy DB202312538864 2024.02.02 start
,prd.LastbuyProductFLG__c
@@ -1892,6 +1897,9 @@
//chenjingwu DB202308355043 2023.8.25 start
,Category5__c
//chenjingwu DB202308355043 2023.8.25 end
+ //chenjingwu 20240411 start
+ ,ProductCategory__c
+ //chenjingwu 20240411 end
,Estimated_ConsumptionDueDate__c
//DB202312560765 you 鍚︽湁EndoRapid璧勮川妫�鏌� start
,IFEndoRapidFlag__c
@@ -1937,6 +1945,7 @@
//chenjingwu DB202308355043 2023.8.25 end
//chenjingwu 20240411 start
, exYearList[l]
+ ,prd.ProductCategory__c
//chenjingwu 20240411 end
//fy DB202312538864 2024.02.02 start
,prd.LastbuyProductFLG__c
@@ -1966,6 +1975,7 @@
//chenjingwu DB202308355043 2023.8.25 end
//chenjingwu 20240411 start
, exYearList[l]
+ , prd.ProductCategory__c
//chenjingwu 20240411 end
//fy DB202312538864 2024.02.02 start
,prd.LastbuyProductFLG__c
@@ -2896,6 +2906,7 @@
// chenjingwu sp涓绘満绫诲瀷 20240318 start
public String SPAssistant;
public Boolean SPAssistantFlag;
+ public String ProductCategory;
// chenjingwu sp涓绘満绫诲瀷 20240318 end
// chenjingwu 3+2澶氬勾淇� 20240401 start
public String Learning_Community;
@@ -2921,6 +2932,7 @@
Category5 = qli.PricebookEntry.Product2.Category5__c;
//chenjingwu DB202308355043 2023.8.25 end
// chenjingwu SP涓绘満绫诲瀷 20240318 start
+ this.ProductCategory = qli.PricebookEntry.Product2.ProductCategory__c;
if(qli.PricebookEntry.Product2.ProductCategory__c == 'SP涓绘満'){
this.SPAssistantFlag = true;
}
@@ -2929,7 +2941,7 @@
if(qli.ExtendedWarrantyPeriod__c != null && qli.ExtendedWarrantyPeriod__c != 0){
this.Learning_Community = String.valueof(qli.ExtendedWarrantyPeriod__c);
}
- this.multiYearWarrantyList = [select Id,MultiOneYearWarrantyPrice__c,AmountWithheld__c from MultiYearWarranty__c where ProductName__c =: qli.PricebookEntry.Product2Id];
+ this.multiYearWarrantyList = [select Id,MultiOneYearWarrantyPrice__c,AmountWithheld__c,AgeLimit__c from MultiYearWarranty__c where ProductName__c =: qli.PricebookEntry.Product2Id];
Integer period = this.multiYearWarrantyList.size();
if(period > 0){
List<OptionTemplete> optionTempleteList = new List<OptionTemplete>();
@@ -3168,6 +3180,7 @@
//chenjingwu DB202308355043 2023.8.25 end
//chenjingwu 20240411 start
, Integer exYear
+ ,String ProductCategory
//chenjingwu 20240411 end
//fy DB202312538864 2024.02.02 start
,Boolean lastbuyProductFLG
@@ -3180,7 +3193,8 @@
pageObject = New QuoteLineItem();
pageObject.Quantity__c = Quantity;
//chenjingwu 20240411 start
- pageObject.ExtendedWarrantyPeriod__c = exYear;
+ this.Learning_Community = String.valueof(exYear);
+ this.ProductCategory = ProductCategory;
//chenjingwu 20240411 end
this.lineNo = i;
this.Asset_Model = Asset_Model;
--
Gitblit v1.9.1