From bfca7a84bec815da594f1d12558535ed06d2490b Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 13 九月 2022 09:57:32 +0800
Subject: [PATCH] 本地提交备份

---
 force-app/main/default/classes/SelectAssetExtension.cls |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/classes/SelectAssetExtension.cls b/force-app/main/default/classes/SelectAssetExtension.cls
index 318c74f..d81c101 100644
--- a/force-app/main/default/classes/SelectAssetExtension.cls
+++ b/force-app/main/default/classes/SelectAssetExtension.cls
@@ -64,7 +64,7 @@
                             Department_Name__c, Installation_Site__c, Posting_Date__c,
                             Asset_Owner__c,	Product2Id
                             // Gzw 20200826 淇濆瓨涓婁竴鏈熷悎鍚屼复鏃剁敤 start
-                            , Remarks__c
+                            , Remarks__c,MDM_Model_No__c
                             // Gzw 20200826 淇濆瓨涓婁竴鏈熷悎鍚屼复鏃剁敤 end
                             // fxk 2021/9/17 鐐规瀵硅薄涓存椂鐢� star
                             // , Freeze_sign__c
@@ -81,7 +81,7 @@
         this.selectedAsset = [SELECT Id, Name, Check_object__c, Maintenance_Contract__c, LastMContract__c, Asset__c FROM Maintenance_Contract_Asset__c WHERE Maintenance_Contract__c = :this.targetContractId];
         system.debug('selectedAsset==========>'+selectedAsset);
         //Maintenance_Contract_Asset_Estimate__c
-        this.selectedAsset2 = [SELECT Id, Name,Product_Manual__c, Check_object__c,Maintenance_Contract_Estimate__r.Maintenance_Contract__c,Asset__c,Asset__r.product2Id 
+        this.selectedAsset2 = [SELECT Id, Name,Product_Manual__c,Product_Manual__r.MDM_Model_No__c, Check_object__c,Maintenance_Contract_Estimate__r.Maintenance_Contract__c,Asset__c,Asset__r.product2Id 
         FROM Maintenance_Contract_Asset_Estimate__c WHERE Maintenance_Contract_Estimate__r.Maintenance_Contract__c = :this.targetContractId];
         system.debug('selectedAsset2==========>'+selectedAsset2);
         //SELECT Id, Name, Check_object__c, Asset__c FROM Maintenance_Contract_Asset_Estimate__c WHERE 	Maintenance_Contract_Estimate__r.Maintenance_Contract__c = 'a0H1m000002shhL'
@@ -106,7 +106,7 @@
                 }
             }
             for(Maintenance_Contract_Asset_Estimate__c selectedLocal : this.selectedAsset2){
-                if(local.Product2Id == selectedLocal.Product_Manual__c){
+                if(local.MDM_Model_No__c == selectedLocal.Product_Manual__r.MDM_Model_No__c){
                     //local.TransferToOther__c = true;
                     local.TransferToOther__c = selectedLocal.Check_object__c;
                     system.debug('TransferToOther__c============>'+local.TransferToOther__c);

--
Gitblit v1.9.1