贸易合规20230429

游畅

2023-04-29 cc266a1e4080bb3ecc47ea4a202dd549545111e1

 force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls

@@ -205,6 +205,8 @@
        Rental_Apply__c RaTar = [select Campaign__c,Repair__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c,demo_purpose2__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,
                                                Campaign__r.Status,repair__r.Return_Without_Repair_Date__c,Repair__r.Repair_Final_Inspection_Date__c,Repair__r.Repair_Shipped_Date__c,
                                                Campaign__r.IF_Approved__c, Campaign__r.Meeting_Approved_No__c,
                                                AccDealerBlacklist__c,//贸易合规 you
                                                EquipmentGuaranteeFlg__c,//贸易合规 you
                                                Campaign__r.Approved_Status__c      //20220315 sx obpm备品决裁状态相关修改
                                            from Rental_Apply__c 
                                            where id=:Raid];
@@ -212,7 +214,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 null; 
        }else if( RaTar.Campaign__r.Status == '取消' || RaTar.Campaign__r.Status == '取消申请中' ){
            String tempS = '';
            if(RaTar.Campaign__r.Status == '取消'){
                tempS = '已取消';