高章伟
2022-03-10 1312ba82d4c880bdb5357d28e0d4af5b285f610f
force-app/main/default/classes/RentalApplySplitController.cls
@@ -552,6 +552,9 @@
                    Meeting_Cooperate2__c, //会议合作本部2
                    Meeting_Cooperate3__c, //会议合作本部3
                    Meeting_Cooperate4__c, //会议合作本部4
                    IF_Approved__c, // 是否申请决裁 20220218 ljh add
                    Approved_No__c, // 决裁编码 20220218 ljh add
                    Approved_Status__c,// 决裁状态 20220218 ljh add
                    AdditionalSupport__c //原OPD计划(追加配套用)
                      FROM OPDPlan__c WHERE Id = :cloneRas.OPDPlan__c];
            if(opdList.size()>0){
@@ -562,6 +565,8 @@
                cloneOPD.Status__c = '计划中';
                FixtureUtil.withoutInsert(new OPDPlan__c[]{cloneOPD});
                cloneRas.OPDPlan__c = cloneOPD.Id;
                // cloneRas.ApprovedNo_Create__c = cloneOPD.Approved_No__c; // 20220218 ljh add 决裁
                // cloneRas.Approved_State_Create__c = cloneOPD.Approved_Status__c; // 20220218 ljh add 决裁
                // List<Plan_Rental_Equipment__c> inPreList = new List<Plan_Rental_Equipment__c>();
                // for(Plan_Rental_Equipment__c pre0 : [SELECT Id, Campaign__c,Event_ID__c,RecordTypeId,Name,Rental_Equipment__c,Rental_Quantity__c FROM Plan_Rental_Equipment__c WHERE OPD_Plan__c = :opdList[0].Id]){
                //     Plan_Rental_Equipment__c pre = new Plan_Rental_Equipment__c();
@@ -727,7 +732,10 @@
                    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_Create__c,            // 决裁编号(创建时) 20220301 ljh add
                    Approved_State_Create__c,        // 决裁状态(创建时) 20220301 ljh add
                    Response__c,                     // 应答沟通
                    Request_demo_time__c,            // 申请时间
                    Request_approval_time__c,        // 批准时间(申请提交时间)