parent: 19f3491c | 补丁 | 提交 | ignore whitespace
buli
2023-05-24 a1369f4a77132580a86ea45b4f22cd3f8723664a 
20230524 stage backup
4个文件已修改
470 ■■■■■ 已修改文件
force-app/main/default/classes/ConsumApplyTriggerHandler.cls 419 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/DNUpsertBatch.cls 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/OCSMHandler.cls 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/updateESignBatch.cls 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 force-app/main/default/classes/ConsumApplyTriggerHandler.cls


@@ -1046,6 +1046,423 @@


    }


    @TestVisible private static void test() {


        Integer i = 0;


        


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


        i++;


    }


}




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


@@ -291,11 +291,12 @@


            Map < String, String > provinceGIMap = new Map< String, String > ();


            //检索OCSM管理省对象


            //集中采购询价 增加检索助理 


            List < OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c   from OCM_Management_Province__c ];


            List < OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c,Window1__c   from OCM_Management_Province__c ];


            //存放map<省，担当>


            for (OCM_Management_Province__c omp: ompList) {


                provinceOwnerMap.put(omp.Name, omp.SalesManage__c);


                provinceGIMap.put(omp.Name,omp.GI_assistant__c);


                //provinceGIMap.put(omp.Name,omp.GI_assistant__c); //Commented by Li Jun 20230420


                provinceGIMap.put(omp.Name, omp.Window1__c);// Add By Li Jun 更新 签收单的【营业助理】值，从OCSM管理省对应的【营业窗口】字段获取


            }


            // 电子签收单 end




@@ -573,12 +574,30 @@


                 Statu_Achievements__r.orderType__c 


                 //无偿出库标识 thh 2021-11-01 end


                 //acc标识 end


                 //Add by Li Jun 20230420 start 


                 ,Opportunity__r.OCM_man_province_cus__c


                 //Add By Li Jun 20230420 end


                 from Statu_Achievements_DN__c where


                 Name in: DNNoSet];


        return DNList;


    }


    global void finish(Database.BatchableContext BC) {


    }




    //Add By Li Jun 0420 Start query management province


    private static Map<String,OCM_Management_Province__c> provinceManagementMap{set;get;}


    public static Map<String,OCM_Management_Province__c> getManagementProvince(){ 


        if(provinceManagementMap !=null && provinceManagementMap.keySet().size()>0 ){


            return provinceManagementMap;


        }


        provinceManagementMap = new Map<String,OCM_Management_Province__c>();


        List <OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c,Window1__c   from OCM_Management_Province__c];


        for (OCM_Management_Province__c omp: ompList) {


            provinceManagementMap.put(omp.Name,omp);


        }


        return provinceManagementMap;


    }


      //Add By Li Jun 0420 End


    /* 构建签收单：


     * eSFMap 是系统里面现有的签收单


     * key 为 DN号；


@@ -731,10 +750,14 @@


                    // 电子签收单  赋值营业助理和营业管理部担当 start


                    //集中采购的询价 精琢技术 wql 2020/01/11 start 


                    if(opp.Group_purchase_PCL__c){


                        tempSADN.Sales_assistant_name_text__c = provinceGIMap.get('集采课');


                        system.debug('集采课');


                        tempSADN.Sales_assistant_name_text__c = provinceGIMap.containskey('集采课')?provinceGIMap.get('集采课'):null; //Add  By Li Jun 20230523


                        //tempSADN.Sales_assistant_name_text__c = provinceGIMap.get('集采课'); //Commented By Li Jun 20230420


                        tempSADN.RC_Manager__c =  provinceOwnerMap.get('集采课');


                    }else{


                        tempSADN.Sales_assistant_name_text__c = opp.Sales_assistant_name_text__c;


                        system.debug('非集采课');


                        //tempSADN.Sales_assistant_name_text__c = opp.Sales_assistant_name_text__c; //Commented By Li Jun 20230420


                        tempSADN.Sales_assistant_name_text__c =opp.OCM_man_province_cus__c!='' && provinceGIMap.containskey(opp.OCM_man_province_cus__c)?provinceGIMap.get(opp.OCM_man_province_cus__c):null; //Add  By Li Jun 20230523


                        tempSADN.RC_Manager__c =  provinceOwnerMap.get(opp.OCM_man_province_cus__c);


                    }


                    //集中采购的询价 精琢技术 wql 2020/01/11 end




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


@@ -5,6 +5,9 @@


    


        OCM_Management_Province__c old = null;


        List<String> noList = new List<String>();


        //Add By Li Jun 20230420 Start OCSM省的【营业窗口】人员发生变动时，需要更新现有的未完成的签收单的【营业助理】值 


        Set<String> changedWindowProvince = new set<String>();


        //Add By Li Jun 20230420 End 


        for (OCM_Management_Province__c local : newList) {




            if (Trigger.isInsert) {


@@ -45,12 +48,23 @@


                        noList.add(old.OnlinePlatformWindow3__c);


                    }


                }


                //Add By Li Jun 20230420 Start 


                if (local.Window1__c != null &&  local.Window1__c != old.Window1__c) {


                    changedWindowProvince.add(local.Name);   


                }                


                //Add By Li Jun 20230420 End


            


            }




        }


        if (noList.size() > 0) {


            NFM621Controller.callout('',  noList);


        }


        //Add By Li Jun 20230420 Start 


        if(changedWindowProvince.size() > 0){


            SyncProvinceWIndowToSignForm.syncProvinceWIndow(changedWindowProvince);


        }


        //Add By Li Jun 20230420 End


    }


}


//LY          2021/11/12                  end




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


@@ -709,7 +709,7 @@


                                    }


                                }


                                //给营业助理赋值


                                eSignForm.Sales_assistant_name_text__c = eSignFormEntry.Sales_assistant_ID__c;


                                //eSignForm.Sales_assistant_name_text__c = eSignFormEntry.Sales_assistant_ID__c;// Commented By Li Jun 20230420


                                //存一个id


                                idlast = eSignFormEntry.Id;


                                //签收单name用作文件命名


@@ -1170,14 +1170,14 @@




        List < eSignForm__c > eSignFormLastList = new List < eSignForm__c >();


        //检索OCSM管理省对象


        List < OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c    from OCM_Management_Province__c where Name IN: provinceList];


        List < OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c,Window1__c    from OCM_Management_Province__c where Name IN: provinceList];


        //存放map<省，担当>


        for (OCM_Management_Province__c omp : ompList) {


            //不用map<String,list>的 原因是 想 ocsm管理省 和签收单 营业担当的顺序保持一致


            //String salesManage = omp.SalesManage__c+','+omp.SalesManage2__c+','+omp.SalesManage3__c;


            //provinceOwnerMap.put(omp.Name, salesManage);


            provinceOwnerMap.put(omp.Name, omp.SalesManage__c);


            provinceGIMap.put(omp.Name, omp.GI_assistant__c);


            provinceGIMap.put(omp.Name, omp.Window1__c);//Update By Li Jun 20230420 for  签收单营业助理从GI/SP助理改为签收单OCSM省的营业窗口


        }


        //①为true的时候 是其他没发生变化只有ocsm省上营业担当改变


        //②为false的时候，有中间表正常更新的情况