OBPM备品相关修改 & 【委托】【phase5上线课题131】-增加明细的时长字段“提交申请到备品出库时长”

李金换

2022-03-15 552f32c93251191103a633ca292c06a445e2551f

OBPM备品相关修改 & 【委托】【phase5上线课题131】-增加明细的时长字段“提交申请到备品出库时长”

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

@@ -337,8 +337,16 @@

        List<String> raids = Raid.split(':');
        //检查是否可以继续
        List<Rental_Apply__c> RaTarList = [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,Campaign__r.IF_Approved__c,repair__r.Return_Without_Repair_Date__c,Repair__r.Repair_Final_Inspection_Date__c,Repair__r.Repair_Shipped_Date__c
        List<Rental_Apply__c> RaTarList = [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
                                                ,Campaign__r.IF_Approved__c
                                                ,Campaign__r.Meeting_Approved_No__c // 20220315 ljh obpm备品决裁状态相关修改
                                                ,Campaign__r.Approved_Status__c     // 20220315 ljh obpm备品决裁状态相关修改
                                                ,repair__r.Return_Without_Repair_Date__c
                                                ,Repair__r.Repair_Final_Inspection_Date__c
                                                ,Repair__r.Repair_Shipped_Date__c
                                            from Rental_Apply__c 
                                            where id in :raids];//20210602 ljh update 增加查询Name SFDC-C3LBNL 
        //20210604 ljh update SFDC-C3LBNL start
@@ -351,21 +359,10 @@
        String message4 = '';//1822 yc 20211025 已购待货目的，新品已有发货日不能出库
        String message5 = '';//1822 yc 20211108 索赔QIS目的，QIS已有新品发货日不能出库
        String message6 = '';

        Set<Id> ids = new Set<Id>();
        for (Rental_Apply__c RaTar : RaTarList) {
            if (String.isNotBlank(RaTar.Campaign__c) && RaTar.Campaign__r.IF_Approved__c){
                ids.add(RaTar.Campaign__c);
            }
        }
        //查找备品申请对应裁决申请
        Map<Id, Campaign> campMap = new Map<Id, Campaign>([
                SELECT Id,  IF_Approved__c, Meeting_Approved_No__c,
                       Meeting_Approved_No__r.ProcessState__c, 
                       Meeting_Approved_No__r.MeetingApprovedNo__c 
                FROM Campaign
                WHERE id IN :ids]);

        String message7 = '';// 20220315 ljh obpm备品决裁状态相关修改 end
        // 要判断决裁状态不能是草稿/驳回/终止申请/取消/删除
        List<String> statusList = System.Label.StatusProcessState.split(',');
        Map<Id, Rental_Apply__c> RaMap = new Map<Id, Rental_Apply__c>();
        for (Rental_Apply__c RaTar : RaTarList) {
            if( RaTar.Campaign__r.Status == '取消'){
                // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '学会已取消，不能继续操作了'));
@@ -399,15 +396,24 @@
                message5 += RaTar.Name+'、';
            }
            //1822 yc 20211025 已购待货目的，新品已有发货日不能出库 end
            else if (!campMap.isEmpty() && campMap.containsKey(RaTar.Campaign__c) && campMap.get(RaTar.Campaign__c).IF_Approved__c){
                if (String.isBlank(campMap.get(RaTar.Campaign__c).Meeting_Approved_No__c) 
                    || String.isBlank(campMap.get(RaTar.Campaign__c).Meeting_Approved_No__r.MeetingApprovedNo__c)) {
                    errorFlag = true;
                    message6 = RaTar.Name + '、';
                }
            // 20220315 ljh obpm备品决裁状态相关修改 start
            // else if (!campMap.isEmpty() && campMap.containsKey(RaTar.Campaign__c) && campMap.get(RaTar.Campaign__c).IF_Approved__c){
            //     if (String.isBlank(campMap.get(RaTar.Campaign__c).Meeting_Approved_No__c) 
            //         || String.isBlank(campMap.get(RaTar.Campaign__c).Meeting_Approved_No__r.MeetingApprovedNo__c)) {
            //         errorFlag = true;
            //         message6 = RaTar.Name + '、';
            //     }
            // }
            else if(RaTar.Campaign__c!= null &&  RaTar.Campaign__r.IF_Approved__c && RaTar.Campaign__r.Meeting_Approved_No__c == null) {
                errorFlag = true;
                message6 += RaTar.Name + '、';
            }
            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)) {
                errorFlag = true;
                message7 += RaTar.Name + '、';
            }
            // 20220315 ljh obpm备品决裁状态相关修改 end
            //20220217 sx add 备品借出申请-决裁控制 No.3 在出库时增加判断，判断学会是否申请决裁，如果是的话，再判断决裁编号是否不为空，满足条件才能出库，否则提示错误

        }
        if(errorFlag){
            if(String.isNotBlank(message0)){
@@ -433,6 +439,11 @@
            if(String.isNotBlank(message6)){
                message += '单号No.'+ message6.removeEnd('、')+ '已申请决裁但决裁编码为空';
            }
            // 20220315 ljh obpm备品决裁状态相关修改 add start
            if(String.isNotBlank(message6)){
                message += '单号No.'+ message7.removeEnd('、')+ '已申请决裁但决裁编码状态不符合需求';
            }
            // 20220315 ljh obpm备品决裁状态相关修改 add end
            ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,message));
            return null;
        }
