From 12b86d4555e04a5965bce66a98fff6e30dd643a4 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 19 四月 2024 10:53:34 +0800
Subject: [PATCH] 123
---
force-app/main/default/classes/MaintenanceProductDataController.cls | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/MaintenanceProductDataController.cls b/force-app/main/default/classes/MaintenanceProductDataController.cls
index 0483fd3..06ba19d 100644
--- a/force-app/main/default/classes/MaintenanceProductDataController.cls
+++ b/force-app/main/default/classes/MaintenanceProductDataController.cls
@@ -49,6 +49,11 @@
public String soql {get;set;}
//---
+ // chenjingwu 3+2澶氬勾淇濅慨 start
+ public List<MultiYearWarranty__c> muList { get; set; }
+ public Map<String,List<MultiYearWarranty__c>> muMap { get; set; }
+ // chenjingwu 3+2澶氬勾淇濅慨 end
+
/*****************鐢婚潰琛ㄧずBean******************/
//private List<MaintenanceProductDataDetailsInfo> mpdDerdetailsRecords = new List<MaintenanceProductDataDetailsInfo>();
public List<MaintenanceProductDataDetailsInfo> mpdDetailsRecordsView { get; set; }//椤甸潰鐨勬槑缁�
@@ -68,7 +73,9 @@
//LJPH-C6A3DF 銆愬鎵樸�� 銆愰噸瑕併�戜骇鍝佷富鏁版嵁涓鍔犳湇鍔＄敤浜у搧鍒嗙被 liuyan 20210908 Star
public List<Maintenance_Product_Data_Details__c> RepairInfo {
get {
- return [select id,Service_Category6__c,Service_Category7__c FROM Maintenance_Product_Data_Details__c where Default_Fixture_Arrival_Product__c = '' LIMIT 1 ];
+ // 20231103 闄堜含姝� sitbug瀵瑰簲 Start
+ return [select id,Service_Category6__c,Service_Category7__c FROM Maintenance_Product_Data_Details__c where Default_Fixture_Arrival_Product__c = '' and Service_Category6__c = null and Service_Category7__c = null LIMIT 1 ];
+ // 20231103 闄堜含姝� sitbug瀵瑰簲 End
}
}
//LJPH-C6A3DF 銆愬鎵樸�� 銆愰噸瑕併�戜骇鍝佷富鏁版嵁涓鍔犳湇鍔＄敤浜у搧鍒嗙被 liuyan 20210908 End
@@ -83,7 +90,9 @@
public Boolean editDelCommitBtnDisabled {get; private set;}
public Boolean saveBtnDisabled { get; private set; }
//public Boolean sorderBtnDisabled { get; private set; }
- private List<Attachment> attachmentinfo = new List<Attachment>();
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ private List<ContentDocument> attachmentinfo = new List<ContentDocument>();
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
//-----------
private void initStandardController(){
@@ -160,6 +169,7 @@
// 20221020 ljh SWAG-CJ98AJ start
mpdDetailsRecordsView[i].mpdrdd.suitDepartment__c = mpdDetailsRecordsView[i].Prod.suitDepartment__c;
// 20221020 ljh SWAG-CJ98AJ end
+ mpdDetailsRecordsView[i].mpdrdd.LastbuyProductFLG__c = mpdDetailsRecordsView[i].Prod.LastbuyProductFLG__c;//kk lastbuy add 20240329 add
}
if(RecordTypeName.equals('GuranteeMain')){
Integer Entend_gurantee_period_all = mpdDetailsRecordsView[i].Prod.Entend_gurantee_period_all__c.intValue();
@@ -311,13 +321,13 @@
if(profileId.equals(System.Label.ProfileId_EquCenAdminPic)){
profileName = '2B3';
}
- if(profileId.equals('00e10000000xno4AAA')){
+ if(profileId.equals(System.Label.profileId_2F3)){//niwu -00eC600000004OXIAY
profileName = '2F3';//鏈嶅姟
}
- if(profileId.equals('00e10000000xyViAAI')){
+ if(profileId.equals(System.Label.ProfileId_2M5)){
profileName = '2M5';//浜у搧
}
- if (profileId.equals('00e10000000xno9AAA')) {
+ if (profileId.equals(System.Label.ProfileId_2F4)) { //niwu - 00eC600000004OZIAY
profileName = '2F4';//鎶�鏈帹杩涢儴
}
if(String.isBlank(id)&&String.isBlank(RecordTypeName)){
@@ -352,6 +362,8 @@
fsTemp += 'YY';
fsTempOld += 'YY';
}*/
+ System.debug('RecordTypeName>>>>>>> ' + RecordTypeName);
+ System.debug('profileName>>>>>>> ' + profileName);
if(RecordTypeName.equals('GuranteeMain')&&profileName.equals('2M5')){
fsTemp += 'FW';
fsTempOld += 'FW';
@@ -414,6 +426,9 @@
}else{
List<Maintenance_Product_Data_Details__c> mpdDetailsSelected = new List<Maintenance_Product_Data_Details__c>();
String mpdsoql = 'select Id ,Name,GuranteeTypeP__c,ProductCode_Ext__c ,ProductsID__c,Maintenance_Product_Data__c,ProductsID__r.Name ';
+ //kk lastbuy add 20240328 start
+ mpdsoql += ' ,ProductsID__r.LastbuyProductFLG__c,LastbuyProductFLG__c';
+ //kk lastbuy add 20240328 end
for (Integer i=0;i<column.size();i++) {
mpdsoql += ',' + column[i];
}
@@ -474,8 +489,18 @@
mpdPrice.mpded.Intra_Trade_Service_RMB_Old__c = null;
}
}
- //闄勪欢
- attachmentinfo =[SELECT Id, Name,OwnerId FROM Attachment WHERE parentid =:id ];
+ //闄勪欢(lightning)
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ List<ContentDocumentLink> cdlList = [SELECT ContentDocumentId
+ FROM ContentDocumentLink
+ WHERE LinkedEntityId = :id];
+ List<ID> fileIDs = new List<ID>();
+ for (ContentDocumentLink docLink : cdlList) {
+ fileIDs.add(docLink.ContentDocumentId);
+ }
+ attachmentinfo=[SELECT Title,OwnerId,ContentModifiedDate from ContentDocument WHERE id IN :fileIDs];
+ // attachmentinfo =[SELECT Id, Name,OwnerId FROM Attachment WHERE parentid =:id ];
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
if(attachmentinfo.size()>0){
for (Integer i = 0; i < attachmentinfo.size(); i++) {
attachmentRecoeds.add(new MaintenanceProductDataDetailsInfo(attachmentinfo[i]));
@@ -506,6 +531,7 @@
}
// 妫�绱�
public void searchMaintenanceProductDataDetails() {
+ System.debug('enter searchMaintenanceProductDataDetails');
Map<String, String> selectedIdMap = new Map<String, String>();
Map<String,MaintenanceProductDataDetailsInfo> midMaprecord = new Map<String,MaintenanceProductDataDetailsInfo>();
mpdDetailsRecordsView = new List<MaintenanceProductDataDetailsInfo>();
@@ -516,7 +542,9 @@
//ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '=====soql:'+soql));
size =Integer.valueOf(System.Label.mpddetLimitsize);
initStandardController();
- product2Selected = Database.query(soql);
+ product2Selected = Database.query(soql);
+ System.debug('product2Selected size = ' + product2Selected.size());
+ System.debug('product2Selected = ' + product2Selected);
for (Integer i = 0; i < product2Selected.size(); i++) {
midMaprecord.put(product2Selected[i].Id, new MaintenanceProductDataDetailsInfo(product2Selected[i]));
}
@@ -533,7 +561,29 @@
// 鏄剧ず鏁版嵁鏉℃暟淇℃伅
makeMessage();
}
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ public void refreshFile(){
+ if(String.isBlank(id)){
+ return;
+ }
+ attachmentRecoeds = new List<MaintenanceProductDataDetailsInfo>();
+ List<ContentDocumentLink> cdlList = [SELECT ContentDocumentId
+ FROM ContentDocumentLink
+ WHERE LinkedEntityId = :id];
+ List<ID> fileIDs = new List<ID>();
+ for (ContentDocumentLink docLink : cdlList) {
+ fileIDs.add(docLink.ContentDocumentId);
+ }
+ attachmentinfo=[SELECT Title,OwnerId,ContentModifiedDate from ContentDocument WHERE id IN :fileIDs];
+ // attachmentinfo =[SELECT Id, Name,OwnerId FROM Attachment WHERE parentid =:id ];
+ if(attachmentinfo.size()>0){
+ for (Integer i = 0; i < attachmentinfo.size(); i++) {
+ attachmentRecoeds.add(new MaintenanceProductDataDetailsInfo(attachmentinfo[i]));
+ }
+ }
+ }
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
public PageReference save() {
Integer FLG = 0;
Integer Count = 0;
@@ -605,6 +655,9 @@
//20200618 绫诲瀷涓�鑷翠笉涓�鑷翠笉鑳戒繚瀛� add start
Boolean isWarning = false;
String contentWarning = '';
+ // chenjingwu 3+2澶氬勾淇濅慨 20240417 start
+ List<String> idList = new List<String>();
+ // chenjingwu 3+2澶氬勾淇濅慨 20240417 end
for (MaintenanceProductDataDetailsInfo ass : mpdDetailsRecordsView) {
Roll = Roll+1;
if(ass.check == true){
@@ -618,6 +671,9 @@
InsAfterDel.Maintenance_Product_Data__c = mpd_Name[0].id;
InsAfterDel.Name = mpd_Name[0].Name + '-'+ str;
InsAfterDel.ProductsID__c = ass.Prod.id;
+ // chenjingwu 3+2澶氬勾淇濅慨 20240417 start
+ idList.add(ass.Prod.id);
+ // chenjingwu 3+2澶氬勾淇濅慨 20240417 end
switch on RecordTypeName {
when 'ImportantProduct'{
//InsAfterDel.RecordTypeName__c = 'ImportantProduct';
@@ -627,12 +683,14 @@
InsAfterDel.Dealer_special_Object__c = ass.mpdrdd.Dealer_special_Object__c;
InsAfterDel.Key_product_147P__c = ass.mpdrdd.Key_product_147P__c;
InsAfterDel.Important_Endopartner_product__c = ass.mpdrdd.Important_Endopartner_product__c;
+ InsAfterDel.LastbuyProductFLG__c = ass.mpdrdd.LastbuyProductFLG__c; //kk lastbuy 20240319 add
//old鏁版嵁
//InsAfterDel.Tier1_Category_Old__c = ass.Prod.Tier1_Category__c;
InsAfterDel.ENG_DeaerProFlag_Old__c = ass.Prod.ENG_DeaerProFlag__c;
InsAfterDel.Dealer_special_Object_Old__c = ass.Prod.Dealer_special_Object__c;
InsAfterDel.Key_product_147P_Old__c = ass.Prod.Key_product_147P__c;
InsAfterDel.Important_Endopartner_product_Old__c = ass.Prod.Important_Endopartner_product__c;
+ InsAfterDel.LastbuyProductFLG_Old__c = ass.Prod.LastbuyProductFLG__c; //kk lastbuy 20240319 add
// FY23淇敼 WLIG-CFV4AV 閲嶇偣浜у搧缁存姢锛堟柊锛塻tart
InsAfterDel.Key_product_155P__c = ass.mpdrdd.Key_product_155P__c;
@@ -809,6 +867,19 @@
Ins.add(InsAfterDel);
}
}
+ // chenjingwu 3+2澶氬勾淇濅慨 20240417 start
+ muList = [select Id,AgeLimit__c,MultiOneYearWarrantyPrice__c,AmountWithheld__c,ProductName__c from MultiYearWarranty__c where ProductName__c in: idList order By ProductName__c];
+ for(String id: idList){
+ List<MultiYearWarranty__c> mus = new List<MultiYearWarranty__c>();
+ for(MultiYearWarranty__c mu: muList){
+ if(id == mu.ProductName__c){
+ mus.add(mu);
+ }
+ }
+ mus.add(new MultiYearWarranty__c({ProductName__c:id}));
+ muMap.put(id,mus);
+ }
+ // chenjingwu 3+2澶氬勾淇濅慨 20240417 end
if(isWarning){
return null;
}else{
@@ -876,6 +947,8 @@
// 20221020 ljh SWAG-CJ98AJ start
upMpd.suitDepartment__c = ass.mpded.suitDepartment__c;
// 20221020 ljh SWAG-CJ98AJ end
+ //kk lastbuy add 20240329 start
+ upMpd.LastbuyProductFLG__c = ass.mpded.LastbuyProductFLG__c;
}
when 'GuranteeMain'{
upMpd.Entend_gurantee_period__c=ass.mpded.Entend_gurantee_period__c;
@@ -1086,11 +1159,21 @@
return ref;
}
//涓婁紶闄勪欢
+ // 20231103 闄堜含姝� Lightning鏂囦欢淇敼 Start
public PageReference FilesUpload(){
PageReference ref = new Pagereference('/p/attach/NoteAttach?pid='+id+'&retURL=%2F' + '/apex/MaintenanceProductData?id=' +id);
ref.setRedirect(true);
return ref;
}
+ public PageReference FilesUploadLightning(){
+ // PageReference ref = new Pagereference('/p/attach/NoteAttach?pid='+id+'&retURL=%2F' + '/apex/MaintenanceProductData?id=' +id);
+ // ref.setRedirect(true);
+ // return ref;
+ PageReference ref = new Pagereference('/lightning/n/LexUploadPage?0.recordId='+id+'');
+ ref.setRedirect(true);
+ return ref;
+ }
+ // 20231103 闄堜含姝� Lightning鏂囦欢淇敼 Start
// 鎻愪氦鎸夐挳
public PageReference Submitmpd() {
//List<Maintenance_Product_Data__c> qs = New List<Maintenance_Product_Data__c>();
@@ -1176,7 +1259,10 @@
public PageReference returnMpdPage(){
PageReference ref;
if(String.isBlank(id)){
- ref = new Pagereference(ApexPages.currentPage().getParameters().get('retURL'));
+ // 20231103 闄堜含姝� Lightning鏂囦欢淇敼 Start
+ // ref = new Pagereference(ApexPages.currentPage().getParameters().get('retURL'));
+ ref = new Pagereference('/lightning/o/Maintenance_Product_Data__c/list?filterName=Recent');
+ // 20231103 闄堜含姝� Lightning鏂囦欢淇敼 End
}else{
ref = new Pagereference('/'+id);
}
@@ -1195,7 +1281,7 @@
}
}*/
- String soql = 'select Id ,ProductCode_Ext__c,Name ';
+ String soql = 'select Id ,ProductCode_Ext__c,Name,LastbuyProductFLG__c ';
if(!RecordTypeName.equals('GuranteeMain') && !RecordTypeName.equals('GuranteePrice') ){
for (Integer i=0;i<column.size();i++) {soql += ',' + column[i];
}
@@ -1241,7 +1327,7 @@
soql += ' AND (GuranteeType__c like \'%'+ String.escapeSingleQuotes(GuranteeType.replaceAll('%', '\\%')) + '%\')';
}
soql += ' Limit 400';
- //System.debug('soql +++++++++++ ' + soql );
+ System.debug('soql +++++++++++ ' + soql );
return soql;
}
// 鏄剧ず鏁版嵁鏉℃暟淇℃伅
@@ -1351,7 +1437,9 @@
public Boolean canSelect { get; set; }
public Product2 Prod { get; set; }
public Maintenance_Product_Data_Details__c mpdrdd {get; set;}
- public Attachment Concc { get; set; }
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ public ContentDocument Concc { get; set; }
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
public MaintenanceProductDataDetailsInfo(Maintenance_Product_Data_Details__c e) {
check = true;
@@ -1368,9 +1456,11 @@
canSelect = true;
}
//闄勪欢
- public MaintenanceProductDataDetailsInfo(Attachment e) {
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 Start
+ public MaintenanceProductDataDetailsInfo(ContentDocument e) {
Concc = e;
}
+ // 20231103 chenjingwu Lightning鏂囦欢淇敼 End
}
class MpdDetailsInfo {
public Boolean check { get; set; }
--
Gitblit v1.9.1