From a1369f4a77132580a86ea45b4f22cd3f8723664a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期三, 24 五月 2023 11:47:46 +0800
Subject: [PATCH] 20230524 stage backup
---
force-app/main/default/classes/DNUpsertBatch.cls | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/classes/DNUpsertBatch.cls b/force-app/main/default/classes/DNUpsertBatch.cls
index b23a318..a0bf320 100644
--- a/force-app/main/default/classes/DNUpsertBatch.cls
+++ b/force-app/main/default/classes/DNUpsertBatch.cls
@@ -622,13 +622,8 @@
tempeSF.DNName__c = tempDN.Name;
tempeSF.Statu_Achievements__c = tempDN.Statu_Achievements__c;
tempeSF.Statu_Achievements_DN__c = tempDN.ID;
- //Updated By Li Jun 20230420 start
- //tempeSF.Sales_assistant_name_text__c = tempDN.Sales_assistant_name_text__c;
- tempeSF.Sales_assistant_name_text__c = tempDN.Opportunity__c != null && tempDN.Opportunity__r.OCM_man_province_cus__c != '' && getManagementProvince().containsKey(tempDN.Opportunity__r.OCM_man_province_cus__c)?
- getManagementProvince().get(tempDN.Opportunity__r.OCM_man_province_cus__c).Window1__c: null;
-
+ tempeSF.Sales_assistant_name_text__c = tempDN.Sales_assistant_name_text__c;
tempeSF.RC_Manager__c = tempDN.RC_Manager__c;
- //Updated By Li Jun 20230420 end
//鐢熸垚绛炬敹鍗曟椂锛岀粰鏄惁鏃犲伩鍑哄簱璧嬪�� 绮剧悽鎶�鏈� thh 2021-10-15 start
if(tempDN.Statu_Achievements__r.orderType__c == 'ZM16'){
tempeSF.isFreeDelivery__c = true;
@@ -754,14 +749,15 @@
tempSADN.Is_Corrosion__c=opp.Is_Corrosion__c;
// 鐢靛瓙绛炬敹鍗� 璧嬪�艰惀涓氬姪鐞嗗拰钀ヤ笟绠＄悊閮ㄦ媴褰� start
//闆嗕腑閲囪喘鐨勮浠� 绮剧悽鎶�鏈� wql 2020/01/11 start
- //Add By Li Jun 20230420 Start
- 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 20230420 End
if(opp.Group_purchase_PCL__c){
+ 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{
+ 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
--
Gitblit v1.9.1