From a48ed9f335db52a433a2b343ff9636a28ee8a97f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期四, 10 三月 2022 18:53:59 +0800
Subject: [PATCH] New xml file for PIPL20220310
---
force-app/main/default/classes/RentalApplyWebService.cls | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplyWebService.cls b/force-app/main/default/classes/RentalApplyWebService.cls
index 24ff3ab..9bde9c4 100644
--- a/force-app/main/default/classes/RentalApplyWebService.cls
+++ b/force-app/main/default/classes/RentalApplyWebService.cls
@@ -411,6 +411,7 @@
return '鏈慨鐞嗗綊杩樻棩涓嶄负绌猴紝涓嶈兘鍋氬嚭搴撴寚绀�';
}
//*************************Insert 20160826 SWAG-AD59Z6 瓒欏境鑺� End***************************//
+
//1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� start
if(String.isNotBlank(ra.Cross_Region_Assign__c)){
String soql = 'select Id, Name,Rental_Apply__c,Internal_asset_location_before__c';
@@ -430,11 +431,15 @@
}
//1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� end
// 20220211 ljh add 澶囧搧FY23璇鹃01 start
- /*AggregateResult[] resultsET = [SELECT Rental_Start_Date__c,count(Id) cnt
+ AggregateResult[] resultsRas = [SELECT Rental_Start_Date__c,count(Id) cnt
FROM Rental_Apply_Equipment_Set__c
- WHERE Rental_Apply__c = :rentalApplyId
- Cancel_Select__c = false
- group by Rental_Start_Date__c];*/
+ WHERE Rental_Apply__c = :rentalApplyId
+ AND Cancel_Select__c = false
+ group by Rental_Start_Date__c];
+ If(resultsRas.size() > 1){
+ returnStr = '鎵�鏈変竴瑙堝鍝侀璁″嚭璐ф棩搴斾竴鑷达紝涓嶄竴鑷翠笉鑳藉仛鍑哄簱鎸囩ず';
+ return returnStr;
+ }
// 20220211 ljh add 澶囧搧FY23璇鹃01 end
//bp2 // 澶囧搧鍊熷嚭鍘嗗彶鍙栧緱
@@ -1154,7 +1159,7 @@
// }
// 鍒嗛厤楠岃瘉
Webservice static String AssignBtn(String Rid){
- List<Rental_Apply__c> raList = [select demo_purpose2__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,repair__r.Repair_Final_Inspection_Date__c,repair__r.Return_Without_Repair_Date__c,Campaign__c,Campaign__r.Status,Repair__r.Repair_Shipped_Date__c from Rental_Apply__c where id = :Rid];
+ List<Rental_Apply__c> raList = [select demo_purpose2__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,repair__r.Repair_Final_Inspection_Date__c,repair__r.Return_Without_Repair_Date__c,Campaign__c,Campaign__r.Status,Repair__r.Repair_Shipped_Date__c,Campaign__r.IF_Approved__c,Campaign__r.Meeting_Approved_No__c from Rental_Apply__c where id = :Rid];
// 20210803 ljh SFDC-C5HDC7 add 鏌ヨ娣诲姞 Campaign__c,Campaign__r.Status,Repair__r.Repair_Shipped_Date__c
if(raList.size()>0){
Rental_Apply__c Ra = raList[0];
@@ -1176,6 +1181,9 @@
}else if(Ra.demo_purpose2__c=='绱㈣禂QIS' && Ra.next_action__c=='鏃犲伩鏇存崲' && Ra.QIS_number__r.ReplaceDeliveryDate__c!= null){
return '绱㈣禂QIS鐩殑锛孮IS宸叉湁鏂板搧鍙戣揣鏃ワ紝涓嶅彲鍒嗛厤';
}//1822 yc 20211108 end
+ else if(Ra.Campaign__r.IF_Approved__c && Ra.Campaign__r.Meeting_Approved_No__c == null){
+ return '宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖';
+ }//20220301 sx obpm淇敼
else{
return 'Fin';
}
@@ -1609,6 +1617,9 @@
//搴旇涓嶄細鍒拌繖閲�
return '娌℃湁鍙互鍑哄簱鎸囩ず鐨勪竴瑙�';
}
+
+
+
}
String soql = 'SELECT Id'
+ ' FROM Rental_Apply_Equipment_Set__c '
@@ -1688,6 +1699,7 @@
if (!raess.isEmpty()) {
update raess;
}
+
return '鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�';
} else {
Database.rollback(sp);
--
Gitblit v1.9.1