From f7484973dc7c94fd41f23ef83d511f082cb0131e Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 24 五月 2024 16:37:19 +0800
Subject: [PATCH] 1

---
 force-app/main/default/classes/QuoteTrialController.cls |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/classes/QuoteTrialController.cls b/force-app/main/default/classes/QuoteTrialController.cls
index 9b6f039..917cdd3 100644
--- a/force-app/main/default/classes/QuoteTrialController.cls
+++ b/force-app/main/default/classes/QuoteTrialController.cls
@@ -1,4 +1,5 @@
-public  class QuoteTrialController{
+// 20240226 ssm 2S6-2鏃犳硶瑕嗙洊2S6-1鍒涘缓鐨勬姤浠疯绠楃粨鏋滐紝鏀规垚without sharing
+public without sharing class QuoteTrialController{
 
      public static String ParamId;
        //鑾峰彇 鎶ヤ环鏁版嵁
@@ -70,6 +71,7 @@
      QuoteTrialService dao =  new QuoteTrialService();
        String[] arrTest = new String[] {'PromotionNo__cEqual','NameLike'}; 
        PagePlus pages = dao.GetPromotionPromotionSearchFn(page,pageLimit,search,sortOrder,sortPlus,arrTest);  
+       System.debug(pages);
        return JSON.serialize(pages);
      // return DataBasePlus.Mysql;
     }
@@ -139,7 +141,7 @@
           string sql = 'select ';
           String query = CommonUtils.GetSqlToPorps(PromotionSalesProducts__c.SObjectType);
           sql += query;
-          sql +=' ,	Product2__r.Intra_Trade_List_RMB__c,Product2__r.Intra_Trade_Service_RMB__c,Product2__r.Foreign_Trade_List_US__c,Product2__r.NoDiscount_Foreign__c,Product2__r.MDM_Model_No__c ';
+          sql +=' ,  Product2__r.Intra_Trade_List_RMB__c,Product2__r.Intra_Trade_Service_RMB__c,Product2__r.Foreign_Trade_List_US__c,Product2__r.NoDiscount_Foreign__c,Product2__r.MDM_Model_No__c ';
           sql += ' from PromotionSalesProducts__c where QuantityId__c = :ParamIdStr ';
           List<PromotionSalesProducts__c> arrays = Database.query(sql);
           return arrays;
@@ -394,6 +396,9 @@
                                    TotalPrice__c,                   // 鎬讳环
                                    Estimation_List_Price__c,        // 鏍囧噯List浠锋牸
                                    MultiYearWarrantyTotalPrice__c   // 澶氬勾淇濆悎璁�
+                                    // DB202311242191 銆愭姤浠峰崟銆戞姤浠峰崟鍚堝悓閲戦鏇存柊鍜岀敓鎴愭柊鎶ヤ环鍗曡鍒欑‘璁ゅ拰淇敼 fy start
+                                   ,Dealer_Final_Price__c
+                                    // DB202311242191 銆愭姤浠峰崟銆戞姤浠峰崟鍚堝悓閲戦鏇存柊鍜岀敓鎴愭柊鎶ヤ环鍗曡鍒欑‘璁ゅ拰淇敼 fy end
                               from Quote where Id = :QuoteId];
                quote.OCM_Sales_Forecast__c=ContractPrice;
                System.debug('quote:' + quote);
@@ -402,6 +407,9 @@
                opportunity.Id=OpportunityId;
                opportunity.Wholesale_Price__c=ContractPrice;
                System.debug('opportunity:'+opportunity);
+               // DB202311242191 銆愭姤浠峰崟銆戞姤浠峰崟鍚堝悓閲戦鏇存柊鍜岀敓鎴愭柊鎶ヤ环鍗曡鍒欑‘璁ゅ拰淇敼 fy start
+               quote.Dealer_Final_Price__c = DealerFinalPriceFc;
+               // DB202311242191 銆愭姤浠峰崟銆戞姤浠峰崟鍚堝悓閲戦鏇存柊鍜岀敓鎴愭柊鎶ヤ环鍗曡鍒欑‘璁ゅ拰淇敼 fy end
                if(SalesRootc.equals('璨╁2搴�')){
                     //璧嬪�肩粰涓嬮潰鐨� 鍚堝悓閲戦 骞剁疆鐏颁笉鍙紪杈�
                     quote.OCM_Agent1_Price_Page__c=ContractPrice;

--
Gitblit v1.9.1