From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/classes/MainFixtureSelectController.cls | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/MainFixtureSelectController.cls b/force-app/main/default/classes/MainFixtureSelectController.cls
index b19d8ba..66417ab 100644
--- a/force-app/main/default/classes/MainFixtureSelectController.cls
+++ b/force-app/main/default/classes/MainFixtureSelectController.cls
@@ -141,7 +141,7 @@
public Set<String> benbuSet;
public Set<String> cunfangdiSet;
public static String wrapperStr{set;get;}
-
+ public String QueueNumber { set; get; } //鎺掗槦
public MainFixtureSelectController() {
//isNeedCheckEvent = true;
@@ -205,7 +205,10 @@
parentObj = parentObjs.get(0);
// 宸叉帓闃熺殑鎯呭喌涓嬶紝鍒濆鍖栨椂鍔犺浇鎺掗槦鐢婚潰
- if (sonObj.ExternalKey__c != null) {
+ // 20230610 ljh 鍒ゆ柇椤甸潰鏄剧ず start
+ QueueNumber = String.valueOf(sonObj.Queue_Number__c);
+ // if (sonObj.ExternalKey__c != null) {
+ if (String.isNotBlank(QueueNumber)) {
// QueuePageByAssetId鐨刄RL, 鍔犺浇鎺掗槦鐢婚潰鐢�
queueByAsset = '/apex/QueuePageByAssetId?parentId=' + parentObj.Id + '&isNotShow=' + true;
}
@@ -1378,9 +1381,11 @@
viewList[viewList.size() - 1].canEdit = false;
}
groupByTargetList.add(rsdObj);
-
// QueuePageByAssetId鐨刄RL, 鍔犺浇鎺掗槦鐢婚潰鐢�
- queueByAsset = '/apex/QueuePageByAssetId?parentId=' + rsdObj.Rental_Apply_Equipment_Set__c + '&isNotShow=' + true;
+ // 20230610 ljh 鍒ゆ柇椤甸潰鏄剧ず
+ if (String.isNotBlank(QueueNumber)) {
+ queueByAsset = '/apex/QueuePageByAssetId?parentId=' + rsdObj.Rental_Apply_Equipment_Set__c + '&isNotShow=' + true;
+ }
assetId = rsdObj.Asset__c;
rentalId = rsdObj.Rental_Apply_Equipment_Set__c;
modelNo = rsdObj.Fixture_Model_No_text__c;
--
Gitblit v1.9.1