From ea9d8eb5787c4a9d86a7231f29489dc9d42b43c7 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期三, 24 四月 2024 13:19:30 +0800
Subject: [PATCH] 123
---
force-app/main/default/classes/MaintenanceProductDataController.cls | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/MaintenanceProductDataController.cls b/force-app/main/default/classes/MaintenanceProductDataController.cls
index e8525c9..8b2dcd0 100644
--- a/force-app/main/default/classes/MaintenanceProductDataController.cls
+++ b/force-app/main/default/classes/MaintenanceProductDataController.cls
@@ -437,7 +437,7 @@
for (Integer i=0;i<column_Old.size();i++) {
mpdsoql += ',' + column_Old[i];
}
- mpdsoql += ' from Maintenance_Product_Data_Details__c where Maintenance_Product_Data__c = \''+id+'\'';
+ mpdsoql += ' from Maintenance_Product_Data_Details__c where RecordTypeId != \'012C50000000jefIAA\' and Maintenance_Product_Data__c = \''+id+'\'';
// 閬告姙娓堛伩銇槑缁嗐倰鍙栧緱
mpdDetailsSelected = Database.query(mpdsoql);
for (Maintenance_Product_Data_Details__c mpdd1 : mpdDetailsSelected) {
@@ -553,8 +553,10 @@
exmpdDetailsRecordsMap.put(id,exList);
}
}
+ System.debug('chenjingwu=>' + idList);
System.debug('chenjingwu=>' + muCountMap);
System.debug('chenjingwu=>' + exmpdDetailsRecordsMap);
+ System.debug('chenjingwu=>' + mpdDetailsRecords);
// chenjingwu 3+2澶氬勾淇濅慨 20240417 end
}
}
@@ -649,7 +651,7 @@
//鏇存柊
mpd_Name = [SELECT id,Name FROM Maintenance_Product_Data__c WHERE id =:id];
}
- List<Maintenance_Product_Data_Details__c> mpdd_Name = [SELECT id,Name FROM Maintenance_Product_Data_Details__c where Maintenance_Product_Data__c =:id order by Name desc Limit 1 ];
+ List<Maintenance_Product_Data_Details__c> mpdd_Name = [SELECT id,Name FROM Maintenance_Product_Data_Details__c where Maintenance_Product_Data__c =:id and NOT Name like '%ex%' order by Name desc Limit 1 ];
if(mpdd_Name.size()>0){
String[] nameI= mpdd_Name[0].Name.split('-');
i = Integer.valueOf(nameI[1])+1;
@@ -914,6 +916,7 @@
insmpdd.MultiYearWarranty__c = mu.Id;
insmpdd.MultiOneYearWarrantyPrice__c = mu.MultiOneYearWarrantyPrice__c;
insmpdd.AmountWithheld__c = mu.AmountWithheld__c;
+ insmpdd.ProductsID__c = mu.ProductName__c;
insmpdd.AgeLimit_Old__c = mu.AgeLimit__c;
@@ -934,7 +937,7 @@
InsAfterDel.MultiYearWarranty__c = ex.mpdrdd.MultiYearWarranty__c;
InsAfterDel.MultiOneYearWarrantyPrice__c = ex.mpdrdd.MultiOneYearWarrantyPrice__c;
InsAfterDel.AmountWithheld__c = ex.mpdrdd.AmountWithheld__c;
-
+ InsAfterDel.ProductsID__c = ex.mpdrdd.ProductsID__c;
InsAfterDel.AgeLimit_Old__c = ex.Prod.AgeLimit__c;
InsAfterDel.MultiOneYearWarrantyPrice_Old__c = ex.Prod.MultiOneYearWarrantyPrice__c;
--
Gitblit v1.9.1