From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/classes/NFM202Controller.cls | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/NFM202Controller.cls b/force-app/main/default/classes/NFM202Controller.cls
index 107a832..201028c 100644
--- a/force-app/main/default/classes/NFM202Controller.cls
+++ b/force-app/main/default/classes/NFM202Controller.cls
@@ -409,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; // 鍖婚櫌浠ｇ爜
--
Gitblit v1.9.1