gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

 force-app/main/default/classes/SelectAssetExtension.cls

@@ -58,22 +58,39 @@
        // 納入機器の情報を取得
        if ( this.targetHospitalId == null || ( this.targetHospitalId.length() != 15 && this.targetHospitalId.length() != 18)) {
            //this.assetRecords  = new List<Asset>();
            system.debug('assetRecords123456789==' + assetRecords);
        } else {
            // HWAG-BHD66X start
            assetRecords = [SELECT Id, Name, CheckBox__c, SerialNumber,TransferToOther__c   /*临时用*/,
                            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
                            // fxk 2021/9/17 点检对象临时用 end
                            FROM Asset
                            WHERE Hospital__c = :this.targetHospitalId
                                                // XLIU-CK46FR zyh start
                                                AND Status != '廃棄' AND Status != '待报废' 
                                                AND (Competitor_Name__c = '奥林巴斯' OR Competitor_Name__c = '' OR Competitor_Name__c = '其他')
                                                AND Category1__c != 'ET'
                                                AND (Category1__c != 'SP' OR Category2__c != '附属品' )
                                                AND (Category1__c != 'GI' OR Category2__c != '附属品' OR Category4__c != 'OER' )
                                                AND (Category1__c != 'GI' OR Category2__c != '其他' )
                                                AND (Category1__c != 'ENG' OR Category2__c != '附属品' )
                                                AND (Category1__c != 'ENG' OR Category2__c != '耗材' )
                                                // AND (Category1__c != 'SP' OR Category2__c != '附属品' )
                                                // AND (Category1__c != 'GI' OR (Category2__c != '附属品' OR Category2__c != '其他') )
                                                // AND (Category1__c != 'ENG' OR (Category2__c != '附属品' OR Category2__c != '耗材') )
                                                // AND AssetMark__c != '耗材' 
                                                // XLIU-CK46FR zyh end
                                                AND ( AssetMark__c != '耗材' OR Product2.Family != 'ET' )
                                                ORDER BY Department_Name__c, Posting_Date__c, SerialNumber];
            system.debug('assetRecords123456789' + assetRecords);
                                                ORDER BY Department_Name__c, Posting_Date__c, SerialNumber
                                                ];
            // system.debug('assetRecords123456789' + assetRecords);
            system.debug('assetRecords123456789' + assetRecords.size());
            // HWAG-BHD66X end
        }

@@ -81,7 +98,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 +123,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);