高章伟
2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262
force-app/main/default/classes/RentalApplySplitController.cls
@@ -381,6 +381,16 @@
        List<Rental_Apply_Equipment_Set_Detail__c> raesdList = [select Id, Rental_Apply_Equipment_Set__c
                    from Rental_Apply_Equipment_Set_Detail__c 
                    where Rental_Apply_Equipment_Set__c in :ids];
        //DB202212459027 【FY23中小课题】到货NG分单首满率调整 2023/01/06 lc Start
        if(cloneRas.Split_Apply_Reason__c.equals('到货NG分单')){
            // 批准时间(申请提交时间)
            cloneRas.Request_approval_time__c = DateTime.now();
            // 申请受理时间(回答时间)
            cloneRas.Application_accept_time__c = null;
        }
        //DB202212459027 【FY23中小课题】到货NG分单首满率调整 2023/01/06 lc End
        if(this.ra.RecordTypeId == DEVELOPERNAMEMAP.get('AgencyRequest').getRecordTypeId()
            && !String.isBlank(cloneRas.Split_Apply_Reason__c)  && !cloneRas.Split_Apply_Reason__c.equals('现地管理分单')){
            // 1.分批发货分单 2.到货NG分单
@@ -607,6 +617,7 @@
        cloneRas.Old_Rental_Apply__c = ra.Id;                       // 源申请单Link
        cloneRas.Root_Rental_Apply__c = rootRaList[0].Id;           // 最源申请单Id 20210609 ljh add 1732
        cloneRas.OPDManagerText__c = ra.OPDManager__c;   // 20210926 ljh add SFDC-C6A97F add 
        cloneRas.OPDBuchang_Text__c = ra.OPDBuchang__c;   // 20220722 zyh add SWAG-CGG7X9 add
        //20201117 ljh  OCSM_BP5-60 add start
        //4.办事处分配分单出来的备品借出申请,数据类型需要修改
        if(cloneRas.Split_Apply_Reason__c != null && cloneRas.Split_Apply_Reason__c.equals('现地管理分单')){
@@ -694,6 +705,7 @@
                    OCM_segmentation__c,             // OCM分类
                    Loaner_medical_Staff__c,         // 科室负责人
                    Phone_number__c,                 // 联系电话
                     Phone_Number_Encrypt__c,                   // 20220401 PI COPY by Bright
                    // ------ 借用备品的目的 ------
                    Demo_purpose1__c,                // 使用目的1
                    demo_purpose2__c,                // 使用目的2
@@ -728,12 +740,13 @@
                    Loaner_received_staff__c,        // 收件者姓名 (销售或FSE)
                    Shippment_adress_detail__c,      // 发送办事处地址详细
                    direct_shippment_address__c,     // 直送发送地址
                     Direct_Shippment_Address_Encrypt__c,                   // 20220401 PI COPY by Bright
                    direct_send__c,                  // 发送方
                    pickup_time__c,                  // 自提时间
                    Loaner_received_staff_phone__c,  // 收件者电话(销售或FSE)
                    Post_Code__c,                    // 邮编
                    ApprovedNo_Delivery__c,          // 决裁编号(发货时) 20220224 ljh add
                    Approved_State_Delivery__c,      // 决裁状态(发货时)20220224 ljh add
                    // ApprovedNo_Delivery__c,          // 决裁编号(发货时) 20220224 ljh add
                    // Approved_State_Delivery__c,      // 决裁状态(发货时)20220224 ljh add
                    ApprovedNo_Create__c,            // 决裁编号(创建时) 20220301 ljh add
                    Approved_State_Create__c,        // 决裁状态(创建时) 20220301 ljh add
                    Response__c,                     // 应答沟通
@@ -747,6 +760,7 @@
                    First_level_actual_approver__c,  //一级实际审批人 20210908 ljh SFDC-C6A97F add
                    Second_level_actual_approver__c, //二级实际审批人 20210908 ljh SFDC-C6A97F add
                    OPDManager__c,                   // 20210926 ljh add SFDC-C6A97F add
                    OPDBuchang__c,                   // 20220722 zyh add SWAG-CGG7X9 add
                    // OLY_OCM-583 Start 分单时增加拷贝字段GI本部区分 
                    GI_Diff__c                       // GI本部区分
                    // OLY_OCM-583 End