111

沙世明

2022-11-22 928399eceec50e3d37ea08669a12789a9410a9d2

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

@@ -58,6 +58,7 @@
        // 納入機器の情報を取得
        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   /*临时用*/,
@@ -71,9 +72,25 @@
                            // 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
        }