From 84cff51bab8955e8c6f4b5bb113100cdf4101cce Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 26 四月 2024 13:56:52 +0800
Subject: [PATCH] 123

---
 force-app/main/default/classes/MaintenanceUpdateProductHandler.cls |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/classes/MaintenanceUpdateProductHandler.cls b/force-app/main/default/classes/MaintenanceUpdateProductHandler.cls
index 74d49d1..4c3c21a 100644
--- a/force-app/main/default/classes/MaintenanceUpdateProductHandler.cls
+++ b/force-app/main/default/classes/MaintenanceUpdateProductHandler.cls
@@ -138,6 +138,9 @@
             //LJPH-C6A3DF 銆愬鎵樸�� 銆愰噸瑕併�戜骇鍝佷富鏁版嵁涓鍔犳湇鍔$敤浜у搧鍒嗙被 liuyan 20210831 Star
             query += ' ,Can_Repair__c , Service_Category1__c ,Service_Category2__c,Service_Category3__c,Service_Category4__c, Service_Category5__c,Service_Category6__c,Service_Category7__c ';
             //LJPH-C6A3DF 銆愬鎵樸�� 銆愰噸瑕併�戜骇鍝佷富鏁版嵁涓鍔犳湇鍔$敤浜у搧鍒嗙被 liuyan 20210831 End
+            // chenjingwu 3+2澶氬勾淇濅慨 20240226 start
+            query += ' ,MultiYearWarranty__c,AgeLimit__c,MultiOneYearWarrantyPrice__c,AmountWithheld__c';
+            // chenjingwu 3+2澶氬勾淇濅慨 20240226 end
             query += ' ,LastbuyProductFLG__c'; //kk lastbuy add 20240319
             query += ' from Maintenance_Product_Data_Details__c where Maintenance_Product_Data__r.Status__c =\'瀹屾垚\' ';
             query += ' and Maintenance_Product_Data__c in '+sqlTail;
@@ -154,7 +157,8 @@
                 Product2 product2 = new Product2();
                 // chenjingwu 3+2澶氬勾淇濅慨 20240226 start
                 MultiYearWarranty__c mu = new MultiYearWarranty__c();
-                if(mpdDetails.MultiYearWarranty__c != '' && mpdDetails.MultiYearWarranty__c != ''){
+                System.debug('chen=>' + mpdDetails);
+                if(String.isNotBlank(mpdDetails.MultiYearWarranty__c)){
                     muIdList.add(mpdDetails.MultiYearWarranty__c);
                 }
                 // chenjingwu 3+2澶氬勾淇濅慨 20240226 end
@@ -455,11 +459,12 @@
                     mu.AmountWithheld__c = mpdDetails.AmountWithheld__c;
                     mu.ProductName__c = mpdDetails.ProductsID__c;
                     muUPdate.add(mu);
+                }else{
+                    //璺熸柊鏍囪瘑
+                    product2.IsFromSAP__c = true;
+                    product2Update.add(product2); 
                 }
                 // chenjingwu 3+2澶氬勾淇濅慨 20240226 end
-                //璺熸柊鏍囪瘑
-                product2.IsFromSAP__c = true;
-                product2Update.add(product2); 
             }
             // chenjingwu 3+2澶氬勾淇濅慨 20240226 start
             if(muUPdate.size()>0 && muUPdate !=null ){

--
Gitblit v1.9.1