From 6947068a02499b9d1022f9efca5bcf1bdd3f1c70 Mon Sep 17 00:00:00 2001
From: Denny Chen <chenbangcai@prec-tech.com>
Date: 星期一, 28 二月 2022 10:45:11 +0800
Subject: [PATCH] Note test
---
force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
index c97b2ca..73e0f76 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
@@ -48,6 +48,9 @@
+ ', Loaner_cancel_request__c'//20210707 SFDC-C448KZ you
+ ', Equipment_Type_F__c' //20210508 LJH ADD 1672
+ ', Wei_Assigned_Cnt__c' // 20210624 ljh add SFDC-C448GR start
+ + ', Campaign__c, Campaign__r.IF_Approved__c, Campaign__r.Meeting_Approved_No__c'
+ + ', Campaign__r.Meeting_Approved_No__r.ProcessState__c'
+ + ', Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c' //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗
+ ' FROM Rental_Apply__c'
+ ' WHERE Id=\'' + taId + '\'';
List<Rental_Apply__c> raList = (List<Rental_Apply__c>) Consum_ApplyUtil.withoutQueryList(rasql);
@@ -1211,6 +1214,7 @@
}
return true;
}
+
//20210519 ljh add 1829
// 鎵竴鎵寜閽�
public void scanAndMatch() {
@@ -1790,6 +1794,16 @@
return;
}
//20201209 ljh update end
+
+ //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗
+ if (String.isNotBlank(parentObj.Campaign__c) && parentObj.Campaign__r.IF_Approved__c) {
+ if (String.isBlank(parentObj.Campaign__r.Meeting_Approved_No__c)
+ || String.isBlank(parentObj.Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c)) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇ョ敵璇峰崟宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖,涓嶈兘鍙戣揣锛�'));
+ return;
+ }
+ }
+
// 鍒犻櫎link
if(!mainIdList.isEmpty()) {
Oly_TriggerHandler.bypass(AssetHandlerCheck.class.getName());
@@ -1817,6 +1831,12 @@
ra.Delivery_Agency__c = parentObj.Delivery_Agency__c;
ra.Agency_Address_Id__c = addressId;
// 20210624 ljh update SFDC-C448GR end
+
+ //20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.4 鍑哄簱鎴愬姛鏃讹紝鎶婃鏃剁偣鐨勫喅瑁佺紪鍙峰拰鍐宠鐘舵�佸啓鍒板喅瑁佺紪鍙凤紙鍑哄簱锛夊拰鍐宠鐘舵�侊紙鍑哄簱锛変笂
+ if (String.isNotBlank(parentObj.Campaign__c) && parentObj.Campaign__r.IF_Approved__c){
+ ra.ApprovedNo_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c;
+ ra.Approved_State_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__r.ProcessState__c;
+ }
FixtureUtil.withoutUpdate(new List<Rental_Apply__c> {ra});
}
// 鍚屽煄鏃惰嚜鍔ㄦ敹璐�
--
Gitblit v1.9.1