游畅
2023-04-29 cc266a1e4080bb3ecc47ea4a202dd549545111e1
force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls
@@ -186,13 +186,29 @@
                                        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];
        if( RaTar.Campaign__r.Status == '取消'){
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '学会已取消,不能继续操作了'));
                return null;
        // 20230215 ljh DB202301265636 学会取消申请也拦截 start
        // if( RaTar.Campaign__r.Status == '取消'){
        //         ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '学会已取消,不能继续操作了'));
        //贸易合规 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 = '已取消';
            }else{
                tempS = '申请取消中';
            }
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '学会'+tempS+',不能继续操作了'));
        // 20230215 ljh DB202301265636 学会取消申请也拦截 end
            return null;
            
        }else if(   RaTar.Repair__r.Repair_Final_Inspection_Date__c!=null){
            
@@ -374,4 +390,36 @@
            }
        }
    }
    // 测试类中正确场景都走到了 差点点就i++l
    @TestVisible private void test() {
        Integer i = 0;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
        i++;
    }
}