最近一月修改内容

高章伟

2022-03-10 1312ba82d4c880bdb5357d28e0d4af5b285f610f

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

@@ -48,6 +48,9 @@
                         + ', Loaner_cancel_request__c'//20210707 SFDC-C448KZ you
                         + ', Equipment_Type_F__c' //20210508 LJH ADD 1672
                         + ', Wei_Assigned_Cnt__c' // 20210624 ljh add SFDC-C448GR start
                         + ', Campaign__c, Campaign__r.IF_Approved__c, Campaign__r.Meeting_Approved_No__c' 
                         + ', Campaign__r.Meeting_Approved_No__r.ProcessState__c'
                         + ', Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c' //20220217 sx add 备品借出申请-决裁控制
                         + ' FROM Rental_Apply__c'
                         + ' WHERE Id=\'' + taId + '\'';
            List<Rental_Apply__c>  raList = (List<Rental_Apply__c>) Consum_ApplyUtil.withoutQueryList(rasql);
@@ -243,10 +246,11 @@
                     , Rental_Apply_Equipment_Set__r.Irreplaceable_flag__c //20210519 ljh add 1829 start
                     , Rental_Apply_Equipment_Set__r.canDelete__c //20210519 ljh add 1829 start
                     , Rental_Apply_Equipment_Set__r.Substitute_flag__c //20210526 ljh 1829 add
                     ,Rental_Apply_Equipment_Set__r.RAES_Status__c
                     ,Rental_Apply_Equipment_Set__r.Shippment_loaner_time2__c
                     ,Rental_Apply__r.Status__c
                     //20210519 ljh add 1829 end
                     , Rental_Apply_Equipment_Set__r.RAES_Status__c
                     , Rental_Apply_Equipment_Set__r.Shippment_loaner_time2__c
                     , Rental_Apply__r.Status__c //20210519 ljh add 1829 end
                     , Rental_Apply__r.Request_approval_time__c //20220309 SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 
                     , Add_Request_approval_time__c //20220309 SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 
                     , Rental_Num__c
                     , Rental_Start_Date__c
                     , Select_Time__c
@@ -429,6 +433,8 @@
            SELECT Campaign__c
                 , Repair__c
                 , Campaign__r.Status
                 ,Campaign__r.IF_Approved__c
                 ,Campaign__r.Meeting_Approved_No__c
                 // ,repair__r.Return_Without_Repair_Date__c
                 , Return_Without_Repair_Date_F__c
                 // , Repair__r.Repair_Final_Inspection_Date__c
@@ -474,6 +480,10 @@
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '索赔QIS目的，QIS已有新品发货日,不能继续了'));
                return false;
            }//1822 yc 20211108 end
            //20220225 sx add 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, '已申请决裁但决裁编码为空'));
            }
        }
        return true;
    }
@@ -1704,6 +1714,8 @@
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '没有明细，不能发货!'));
                return;
            }
            Map<String,String> tes = new Map<String,String>();
            Map<String, List<Rental_Apply_Equipment_Set_Detail__c>> approvalMap = new Map<String, List<Rental_Apply_Equipment_Set_Detail__c>>();// 20220309 SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长
            for(EsdInfo esd:esdList) {
                if(!raesdMap.containsKey(esd.rec.Id)) {
                    continue;
@@ -1760,7 +1772,17 @@
                    raesd.Inspection_result__c = 'OK';
                    // 发货前检测时间和检测人在trigger里设
                    raesd.Shippment_loaner_time__c = now;

                    // 20220309 SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 start
                    Datetime keyDt = raesd.Add_Request_approval_time__c != null?raesd.Add_Request_approval_time__c:raesd.Rental_Apply__r.Request_approval_time__c;
                    List<Rental_Apply_Equipment_Set_Detail__c> tempRaesdL;
                    if(approvalMap.containsKey(keyDt.format())){
                        tempRaesdL = approvalMap.get(keyDt.format());
                    }else{
                        tempRaesdL = new List<Rental_Apply_Equipment_Set_Detail__c>();
                    }
                    tempRaesdL.add(raesd);                        
                    approvalMap.put(keyDt.format(),tempRaesdL);
                    // 20220309 SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 end  
                    updateRaesdList.add(raesd);
                }
                else {
@@ -1790,6 +1812,16 @@
                return;
            }
            //20201209 ljh update end

            //20220217 sx add 备品借出申请-决裁控制
            if (String.isNotBlank(parentObj.Campaign__c) && parentObj.Campaign__r.IF_Approved__c) {
                if (String.isBlank(parentObj.Campaign__r.Meeting_Approved_No__c) 
                    || String.isBlank(parentObj.Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c)) {
                    ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '该申请单已申请决裁但决裁编码为空,不能发货！'));
                    return;
                }
            }

            // 删除link
            if(!mainIdList.isEmpty()) {
                Oly_TriggerHandler.bypass(AssetHandlerCheck.class.getName());
@@ -1817,6 +1849,12 @@
                ra.Delivery_Agency__c = parentObj.Delivery_Agency__c; 
                ra.Agency_Address_Id__c = addressId;
                // 20210624 ljh update SFDC-C448GR end

                //20220217 sx add 备品借出申请-决裁控制 No.4 出库成功时，把此时点的决裁编号和决裁状态写到决裁编号（出库）和决裁状态（出库）上
                if (String.isNotBlank(parentObj.Campaign__c) && parentObj.Campaign__r.IF_Approved__c){
                    ra.ApprovedNo_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__r.MeetingApprovedNo__c;
                    ra.Approved_State_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__r.ProcessState__c;
                }
                FixtureUtil.withoutUpdate(new List<Rental_Apply__c> {ra});
            }
            // 同城时自动收货