涂煌豪
2022-03-24 7a6bde159e19c304b3a512ed21171b7ce09055d9
force-app/main/default/classes/ControllerUtil.cls
@@ -2915,8 +2915,8 @@
        // 现有联系人
        Map<String, Contact> conMap = new Map<String, Contact>();
        // UserToContact の 変更したか にて判断した項目です
        List<User> usrList = [select Id, Notes_File_Name__c,FirstName, LastName, Email, Mobile_Phone__c, Employee_No__c, Work_Location__c, Post__c, Job_Category__c, Hire_Date__c, Gender__c, Dept__c, Pregnant_Rest__c, Salesdepartment__c, Stay_or_not__c,IsMEBG__c from User where Employee_No__c IN :userEmployeeNoList];
        List<Contact> conList = [select Id,Notes_File_Name__c, User__c, Employee_No_manual__c,Isactive__c,IsMEBG__c from Contact where Employee_No_manual__c IN :userEmployeeNoList and RecordTypeId = :rtId];
        List<User> usrList = [select Id, Notes_File_Name__c,FirstName, LastName, Email, Mobile_Phone__c, Employee_No__c, Work_Location__c, Post__c, Job_Category__c, Hire_Date__c, Gender__c, Dept__c, Pregnant_Rest__c, Salesdepartment__c, Stay_or_not__c,IsMEBG__c, Work_Location_HR__c from User where Employee_No__c IN :userEmployeeNoList];
        List<Contact> conList = [select Id,Notes_File_Name__c, User__c, Employee_No_manual__c,Isactive__c,IsMEBG__c, Work_Location_HR__c from Contact where Employee_No_manual__c IN :userEmployeeNoList and RecordTypeId = :rtId];
        for (Contact con : conList) {
            //conMap.put(con.Employee_No_manual__c, con);
            conMap.put(con.Employee_No_manual__c.toLowerCase(), con);
@@ -2951,6 +2951,9 @@
                tmp.MobilePhone = local.Mobile_Phone__c;
                tmp.Employee_No_manual__c = local.Employee_No__c;
                tmp.Work_Location_manual__c = local.Work_Location__c;
                //用户的工作地(人事)改变更新到联系人上 thh 2022-02-16 start
                tmp.Work_Location_HR__c = local.Work_Location_HR__c;
                //用户的工作地(人事)改变更新到联系人上 thh 2022-02-16 end
                tmp.Post_picklist__c = local.Post__c;
                tmp.Job_Category_picklist__c = local.Job_Category__c;
                tmp.Hire_date_text__c = local.Hire_Date__c; 
@@ -2977,6 +2980,10 @@
                tmp.MobilePhone = local.Mobile_Phone__c;
                tmp.Employee_No_manual__c = local.Employee_No__c;
                tmp.Work_Location_manual__c = local.Work_Location__c;
                //如果根据HR信息新建用户,则把HR信息的工作地传给用户的工作地和工作地(人事) thh 2022-02-16 start
                tmp.Work_Location_HR__c = local.Work_Location__c;
                tmp.Work_Location_picklist__c = local.Work_Location__c;
                //如果根据HR信息新建用户,则把HR信息的工作地传给用户的工作地和工作地(人事) thh 2022-02-16 end
                tmp.Post_picklist__c = local.Post__c;
                tmp.Job_Category_picklist__c = local.Job_Category__c;
                tmp.Hire_date_text__c = local.Hire_Date__c; 
@@ -3069,7 +3076,9 @@
                    userData.Dept__c = odsc.Category4__c;//本部
                }
                userData.Category5__c = odsc.Category5__c;//部
                userData.Category6__c = odsc.Category6__c;//课
                //LLIU-CCS8ZB-当新创建的时候接收人事信息中的课信息,之后不进行更新 thh 20220324 start
                // userData.Category6__c = odsc.Category6__c;//课
                //LLIU-CCS8ZB-当新创建的时候接收人事信息中的课信息,之后不进行更新 thh 20220324 end
                //userData.Employee_No__c = odsc.Employee_No__c;//员工编码
                userData.Hire_Date__c = odsc.Hire_Date__c;//入职日期
                //userData.Email = odsc.Email__c;//电子邮件
