parent: ecca7a53 | 补丁 | 提交 | ignore whitespace
sunxia
2022-03-16 8532fb6e9d278f8dbd88e12bbe250c9c0a636556 
obpm新需求修改

obpm新需求修改
4个文件已修改
80 ■■■■■ 已修改文件
force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/EquipmentSetShippmentReceived2Controller.cls 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/RentalApplyWebService.cls 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/RentalFixtureSetAssignController.cls 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 force-app/main/default/classes/EquipmentSetShippmentReceived1Controller.cls


@@ -173,12 +173,22 @@


    // 保存按钮


    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


                                            from Rental_Apply__c 


                                            where id=:Raid];


        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];




        if( RaTar.Campaign__r.Status == '取消'){


                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '学会已取消，不能继续操作了'));


@@ -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>();




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


@@ -199,10 +199,13 @@


    // 保存按钮


    public PageReference save() {




        List<String> statusList = System.Label.StatusProcessState.split(',');




        //检查是否可以继续


        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


                                                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];




@@ -240,6 +243,13 @@


            return null;


        }


        //20220225 sx end 下架增加判断




        //20220315 sx start 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备品决裁状态相关修改


        


        String userid = Userinfo.getUserId();


        List<Rental_Apply_Equipment_Set_Detail__c> eList = new List<Rental_Apply_Equipment_Set_Detail__c>();


@@ -291,7 +301,7 @@


            return null;


        } catch (Exception ex) {


            system.debug('=====' + ex.getMessage());


            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getMessage()+'( '+Step_status+' )'));


            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));


            Database.rollback(sp);


            done_flg = false;


            return null;




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


@@ -431,15 +431,15 @@


        }


        //1388 yc 20211021 跨区域分配不能出库 end


        // 20220211 ljh add 备品FY23课题01 start


        AggregateResult[] resultsRas = [SELECT Rental_Start_Date__c,count(Id) cnt


                                     FROM Rental_Apply_Equipment_Set__c


                                     WHERE Rental_Apply__c = :rentalApplyId 


                                     AND Cancel_Select__c = false


                                     group by Rental_Start_Date__c];


        If(resultsRas.size() > 1){


            returnStr = '所有一览备品预计出货日应一致，不一致不能做出库指示'; 


            return returnStr;


        }


        // AggregateResult[] resultsRas = [SELECT Rental_Start_Date__c,count(Id) cnt


        //                              FROM Rental_Apply_Equipment_Set__c


        //                              WHERE Rental_Apply__c = :rentalApplyId 


        //                              AND Cancel_Select__c = false


        //                              group by Rental_Start_Date__c];


        // If(resultsRas.size() > 1){


        //     returnStr = '所有一览备品预计出货日应一致，不一致不能做出库指示'; 


        //     return returnStr;


        // }


        // 20220211 ljh add 备品FY23课题01 end




//bp2        // 备品借出历史取得


@@ -1159,7 +1159,10 @@


//    }


    // 分配验证


    Webservice static String AssignBtn(String Rid){


        List<Rental_Apply__c> raList = [select demo_purpose2__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,repair__r.Repair_Final_Inspection_Date__c,repair__r.Return_Without_Repair_Date__c,Campaign__c,Campaign__r.Status,Repair__r.Repair_Shipped_Date__c,Campaign__r.IF_Approved__c,Campaign__r.Meeting_Approved_No__c   from Rental_Apply__c where id = :Rid];




        List<String> statusList = System.Label.StatusProcessState.split(',');




        List<Rental_Apply__c> raList = [select demo_purpose2__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,repair__r.Repair_Final_Inspection_Date__c,repair__r.Return_Without_Repair_Date__c,Campaign__c,Campaign__r.Status,Repair__r.Repair_Shipped_Date__c,Campaign__r.IF_Approved__c,Campaign__r.Meeting_Approved_No__c,Campaign__r.Approved_Status__c   from Rental_Apply__c where id = :Rid];


        // 20210803 ljh  SFDC-C5HDC7 add 查询添加 Campaign__c,Campaign__r.Status,Repair__r.Repair_Shipped_Date__c 


        if(raList.size()>0){


            Rental_Apply__c Ra = raList[0];


@@ -1184,6 +1187,9 @@


           else if(Ra.Campaign__r.IF_Approved__c && Ra.Campaign__r.Meeting_Approved_No__c == null){


                return '已申请决裁但决裁编码为空';


           }//20220301 sx obpm修改


           else if(Ra.Campaign__r.IF_Approved__c && Ra.Campaign__r.Meeting_Approved_No__c != null && statusList.contains(Ra.Campaign__r.Approved_Status__c)){


                return '已申请决裁但决裁编码状态不符合需求';


           }//20220315 sx obpm备品决裁状态相关修改


           else{


                return 'Fin';


            } 




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


@@ -290,6 +290,7 @@


        // updateだけ使用する


        List<Rental_Apply_Equipment_Set__c> mfUpdate = new List<Rental_Apply_Equipment_Set__c>();


        Savepoint sp = Database.setSavepoint();


        List<String> statusList = System.Label.StatusProcessState.split(',');




        try {


            Boolean updRAFlg = false;


@@ -299,7 +300,8 @@


                           Asset_loaner_closed_day__c,


                           Campaign__c,


                           Campaign__r.IF_Approved__c,


                           Campaign__r.Meeting_Approved_No__c


                           Campaign__r.Meeting_Approved_No__c,


                           Campaign__r.Approved_Status__c   //2022 sx obpm备品决裁状态相关修改


                      FROM Rental_Apply__c


                     WHERE Id = :parentId


                       FOR Update];


@@ -318,7 +320,11 @@


            if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c == null){


                throw new ControllerUtil.myException('已申请决裁但决裁编码为空');


            }




            //20220315 sx obpm obpm备品决裁状态相关修改 start


            else if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c != null && statusList.contains(raUpd.Campaign__r.Approved_Status__c) ){


                throw new ControllerUtil.myException('已申请决裁但决裁编码状态不符合需求');


            }


            //20220315 sx obpm obpm备品决裁状态相关修改 end


            Integer indexNum = 1;


            // 20210708 ljh SFDC-C47CLV add start


            Set<Id> raeIdset = new Set<Id>();