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/QuotePDFExtensionController.cls | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/QuotePDFExtensionController.cls b/force-app/main/default/classes/QuotePDFExtensionController.cls
index 2b9a22e..5d12af0 100644
--- a/force-app/main/default/classes/QuotePDFExtensionController.cls
+++ b/force-app/main/default/classes/QuotePDFExtensionController.cls
@@ -87,6 +87,7 @@
'娌冲崡鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�',
'娴欐睙鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'瀹夊窘鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
+ 'OSH-瀹夊窘鐪�' => '濂ユ灄宸存柉璐告槗锛堜笂娴凤級鏈夐檺鍏徃', //20230323 lt DB202303088261 涓ょエ鍒� add
'姹熻タ鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'绂忓缓鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'姹熻嫃鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
@@ -149,7 +150,8 @@
public String address {get; set;}
public String postCode {get;set;}
public String addressName {get;set;}
-
+ public String addressName1 {get;set;}//20230323 lt DB202303088261 涓ょエ鍒� start 鎶ヤ环鍗曠敤
+
public String salesRoot {get;set;}
public Decimal newTotalPrice {get;set;}
//WLIG-BYRD37 銆愬鎵樸�戣浠� 鎵撳嵃閰嶇疆鍗� 瀛楁淇敼 绮剧悽鎶�鏈� wql 2021/03/08 start
@@ -578,7 +580,13 @@
//鑾峰彇鍔炰簨澶勫湴鍧�
private void getShipmentaddress(){
String province = this.targetObj.Opportunity.SAP_Province__c;
-
+ //20230323 lt DB202303088261 涓ょエ鍒� start
+ String province1 = this.targetObj.Opportunity.SAP_Province__c;
+ if(province == 'OSH-瀹夊窘鐪�'){
+ province = '瀹夊窘鐪�';
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� end
+
List<Shipment_address__c> shipmentAddresses = [SELECT id, Address__c, Post_Code__c FROM Shipment_address__c WHERE Name=:province];
// 瑕嬬銈掑彇寰椼仹銇嶃仾銇勫牬鍚�
if ( shipmentAddresses.size() != 1) {
@@ -586,10 +594,22 @@
}
this.shipmentAddress = shipmentAddresses[0];
+ //20230323 lt DB202303088261 涓ょエ鍒� start
+ if(province1 == 'OSH-瀹夊窘鐪�'){
+ this.params.addressName1 = ' ';
+ if(addressNameApiMap.get(province1) != null){
+ this.params.addressName = addressNameApiMap.get(province1);
+ }else{
+ this.params.addressName = ' ';
+ }
+ }else
+ //20230323 lt DB202303088261 涓ょエ鍒� end
if(addressNameApiMap.get(province) != null){
this.params.addressName = addressNameApiMap.get(province);
+ this.params.addressName1 = addressNameApiMap.get(province); //20230323 lt DB202303088261 涓ょエ鍒� add
}else{
this.params.addressName = ' ';
+ this.params.addressName1 = ' '; //20230323 lt DB202303088261 涓ょエ鍒� add
}
this.params.address = this.shipmentAddress.Address__c;
--
Gitblit v1.9.1