@@ -3092,7 +3101,9 @@
                }
                //userData.Product_specialist_incharge_product__c = odsc.Product_specialist_incharge_product__c;//负责产品(主)
                //userData.Sales_Speciality__c = odsc.Sales_Speciality__c;//销售工作内容
                userData.Work_Location__c = odsc.Work_Location__c;//工作地
                //HR信息上的工作地更新到用户的工作地(人事)上 thh 2022-02-16 start
                userData.Work_Location_HR__c = odsc.Work_Location__c;
                //HR信息上的工作地更新到用户的工作地(人事)上 thh 2022-02-16 end
                userData.Stay_or_not__c = odsc.Stay_or_not__c;//在职/已离职
                //由于user有一个验证规则,如果值为已离职,那么PBI不能为true,所以手动设置为false,并把PBI对象的值设为false
                if(userData.Stay_or_not__c == '已离职' && userData.PBI_Enable__c){//PBI是否启用
@@ -3136,7 +3147,10 @@
                userData.Null_Update__c = odsc.Null_Update__c;
                userData.Product_specialist_incharge_product__c = odsc.Product_specialist_incharge_product__c;//负责产品(主)
                userData.Sales_Speciality__c = odsc.Sales_Speciality__c;//销售工作内容
                userData.Work_Location__c = odsc.Work_Location__c;//工作地
                //如果根据HR信息新建用户,则把HR信息的工作地传给用户的工作地和工作地(人事) thh 2022-02-16 start
                userData.Work_Location_HR__c = odsc.Work_Location__c;
                userData.Work_Location__c = odsc.Work_Location__c;
                //如果根据HR信息新建用户,则把HR信息的工作地传给用户的工作地和工作地(人事) thh 2022-02-16 end
                userData.Stay_or_not__c = odsc.Stay_or_not__c;//在职/已离职
                userData.QuitDate__c = odsc.LeaveDate__c;//离职日期
                userData.IsMEBG__c=true;//是否MEBG
@@ -5158,7 +5172,12 @@
                                        Discount_Amount_F__c,
                                        Discount_Amount_Calculate_F__c,
                                        BidAnnounce__c,
                                        Quote_No_last2__c
                                        Quote_No_last2__c,
                                        // 2022-03-21 SWAG-CBX5NN start
                                        multiYearWarranty__c,
                                        MultiYearWarrantyTotalPrice__c
                                        // 2022-03-21 SWAG-CBX5NN end
                                    FROM
                                        Quote
                                    WHERE 
@@ -5194,6 +5213,15 @@
                                                Qty_Unit__c,Cost__c,UnitPrice__c,ListPrice__c,Quantity,TotalPrice__c,
                                                PricebookEntry.Product2.SFDA_Status__c, ProductCode__c, Product_Cost__c,PricebookEntry.Product2.VenderName__c, Product2.VenderName__c,Product_ListPrice__c, PricebookEntry.Product2.Sales_Possibility__c, PricebookEntry.Product2.Name,
                                                PricebookEntryId, PricebookEntry.Product2Id,UnitPrice_Page__c,PricebookEntry.Product2.Packing_list_manual__c,PricebookEntry.Product2.StorageStatus__c
                                                // 2022-03-21 SWAG-CBX5NN start
                                                ,If_Cancel_Guarantee__c
                                                ,multiYearWarranty__c
                                                ,CanNotCancelFlag__c
                                                ,ProductEntend_gurantee_period_all__c
                                                ,warrantyType__c
                                                ,GuaranteePeriod__c
                                                ,GuranteeType__c
                                                // 2022-03-21 SWAG-CBX5NN end
                                                From QuoteLineItem where Quoteid = :QuoteidOldList];
        for(QuoteLineItem qli : oldQuoteitemList){
            QuidWithQLitem.put(qli.Quoteid,qli);