Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

涂煌豪

2022-03-22 7f68ed6f7658db35544204ab5dcf6a3800e1b756

Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

# Conflicts:
#	force-app/main/default/classes/NFM624Rest.cls

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

@@ -10,7 +10,7 @@
        if (rectCotac.size() == 0) {
            return;
        }
        Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证'];
        Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];
        Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効');
        Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効');
        insert new Product2[]{prod01,prod02};

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

@@ -149,7 +149,7 @@
    public static List<Agency_Report__c> selectAgencyReport(Date week, String person_str) {
        if (String.isBlank(person_str)) {
            List<Contact> person_list = selectAgencyPerson();
            return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c, productCategories__c,DealerPersonnel__c,WorkRecord__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
            return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c, productCategories__c,DealerPersonnel__c,WorkRecord__c,Purpose_Type__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
                            Person_In_Charge2__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
                            doctor2__r.AWS_Data_Id__c,Person_In_Charge2__r.AWS_Data_Id__c,// 20220222 PI改造 by Bright
                            Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,
@@ -157,7 +157,7 @@
                            From Agency_Report__c
                            where Submit_date__c=:week and Person_In_Charge2__c in :person_list and WeeklyReportClassification__c = ''  order by LastModifiedDate desc];
        } else {
            return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,DealerPersonnel__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c,productCategories__c,WorkRecord__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
            return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,DealerPersonnel__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c,productCategories__c,WorkRecord__c,Purpose_Type__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
                            Person_In_Charge2__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
                            doctor2__r.AWS_Data_Id__c,Person_In_Charge2__r.AWS_Data_Id__c,// 20220222 PI改造 by Bright
                            Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,

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

@@ -228,6 +228,8 @@
                                                      AccountId 
                                                      from Contact 
                                                      where CManageCode__c IN: PersonManagementCodeList 
                                                      OR Account.PlatformCode__c IN: ManagementList
                                                      OR Account.Management_Code__c IN: SFDCCodeList
                                                      OR Account.Parent_PlatformCode__c IN: ManagementList 
                                                      OR Account.Parent_Management_Code__c IN: SFDCCodeList]; //根据人员管理编码检索联系人
                Map < String, Contact > peopleMap = new Map < String, Contact > (); //联系人
@@ -509,6 +511,8 @@
                                        //因为没有医院管理编码，无法检索到战略科室，所以在给科室的战略科室字段赋值时空指针
                                        //dpt.Department_Class__c = DepartmentClassMap.get(gedata.DepartmentClass).Id;
                                        //dpt.ParentId = DepartmentClassMap.get(gedata.DepartmentClass).Id;
                                        dpt.Department_Class__c = DepartmentClassMap.get(gedata.DepartmentClass).Id;
                                        dpt.ParentId = DepartmentClassMap.get(gedata.DepartmentClass).Id;
                                        if (string.isnotblank(personCode)) { //人员管理编码存在
                                            if (peopleMap.containsKey(personCode)) { //人员管理编码查找有值 13 完成
                                                System.debug('13逻辑');

 force-app/main/default/triggers/ConsumableOrderTrigger.trigger

@@ -1,7 +1,10 @@
trigger ConsumableOrderTrigger on Consumable_order__c (before insert, before update) {
    if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
        return;
    }
    // CHAN-CBYBBF 【委托】经销商ET账号显示界面维护-广东汇晨 start
    // 注释跳过 发货时要计算 SAP合同号
    // if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
    //     return;
    // }
    // CHAN-CBYBBF 【委托】经销商ET账号显示界面维护-广东汇晨 end
    //add by rentx 20210618 start
    if (StaticParameter.ConsumableOrderTrigger) {
        return;