sunxia
2022-03-16 8532fb6e9d278f8dbd88e12bbe250c9c0a636556
force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls
@@ -173,10 +173,20 @@
    // 保存按钮
    public PageReference save() {
        List<String> statusList = System.Label.StatusProcessState.split(',');
        //检查是否可以继续
        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
        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];
@@ -209,10 +219,18 @@
        
        //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>();
        Map<Id, Boolean> stockDownMap = new Map<Id, Boolean>();