gzw 正式环境最新代码更新

高章伟

2023-03-02 e3c02c03dd2de442bbced87236f60a13a1cd154e

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

@@ -173,16 +173,36 @@
    // 保存按钮
    public PageReference save() {

        //检查是否可以继续
        Rental_Apply__c RaTar = [select Name,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
                                            from Rental_Apply__c 
                                            where id=:Raid];
        List<String> statusList = System.Label.StatusProcessState.split(',');

        if( RaTar.Campaign__r.Status == '取消'){
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '学会已取消，不能继续操作了'));
                return null;
        //检查是否可以继续
        Rental_Apply__c RaTar = [select Name,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,
                                        Campaign__r.Approved_Status__c      //20220315 sx obpm备品决裁状态相关修改
                                    from Rental_Apply__c 
                                    where id=:Raid];

        // 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 == '取消申请中' ){
            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){
            
@@ -209,9 +229,17 @@
        
        //20220225 sx start obpm 下架增加 是否申请决裁勾着没有决裁编号不能进行操作
        else if ( RaTar.Campaign__c!= null && RaTar.Campaign__r.IF_Approved__c && RaTar.Campaign__r.Meeting_Approved_No__c == null){
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '单号No.'+ RaTar.Name + '已申请决裁但决裁编码为空'));
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '已申请决裁但决裁编码为空'));
            return null;
        }
        //20220225 sx end 下架增加判断

        //20220315 sx start obpm obpm备品决裁状态相关修改
        else if ( RaTar.Campaign__c!= null && RaTar.Campaign__r.IF_Approved__c && RaTar.Campaign__r.Meeting_Approved_No__c != null && statusList.contains(RaTar.Campaign__r.Approved_Status__c) ){
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '已申请决裁但决裁状态不符合条件'));
            return null;
        }
        //20220315 sx end obpm obpm备品决裁状态相关修改

        String userid = Userinfo.getUserId();
        List<Rental_Apply_Equipment_Set_Detail__c> eList = new List<Rental_Apply_Equipment_Set_Detail__c>();
@@ -356,4 +384,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++;
    }
}