From b30c0938ab3ee4d90374d3e55df361eebe8b3d65 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期三, 24 四月 2024 10:57:35 +0800
Subject: [PATCH] 123

---
 force-app/main/default/classes/MaintenanceProductDataController.cls |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/classes/MaintenanceProductDataController.cls b/force-app/main/default/classes/MaintenanceProductDataController.cls
index e420bb5..6731d3e 100644
--- a/force-app/main/default/classes/MaintenanceProductDataController.cls
+++ b/force-app/main/default/classes/MaintenanceProductDataController.cls
@@ -539,7 +539,7 @@
                 // chenjingwu 3+2澶氬勾淇濅慨 20240417 start
                 exmpdDetailsRecordsMap = new Map<String,List<ExMpdDetailsInfo>>(); 
                 muCountMap = new Map<String,Integer>();
-                List<Maintenance_Product_Data_Details__c> exDetailList = [select Id,MultiYearWarranty__c,AgeLimit__c,AgeLimit_Old__c,MultiOneYearWarrantyPrice__c,MultiOneYearWarrantyPrice_Old__c,AmountWithheld__c,AmountWithheld_Old__c,ProductsID__c from Maintenance_Product_Data_Details__c where ProductsID__c in:idList and RecordTypeId = '012C50000000jefIAA'];
+                List<Maintenance_Product_Data_Details__c> exDetailList = [select Id,MultiYearWarranty__c,MultiYearWarranty__r.AgeLimit__c,MultiYearWarranty__r.MultiOneYearWarrantyPrice__c,MultiYearWarranty__r.AmountWithheld__c,AgeLimit__c,AgeLimit_Old__c,MultiOneYearWarrantyPrice__c,MultiOneYearWarrantyPrice_Old__c,AmountWithheld__c,AmountWithheld_Old__c,ProductsID__c,ProductsID__r.Name from Maintenance_Product_Data_Details__c where ProductsID__c in:idList and RecordTypeId = '012C50000000jefIAA'];
                 if(exDetailList.size() > 0){
                     for(String id: idList){
                         List<ExMpdDetailsInfo> exList = new List<ExMpdDetailsInfo>();
@@ -555,6 +555,7 @@
                 }
                 System.debug('chenjingwu=>' + muCountMap);
                 System.debug('chenjingwu=>' + exmpdDetailsRecordsMap);
+                System.debug('chenjingwu=>' + mpdDetailsRecords);
                 // chenjingwu 3+2澶氬勾淇濅慨   20240417 end
             } 
         }    
@@ -905,10 +906,11 @@
                         // chenjingwu 3+2澶氬勾淇濅慨 20240417 end
                         // chenjingwu 3+2澶氬勾淇濅慨 20240417 start 
                         muList = [select Id,AgeLimit__c,MultiOneYearWarrantyPrice__c,AmountWithheld__c,ProductName__r.Name,ProductName__c from MultiYearWarranty__c where ProductName__c in: idList order By ProductName__c];
+                        Integer str = 0;
                         for(MultiYearWarranty__c mu: muList){
                             Maintenance_Product_Data_Details__c insmpdd = new Maintenance_Product_Data_Details__c();
                             insmpdd.Maintenance_Product_Data__c = mpd_Name[0].id;
-                            insmpdd.Name = mpd_Name[0].Name + '-'+ str;
+                            insmpdd.Name = mpd_Name[0].Name + '-ex'+ str;
                             insmpdd.AgeLimit__c = mu.AgeLimit__c;
                             insmpdd.MultiYearWarranty__c = mu.Id;
                             insmpdd.MultiOneYearWarrantyPrice__c = mu.MultiOneYearWarrantyPrice__c;
@@ -920,14 +922,15 @@
                             insmpdd.AmountWithheld_Old__c = mu.AmountWithheld__c;
                             insmpdd.RecordTypeId = '012C50000000jefIAA';
                             exIntList.add(insmpdd);
-
+                            str++;
                         }
                     } else{
+                        Integer str = 0;
                         for(List<ExMpdDetailsInfo> li: exmpdDetailsRecordsMap.values()){
                             for(ExMpdDetailsInfo ex: li){
                                 Maintenance_Product_Data_Details__c InsAfterDel = new Maintenance_Product_Data_Details__c();
                                 InsAfterDel.Maintenance_Product_Data__c = mpd_Name[0].id;
-                                InsAfterDel.Name = mpd_Name[0].Name + '-'+ str;
+                                InsAfterDel.Name = mpd_Name[0].Name + '-ex'+ str;
                                 InsAfterDel.AgeLimit__c = ex.mpdrdd.AgeLimit__c;
                                 InsAfterDel.MultiYearWarranty__c = ex.mpdrdd.MultiYearWarranty__c;
                                 InsAfterDel.MultiOneYearWarrantyPrice__c = ex.mpdrdd.MultiOneYearWarrantyPrice__c;
@@ -939,6 +942,7 @@
                                 InsAfterDel.AmountWithheld_Old__c = ex.Prod.AmountWithheld__c;
                                 InsAfterDel.RecordTypeId = '012C50000000jefIAA';
                                 exIntList.add(InsAfterDel);
+                                str++;
                             }
                         }
                     }

--
Gitblit v1.9.1