@@ -459,6 +470,7 @@
                           Asset__r.Remark__c, Asset__r.ImageAsset__c, Asset__r.ImageSerial__c, Asset__r.ImageAssetUploadedTime__c, Asset__r.ImageSerialUploadedTime__c,
                           Loaner_CDS_Info__c, Inspection_result__c, Check_lost_Item__c, Pre_disinfection__c, Water_leacage_check__c, Inspection_result_after__c, Arrival_in_wh__c,
                           Asset__r.Pre_Reserve_RAES_Detail__c, Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c,
                           Rental_Apply__r.Request_approval_time__c , Add_Request_approval_time__c ,ApplyToShipmentWorkTime__c, //20220309 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 
                           Inspection_result_after_ng__c, Inspection_result_ng__c, Lost_item_giveup__c, CDS_complete__c, Loaner_accsessary__c,Key_product__c
                    from Rental_Apply_Equipment_Set_Detail__c where Id in :eSet for update];
        Boolean needSaveSet = false;
@@ -468,6 +480,7 @@
        Map<String,boolean> keyPointProduct = new Map<String,boolean>();
        //wangweipeng   是否是重点产品       2021/08/30        end
        Set<Id> astForLock = new Set<Id>();
        Map<Datetime, List<Rental_Apply_Equipment_Set_Detail__c>> approvalMap = new Map<Datetime, List<Rental_Apply_Equipment_Set_Detail__c>>();// 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长
        for (Rental_Apply_Equipment_Set_Detail__c esd : eList) {
            if (esd.Inspection_result__c <> null && esd.StockDown__c == false) {
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '备品set未下架，不能填写发货前检查结果'));
@@ -486,12 +499,22 @@
            }
            //wangweipeng   是否是重点产品       2021/08/30        end
            astForLock.add(esd.Asset__c);
            // 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 start
            Datetime keyDt = esd.Add_Request_approval_time__c != null?esd.Add_Request_approval_time__c:esd.Rental_Apply__r.Request_approval_time__c;
            List<Rental_Apply_Equipment_Set_Detail__c> tempRaesdL;
            if(approvalMap.containsKey(keyDt)){
                tempRaesdL = approvalMap.get(keyDt);
            }else{
                tempRaesdL = new List<Rental_Apply_Equipment_Set_Detail__c>();
            }
            tempRaesdL.add(esd);                        
            approvalMap.put(keyDt,tempRaesdL);
            // 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 end
        }
        List<Asset> astLock = [select Id
                 from Asset
                where id in :astForLock
                  for update];

        if (Step_status == '明细') {
            needDeliverySlip = true;
            //if (slip.Id == null) {
@@ -506,15 +529,90 @@
            slip.Shippment_loaner_time__c = Datetime.now();
            needSaveDetail = true;
        }
        List<Rental_Apply__c> raList = [select Id, DeliverySlip__c, Campaign__c from Rental_Apply__c where Id in :raSet];
        List<Rental_Apply__c> raList = [select Id, DeliverySlip__c, Campaign__c 
                                        , Campaign__r.IF_Approved__c         // 20220315 ljh obpm备品决裁状态相关修改
                                        , Campaign__r.Meeting_Approved_No__c // 20220315 ljh obpm备品决裁状态相关修改
                                        , Campaign__r.Approved_Status__c     // 20220315 ljh obpm备品决裁状态相关修改
                                        from Rental_Apply__c where Id in :raSet];
        Savepoint sp = Database.setSavepoint();
        try {
            //if (needSaveSet) ControllerUtil.upRAdEquipmentSet(es);
            if (needDeliverySlip) {
                FixtureUtil.withoutUpsertObjects(new List<FixtureDeliverySlip__c>{ slip });
                //ControllerUtil.updRADeliverySlipDetail(slip);
                // 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 start
                map<String,Decimal> ApplyToShipmentMap = new map<String,Decimal>();
                if(approvalMap.size() > 0 ){
                    // dtList[0] 第一个就是最小时间
                    List<Datetime> dtList = new List<Datetime>(approvalMap.keySet());
                    Date startDateSOQL  = date.newinstance(dtList[0].year(), dtList[0].month(), dtList[0].day());
                    List<OlympusCalendar__c> ocList = [SELECT Id, Date__c,IsWorkDay__c 
                                     FROM OlympusCalendar__c
                                    WHERE Date__c >= :startDateSOQL
                                      AND Date__c <= :Date.today()
                                    ORDER BY Date__c ASC];

                    for(Datetime dt:dtList){
                        Boolean startFlag = false;
                        Boolean endFlag = false;
                        Datetime startTime = dt;
                        Date startDate = Date.newInstance(startTime.year(),startTime.month(),startTime.day());
                        Datetime endTime = Datetime.now();
                        Date endDate = Date.today();
                        // 审批时间是非奥林巴斯工作日  
                        if(ocList[0].IsWorkDay__c == 0){
                            for(OlympusCalendar__c oc:ocList){
                                if(oc.IsWorkDay__c == 1){
                                    startTime = oc.Date__c;
                                    startDate = oc.Date__c;
                                    startFlag = true;
                                    break;
                                }
                            }
                        }
                        // 发货时间是非奥林巴斯工作日
                        if(ocList[ocList.size() - 1].IsWorkDay__c == 0){
                            for(Integer i = ocList.size() - 1; i <= 0;i--){
                                if(ocList[i].IsWorkDay__c == 1){
                                    endTime = ocList[i].Date__c.addDays(1);
                                    endDate = ocList[i].Date__c.addDays(1);
                                    endFlag = true;
                                    break;
                                }
                            }
                        }
                        Decimal timeDifLast;
                        if(ocList[0].IsWorkDay__c == 0 && ocList[ocList.size() - 1].IsWorkDay__c == 0 && !startFlag && !endFlag){
                            timeDifLast = 0;
                        }else{
                            Long startL = startTime.getTime();
                            Long tendL = endTime.getTime();
                            Long timeDif = tendL - startL;                            
                            Decimal time11 = timeDif*1.00;
                            Decimal time12 = 24*3600*1000*1.00;
                            timeDifLast = time11/time12;                            
                            Integer tempWeek = 0;
                            for(OlympusCalendar__c oc:ocList){
                                if(oc.IsWorkDay__c == 0 && startDate < oc.Date__c && oc.Date__c < endDate){
                                    tempWeek++;
                                }
                            }
                            timeDifLast = timeDifLast - tempWeek;
                        }
                        // dtestLast 四舍五入 保留1位小数
                        for(Rental_Apply_Equipment_Set_Detail__c raesd00:approvalMap.get(dt)){
                            ApplyToShipmentMap.put(raesd00.Id,timeDifLast.setScale(1));
                        }
                    }
                }
                // 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 end
                for (Rental_Apply_Equipment_Set_Detail__c esd : eList) {
                    esd.DeliverySlip__c = slip.Id;
                    // 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 start
                    if(ApplyToShipmentMap.containsKey(esd.Id)){
                        esd.ApplyToShipmentWorkTime__c = ApplyToShipmentMap.get(esd.Id);
                    }
                    // 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 end
                }

                for (Rental_Apply__c ra : raList) {
@@ -523,11 +621,17 @@
                    ra.Is_keyPoint_Product__c = keyPointProduct.get(ra.Id);
                    //wangweipeng   是否是重点产品       2021/08/30        start

                    // 20220315 ljh obpm备品决裁状态相关修改 update start
                    //20220217 sx add 备品借出申请-决裁控制 No.4 出库成功时，把此时点的决裁编号和决裁状态写到决裁编号（出库）和决裁状态（出库）上
                    if (!campMap.isEmpty() && campMap.containsKey(ra.Campaign__c) && campMap.get(ra.Campaign__c).IF_Approved__c){
                        ra.ApprovedNo_Delivery__c = campMap.get(ra.Campaign__c).Meeting_Approved_No__r.MeetingApprovedNo__c;
                        ra.Approved_State_Delivery__c = campMap.get(ra.Campaign__c).Meeting_Approved_No__r.ProcessState__c;
                    // if (!campMap.isEmpty() && campMap.containsKey(ra.Campaign__c) && campMap.get(ra.Campaign__c).IF_Approved__c){
                    //     ra.ApprovedNo_Delivery__c = campMap.get(ra.Campaign__c).Meeting_Approved_No__r.MeetingApprovedNo__c;
                    //     ra.Approved_State_Delivery__c = campMap.get(ra.Campaign__c).Meeting_Approved_No__r.ProcessState__c;
                    // }
                    if (ra.Campaign__c != null&& ra.Campaign__r.IF_Approved__c && ra.Campaign__r.Meeting_Approved_No__c != null){
                        ra.ApprovedNo_Delivery__c = ra.Campaign__r.Meeting_Approved_No__c;
                        ra.Approved_State_Delivery__c = ra.Campaign__r.Approved_Status__c;
                    }
                    // 20220315 ljh obpm备品决裁状态相关修改 update end
                }
            }
            //if (needSaveDetail) ControllerUtil.updRAEquipmentSetDetail(eList);

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

@@ -48,9 +48,8 @@
                         + ', 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 备品借出申请-决裁控制
                         + ', Campaign__r.Meeting_Approved_No__c' // 20220315 ljh add 
                         + ', Campaign__r.Approved_Status__c' // 20220315 ljh add 
                         + ' FROM Rental_Apply__c'
                         + ' WHERE Id=\'' + taId + '\'';
            List<Rental_Apply__c>  raList = (List<Rental_Apply__c>) Consum_ApplyUtil.withoutQueryList(rasql);
@@ -251,6 +250,7 @@
                     , 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 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 
                     , ApplyToShipmentWorkTime__c   //20220309 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 
                     , Rental_Num__c
                     , Rental_Start_Date__c
                     , Select_Time__c
@@ -427,18 +427,22 @@
        }
    }
    private Boolean isRaStatusOK() {

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

        //检查是否可以继续
        // 20210809  ljh SFDC-C5HDC7 update start
        List<Rental_Apply__c> RaTarList = [
            SELECT Campaign__c
                 , Repair__c
                 , Campaign__r.Status
                 ,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备品决裁状态相关修改
                 // ,repair__r.Return_Without_Repair_Date__c
                 , Return_Without_Repair_Date_F__c
                 // , Repair__r.Repair_Final_Inspection_Date__c
                 ,Repair_Final_Inspection_Date_F__c
                 , Repair_Final_Inspection_Date_F__c
                 // , Repair__r.Repair_Shipped_Date__c
                 , RC_return_to_office__c 
                 , demo_purpose2__c //1822 yc 20211025 已购待货目的，新品已有发货日不能出库
@@ -480,10 +484,18 @@
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '索赔QIS目的，QIS已有新品发货日,不能继续了'));
                return false;
            }//1822 yc 20211108 end
            //20220225 sx add obpm 办事处增加判断：是否申请决裁勾着没有决裁编号不能进行操作
            //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, '已申请决裁但决裁编码为空'));
                return false;
            }
            //20220225 sx end obpm 办事处增加判断：是否申请决裁勾着没有决裁编号不能进行操作
            //20220315 sx  obpm备品决裁状态相关修改 add start
            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 false;
            }
            //20220315 sx  obpm备品决裁状态相关修改 add end
        }
        return true;
    }
