From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111
---
force-app/main/default/classes/SelectAssetExtension.cls | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/SelectAssetExtension.cls b/force-app/main/default/classes/SelectAssetExtension.cls
index d81c101..2a1b9b1 100644
--- a/force-app/main/default/classes/SelectAssetExtension.cls
+++ b/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
}
--
Gitblit v1.9.1