From 41a627eaaf29658a401ac43e4da838a5b622f44e Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期一, 29 五月 2023 16:54:34 +0800
Subject: [PATCH] DB202303088261
---
force-app/main/default/classes/NFM202Controller.cls | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/NFM202Controller.cls b/force-app/main/default/classes/NFM202Controller.cls
index 8e4e6d0..201028c 100644
--- a/force-app/main/default/classes/NFM202Controller.cls
+++ b/force-app/main/default/classes/NFM202Controller.cls
@@ -58,21 +58,18 @@
// LHJ 澶氬勾淇濅慨 20190812 End
public String SFDC_DataID;
public Detail_element[] Items;
- //鎶ヤ环璇曠畻
+ //鎶ヤ环璇曠畻
public ProductDetais[] ProductDetais; //鎶ヤ环璇曠畻琛�
//20200810 ljh add start
//public String IsCorrosion;
//20200810 ljh add end
//闃胯タ璧涘 wql 20210331
public Boolean IsAcecide;
-
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� start
public String DepartmentName;
// CHAN-C9P5WM 20211216 ssm 澧炲姞绉戝鍚� end
-
-
public String winBiddingDate;//SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃�
-
+ public String CelonOpportunity;// 20220415 ljh SWAG-CCK8V4 add
}
public class Detail_element {
@@ -230,6 +227,7 @@
Closing_Bid_Date_Bid__c,
Closing_Bid_Date__c,
//SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃� end
+ CelonOpportunity__c, // 20220415 ljh SWAG-CCK8V4 add
Account.RecordType.DeveloperName
from Opportunity
@@ -411,8 +409,15 @@
quotation.SFDC_DataID = opp.ID;
quotation.TransType = transTypeMap.get(opp.id); // 璇环鍖哄垎
quotation.InquiryCode = opp.Opportunity_No__c; // 璇环缂栫爜
- quotation.Quote_Code = opp.Estimation_No__c; // 鎶ヤ环缂栫爜
- quotation.SalesPoint = opp.SAP_Province__c; // SAP涓婁紶鐪�
+ quotation.Quote_Code = opp.Estimation_No__c; // 鎶ヤ环缂栫爜
+ //20230322 lt DB202303088261 涓ょエ鍒� SAP涓婁紶鐪佸鍔� OSH-瀹夊窘鐪侊紝浣嗕紶缁橲PO 鈥滃畨寰界渷鈥� start
+ if(opp.SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ quotation.SalesPoint = '瀹夊窘鐪�';
+ }else{
+ quotation.SalesPoint = opp.SAP_Province__c; // SAP涓婁紶鐪�
+ }
+ // quotation.SalesPoint = opp.SAP_Province__c; // SAP涓婁紶鐪�
+ //20230322 lt DB202303088261 涓ょエ鍒� SAP涓婁紶鐪佸鍔� OSH-瀹夊窘鐪侊紝浣嗕紶缁橲PO 鈥滃畨寰界渷鈥� end
quotation.Province = opp.State__c; // 鐪佷唤
quotation.City = opp.City__c; // 甯�/鍦板尯
quotation.HPCode = opp.HP_Management_Code__c; // 鍖婚櫌浠ｇ爜
@@ -487,6 +492,7 @@
//SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃� start
quotation.winBiddingDate = opp.Closing_Bid_Date_Bid__c ==null? NFMUtil.formatDate2Str(opp.Closing_Bid_Date__c) : NFMUtil.formatDate2Str(opp.Closing_Bid_Date_Bid__c);
//SWAG-CCL6R7 2022-3-22 yjk 澧炲姞涓爣鏃� end
+ quotation.CelonOpportunity = opp.CelonOpportunity__c; // 20220415 ljh ljh SWAG-CCK8V4 add
// 浜у搧
List<OpportunityLineItem> oppLineList = oppIDMap.get(opp.id);
quotation.Items = new List<Detail_element>();
--
Gitblit v1.9.1