From cc266a1e4080bb3ecc47ea4a202dd549545111e1 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期六, 29 四月 2023 16:10:52 +0800
Subject: [PATCH] 贸易合规20230429
---
force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
index 55e2639..37c4239 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
@@ -52,6 +52,7 @@
+ ', Campaign__r.IF_Approved__c' // 20220315 ljh add
+ ', Campaign__r.Meeting_Approved_No__r.Name' // 20220315 ljh add
+ ', Campaign__r.Approved_Status__c' // 20220315 ljh add
+ //+ ', Hospital__r.TradeComplianceStatus__c' // 璐告槗鍚堣 you
+ ' FROM Rental_Apply__c'
+ ' WHERE Id=\'' + taId + '\'';
List<Rental_Apply__c> raList = (List<Rental_Apply__c>) Consum_ApplyUtil.withoutQueryList(rasql);
@@ -450,6 +451,8 @@
, demo_purpose2__c //1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱
, Follow_UP_Opp__r.Shipping_Finished_Day_Func__c //1822 yc 20211025 宸茶喘寰呰揣鐩殑锛屾柊鍝佸凡鏈夊彂璐ф棩涓嶈兘鍑哄簱
, next_action__c //1822 yc 20211108
+ ,AccDealerBlacklist__c//璐告槗鍚堣 you
+ ,EquipmentGuaranteeFlg__c//璐告槗鍚堣 you
, QIS_number__r.ReplaceDeliveryDate__c //1822 yc 20211108
FROM Rental_Apply__c
WHERE id =:taId
@@ -458,7 +461,11 @@
// 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
// if( RaTar.Campaign__r.Status == '鍙栨秷'){
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
- if( RaTar.Campaign__r.Status == '鍙栨秷' || RaTar.Campaign__r.Status == '鍙栨秷鐢宠涓�' ){
+ //璐告槗鍚堣 you
+ if(System.Label.TradeComplianceStatusFlagBP =='true' && RaTar.AccDealerBlacklist__c == '1' && RaTar.EquipmentGuaranteeFlg__c==false){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, System.Label.IFTradeComplianceAlertBP));
+ return false;
+ }else if( RaTar.Campaign__r.Status == '鍙栨秷' || RaTar.Campaign__r.Status == '鍙栨秷鐢宠涓�' ){
String tempS = '';
if(RaTar.Campaign__r.Status == '鍙栨秷'){
tempS = '宸插彇娑�';
@@ -1938,6 +1945,7 @@
ra.DeliverySlip__c = slip.Id;
ra.Delivery_Agency__c = parentObj.Delivery_Agency__c;
ra.Agency_Address_Id__c = addressId;
+ //ra.Outbound_TradeStatus__c = parentObj.Hospital__r.TradeComplianceStatus__c;//璐告槗鍚堣 you
// 20210624 ljh update SFDC-C448GR end
//20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.4 鍑哄簱鎴愬姛鏃讹紝鎶婃鏃剁偣鐨勫喅瑁佺紪鍙峰拰鍐宠鐘舵�佸啓鍒板喅瑁佺紪鍙凤紙鍑哄簱锛夊拰鍐宠鐘舵�侊紙鍑哄簱锛変笂
--
Gitblit v1.9.1