@@ -1714,7 +1726,7 @@
                ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '没有明细，不能发货!'));
                return;
            }
            Map<String, List<Rental_Apply_Equipment_Set_Detail__c>> approvalMap = new Map<String, List<Rental_Apply_Equipment_Set_Detail__c>>();// 20220309 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长
            Map<Datetime, List<Rental_Apply_Equipment_Set_Detail__c>> approvalMap = new Map<Datetime, List<Rental_Apply_Equipment_Set_Detail__c>>();// 20220309 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长
            for(EsdInfo esd:esdList) {
                if(!raesdMap.containsKey(esd.rec.Id)) {
                    continue;
@@ -1774,13 +1786,13 @@
                    // 20220309 ljh 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());
                    if(approvalMap.containsKey(keyDt)){
                        tempRaesdL = approvalMap.get(keyDt);
                    }else{
                        tempRaesdL = new List<Rental_Apply_Equipment_Set_Detail__c>();
                    }
                    tempRaesdL.add(raesd);                        
                    approvalMap.put(keyDt.format(),tempRaesdL);
                    approvalMap.put(keyDt,tempRaesdL);
                    // 20220309 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 end  
                    updateRaesdList.add(raesd);
                }
@@ -1811,16 +1823,6 @@
                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());
@@ -1830,27 +1832,21 @@
            if(!updateRaesdList.isEmpty()) {
                slip.Shippment_loaner_time__c = now;
                FixtureUtil.withoutUpsertObjects(new List<FixtureDeliverySlip__c> {slip});
                // 明细和申请连到发货单上
                for(Rental_Apply_Equipment_Set_Detail__c raesd: updateRaesdList) {
                    if(!raesd.Cancel_Select__c) {
                        raesd.DeliverySlip__c = slip.Id;
                    }
                }
                // 20220309 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 start
                map<String,Decimal> ApplyToShipmentMap = new map<String,Decimal>();
                if(approvalMap.size() > 0 ){
                    // dtList[0] 第一个就是最小时间
                    List<String> dtList = new List<String>(approvalMap.keySet());
                    Date startDateSOQL  = date.newinstance(Datetime.valueOf(dtList[0]).year(), Datetime.valueOf(dtList[0]).month(), Datetime.valueOf(dtList[0]).day());
                    List<Datetime> dtList = new List<Datetime>(approvalMap.keySet());
                    Date startDateSOQL  = date.newinstance(dtList[0].year(), dtList[0].month(), dtList[0].day());
                    List<OlympusCalendar__c> ocList = [SELECT Id, Date__c,IsWorkDay__c 
                                     FROM OlympusCalendar__c
                                    WHERE Date__c >= :startDateSOQL
                                      AND Date__c <= :Date.today()
                                    ORDER BY Date__c ASC];
                    for(String dt:dtList){
                    for(Datetime dt:dtList){
                        Boolean startFlag = false;
                        Boolean endFlag = false;
                        Datetime startTime = Datetime.valueOf(dt);
                        Datetime startTime = dt;
                        Date startDate = Date.newInstance(startTime.year(),startTime.month(),startTime.day());
                        Datetime endTime = Datetime.now();
                        Date endDate = Date.today();
@@ -1888,7 +1884,7 @@
                            timeDifLast = time11/time12;                            
                            Integer tempWeek = 0;
                            for(OlympusCalendar__c oc:ocList){
                                if(startDate < oc.Date__c && oc.Date__c < endDate){
                                if(oc.IsWorkDay__c == 0 && startDate < oc.Date__c && oc.Date__c < endDate){
                                    tempWeek++;
                                }
                            }
@@ -1901,6 +1897,17 @@
                    }
                }
                // 20220309 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 end 
                // 明细和申请连到发货单上
                for(Rental_Apply_Equipment_Set_Detail__c raesd: updateRaesdList) {
                    if(!raesd.Cancel_Select__c) {
                        raesd.DeliverySlip__c = slip.Id;
                    }
                    // 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 start
                    if(ApplyToShipmentMap.containsKey(raesd.Id)){
                        raesd.ApplyToShipmentWorkTime__c = ApplyToShipmentMap.get(raesd.Id);
                    }
                    // 20220315 ljh SFDC-CC6CLJ phase5上线课题131 提交申请到备品出库时长 end
                }
                FixtureUtil.withoutUpdate(updateRaesdList);
                // 20210624 ljh update SFDC-C448GR start
                // Rental_Apply__c ra = new Rental_Apply__c(Id=parentObj.Id, DeliverySlip__c = slip.Id, Delivery_Agency__c = parentObj.Delivery_Agency__c, Agency_Address_Id__c = addressId );
@@ -1916,8 +1923,10 @@

                //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;
                    // 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;
                    ra.ApprovedNo_Delivery__c = parentObj.Campaign__r.Meeting_Approved_No__c;
                    ra.Approved_State_Delivery__c = parentObj.Campaign__r.Approved_Status__c;
                }
                FixtureUtil.withoutUpdate(new List<Rental_Apply__c> {ra});
            }