gzw 正式环境最新代码更新

高章伟

2023-03-02 e3c02c03dd2de442bbced87236f60a13a1cd154e

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

@@ -157,6 +157,7 @@
                                 PCLLostBrand__r.AgencyMannual__c,                                    // 中标经销商（手动）
                                 PCLLostBrand__r.Lost_cancel_report__r.LostType__c,                   // 失单类型
                                 PCLLostBrand__r.Lost_cancel_report__r.LostTotalAmount__c,            // 失单总金额
                                 PCLLostBrand__r.Lost_cancel_report__r.TotalAmountLost__c,           // 失单总金额（不含税）  //20230215 lt DB202302247719
                                 PCLLostBrand__r.Lost_cancel_report__r.of_lost_system_processor__c,   // 失单主机台数
                                 PCLLostBrand__r.Lost_cancel_report__r.Opportunity__c 
                              from 
@@ -187,7 +188,8 @@
         }
         // 赋值
         opp.LostTypeText__c = lost.PCLLostBrand__r.Lost_cancel_report__r.LostType__c;       // 失单类型
         opp.LostPrices__c = lost.PCLLostBrand__r.Lost_cancel_report__r.LostTotalAmount__c;  // 失单金额
         //opp.LostPrices__c = lost.PCLLostBrand__r.Lost_cancel_report__r.LostTotalAmount__c;  // 失单金额 //20230215 lt DB202302247719 注释
         opp.LostPrices__c = lost.PCLLostBrand__r.Lost_cancel_report__r.TotalAmountLost__c;  // 失单金额  //20230215 lt DB202302247719
         opp.Lost_reason_main__c = lost.PCLLostBrand__r.Lost_reason_main__c;                 // 失单原因（主）
         opp.Lost_Reason_Sub__c = lost.PCLLostBrand__r.Lost_Reason_Sub__c;                   // 失单理由（次）
         opp.of_lost_system_processor__c += lost.Quantity__c;                                // 失单主机台数（累加）
@@ -226,11 +228,15 @@
      // 初始化参数
      String plus = '';
      // 判断   
      if ('其他'.equals(lost_brand) && String.isNotBlank(lost_brand_mannual)) {
         plus = lost_brand_mannual;
      } else {
         plus = lost_brand;
      }
      // SWAG-CCC6F6 2022-04-22 ssm start
      // 询价上都只显示选项列表的值，不需要手动的值
      // if ('其他'.equals(lost_brand) && String.isNotBlank(lost_brand_mannual)) {
      //    plus = lost_brand_mannual;
      // } else {
      //    plus = lost_brand;
      // }
      plus = lost_brand;
      // SWAG-CCC6F6 2022-04-22 ssm end
      // 初始化返回值
      if (String.isBlank(lost_brand_in_opp)) {
         lost_brand_in_opp = '';
@@ -251,11 +257,15 @@
      // 初始化参数
      String plus = '';
      // 判断   
      if ('对手经销商'.equals(lost_agency) && String.isNotBlank(lost_agency_mannual)) {
         plus = lost_agency_mannual;
      } else {
         plus = lost_agency;
      }
      // SWAG-CCC6F6 2022-04-22 ssm start
      // 询价上都只显示选项列表的值，不需要手动的值
      // if ('对手经销商'.equals(lost_agency) && String.isNotBlank(lost_agency_mannual)) {
      //    plus = lost_agency_mannual;
      // } else {
      //    plus = lost_agency;
      // }
      plus = lost_agency;
      // SWAG-CCC6F6 2022-04-22 ssm end
      // 初始化返回值
      if (String.isBlank(lost_agency_in_opp)) {
         lost_agency_in_opp = '';