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 | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/lexNewQuoteEntryController.cls b/force-app/main/default/classes/lexNewQuoteEntryController.cls
index 91c6c80..00c5590 100644
--- a/force-app/main/default/classes/lexNewQuoteEntryController.cls
+++ b/force-app/main/default/classes/lexNewQuoteEntryController.cls
@@ -231,7 +231,7 @@
// }
@AuraEnabled
- public static Map<String,Map<String,List<OptionTemplete>>> addOptions(List<String> idList){
+ public static Map<String,List<OptionTemplete>> addOptions(List<String> idList){
Map<String,Integer> intList = new Map<String,Integer>();
for(AggregateResult objAgr: [select ProductName__c,COUNT(Id) total from MultiYearWarranty__c where ProductName__c in:idList group by ProductName__c]){
intList.put((String)objAgr.get('ProductName__c'), (Integer)objAgr.get('total'));
@@ -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
@@ -1674,6 +1677,10 @@
//chenjingwu DB202308355043 2023.8.25 start
, prd.Category5__c
//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
,prd.whetherOldCode_PrePro__c
@@ -1703,6 +1710,10 @@
//chenjingwu DB202308355043 2023.8.25 start
, prd.Category5__c
//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
,prd.whetherOldCode_PrePro__c
@@ -1760,6 +1771,10 @@
List<string> xlslist = New list<string>();
List<string> codelist = New List<string>();
List<Integer> Quantitylist = New List<Integer>();
+ // chenjingwu 20240411 start
+ List<Integer> exYearList = New List<Integer>();
+ Integer xlsExYear;
+ // chenjingwu 20240411 end
//String str ;
Map<String, Integer> mp = new Map<String, Integer>();
@@ -1776,7 +1791,8 @@
system.debug('xlslist+++'+xlslist);
for (String s : xlslist) {
//odd number or even number
- if (math.mod(i, 2) != 0) {
+ // chenjingwu 20240411 start
+ if (math.mod(i, 3) == 1) {
system.debug('xlslist1+++'+s);
//odd number
if (s == '' || s == null) {
@@ -1790,7 +1806,7 @@
xlsQuantity = Integer.valueOf(s);
Quantitylist.add(xlsQuantity);
}
- } else {
+ } else if(math.mod(i, 3) == 0){
system.debug('xlslist2+++'+s);
//even number
if (s == '' || s == null) {
@@ -1804,6 +1820,20 @@
codelist.add(s);
xlscode = s;
}
+ }else if(math.mod(i, 3) == 2){
+ //even number
+ if (s == '' || s == null) {
+ errorflg = true;
+ errormessage = System.Label.Error_Message31;
+ activities = tmpactivities;
+ // pageArrange();
+ return errormessage+'---'+JSON.serialize(activities);
+ } else {
+ s = s.trim();
+ xlsExYear = Integer.valueOf(s);
+ exYearList.add(xlsExYear);
+ }
+ // chenjingwu 20240411 end
}
i++;
}
@@ -1822,8 +1852,9 @@
system.debug(j);
system.debug('xlscnt:::::' + xlscnt);
-
- if (codelist.size() == 0 || Quantitylist.size() == 0) {
+ // chenjingwu 20240411 start
+ if (codelist.size() == 0 || Quantitylist.size() == 0 || exYearList.size() == 0) {
+ // chenjingwu 20240411 end
activities = tmpactivities;
errorflg = true;
system.debug('codelist+++'+codelist);
@@ -1866,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
@@ -1909,6 +1943,10 @@
//chenjingwu DB202308355043 2023.8.25 start
, prd.Category5__c
//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
,prd.whetherOldCode_PrePro__c
@@ -1935,6 +1973,10 @@
//chenjingwu DB202308355043 2023.8.25 start
, prd.Category5__c
//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
,prd.whetherOldCode_PrePro__c
@@ -2864,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;
@@ -2889,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;
}
@@ -2897,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>();
@@ -3134,6 +3178,10 @@
//chenjingwu DB202308355043 2023.8.25 start
,String Category5
//chenjingwu DB202308355043 2023.8.25 end
+ //chenjingwu 20240411 start
+ , Integer exYear
+ ,String ProductCategory
+ //chenjingwu 20240411 end
//fy DB202312538864 2024.02.02 start
,Boolean lastbuyProductFLG
,Boolean whetherOldCode_PrePro
@@ -3144,6 +3192,10 @@
) {
pageObject = New QuoteLineItem();
pageObject.Quantity__c = Quantity;
+ //chenjingwu 20240411 start
+ this.Learning_Community = String.valueof(exYear);
+ this.ProductCategory = ProductCategory;
+ //chenjingwu 20240411 end
this.lineNo = i;
this.Asset_Model = Asset_Model;
this.Sales_Possibility = Sales_Possibility_c;
--
Gitblit v1.9.1