From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/MainFixtureSelectController.cls | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/MainFixtureSelectController.cls b/force-app/main/default/classes/MainFixtureSelectController.cls
index b19d8ba..a778064 100644
--- a/force-app/main/default/classes/MainFixtureSelectController.cls
+++ b/force-app/main/default/classes/MainFixtureSelectController.cls
@@ -213,7 +213,15 @@
bieCunFangDi = parentObj.Rental_Apply__r.Internal_asset_location_F__c;
pCunFangDi = bieCunFangDi;
// 鏈儴鍒濆鍊�
- bieBenBu = parentObj.Rental_Apply__r.Salesdepartment__c;
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 start
+ if (parentObj.Rental_Apply__r.Salesdepartment__c == '16.娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴') {
+ bieBenBu = '16.Solution鏈儴';
+ } else {
+ bieBenBu = parentObj.Rental_Apply__r.Salesdepartment__c;
+ }
+ //bieBenBu = parentObj.Rental_Apply__r.Salesdepartment__c;
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 end
+
/*if (String.isNotBlank(sonObj.QuenType__c) && String.isNotBlank(sonObj.Salesdepartment_before__c)) {
bieBenBu = sonObj.Salesdepartment_before__c;
} else {
@@ -1319,7 +1327,10 @@
//鍒湰閮�
if (String.isNotBlank(bieBenBu) && !bieBenBu.contains('鍏ㄩ儴')) {
// soql += ' and Salesdepartment__c = \'' + String.escapeSingleQuotes(bieBenBu) + '\'';
- List<String> bieBenBuList = bieBenBu.split(',');
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 start
+ //List<String> bieBenBuList = bieBenBu.split(',');
+ List<String> bieBenBuList = bieBenBu.replace('16.Solution鏈儴', '16.娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴').split(',');
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 end
soql += RentalFixtureSetAssignController.setSoql('Salesdepartment__c', bieBenBuList);
/*String benbuStr = '';
for (String benbu : bieBenBuList) {
@@ -2040,7 +2051,12 @@
applyObj.campaignType = campaignType;
obj = RentalFixtureSetAssignController.getdefultInfo(raesd,applyObj,bieCunFangDi);
// 鎺掗槦鍚庯紝榛樿鎺掗槦鍊奸渶瑕佸湪鐢婚潰绔樉绀� 鏈儴
- bieBenBu = obj.salesdepartments;
+
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 start
+ //bieBenBu = obj.salesdepartments;
+ bieBenBu = obj.salesdepartments.replace('16.娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴', '16.Solution鏈儴');
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 end
+
// 鎺掗槦鍚庯紝榛樿鎺掗槦鍊奸渶瑕佸湪鐢婚潰绔樉绀� 澶囧搧鍒嗙被
bieBeiPinFenLei = obj.equipmenttypes;
// 澶囧搧瀛樻斁鍦板拰浜у搧鍒嗙被榛樿鏄敵璇峰崟涓婄殑鏁版嵁锛屼笉鐢ㄧ壒鎰忚缃�
@@ -2051,7 +2067,12 @@
keyObj.productType = String.isBlank(bieChanPinFenLei)?'GI,SP':bieChanPinFenLei;
System.debug('bieBeiPinFenLei===========================' + bieBeiPinFenLei);
keyObj.equipmenttypes = bieBeiPinFenLei;
- keyObj.salesdepartments = bieBenBu;
+
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 start
+ //keyObj.salesdepartments = bieBenBu;
+ keyObj.salesdepartments = bieBenBu.replace('16.Solution鏈儴', '16.娑堝寲路鍛煎惛棰嗗煙瑙ｅ喅鏂规鏈儴');
+ // Modify by Liu 20220908 Solution鏈儴璇鹃瀵瑰簲 end
+
RentalFixtureSetAssignController.getsequencekeyList(keyObj);
obj = keyObj;
System.debug('obj.equipmenttypes===========================' + obj.equipmenttypes);
--
Gitblit v1.9.1