From 2f4492ee18f90274582fcc2bb06f5e9bf64136e8 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 13 五月 2022 17:32:14 +0800
Subject: [PATCH] ProdBackup0513
---
force-app/main/default/classes/OrderPdfController.cls | 81 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/force-app/main/default/classes/OrderPdfController.cls b/force-app/main/default/classes/OrderPdfController.cls
index 1609f66..f948883 100644
--- a/force-app/main/default/classes/OrderPdfController.cls
+++ b/force-app/main/default/classes/OrderPdfController.cls
@@ -99,7 +99,7 @@
PDF_Bi_Packing__c, PDF_Bi_Quality__c, PDF_Bi_Origin__c, PDF_Bi_Non_Wooden__c, PDF_Co_Contract__c, PDF_Co_Contract_E__c, PDF_Co_BContra__c, PDF_Co_BContra_E__c, PDF_SignaturePlaces__c,
PDF_Co_SContra__c, PDF_Co_SContra_E__c, PDF_C_Consignee__c, PDF_C_THECONSIGNE__c, PDF_C_Address__c, PDF_C_TEL__c, PDF_C_FAX__c, PDF_C_CONTACT__c,
PDF_BusyerCompany__c, PDF_By_Add__c, PDF_By_Tel__c, PDF_Forwarder__c, PDF_F_Add__c, PDF_F_TEL__c, PDF_F_FAX__c, PDF_F_ContactPerson__c,
- Opportunity.SpecialDeliveryAddress__c, Opportunity.SpecialDeliveryContact__c, DeliveryTimeText__c, DeliveryTimeTextEn__c,
+ Opportunity.SpecialDeliveryAddress__c, Opportunity.SpecialDeliveryContact__c, DeliveryTimeText__c, DeliveryTimeTextEn__c,PDF_Sp_LOADING_E__c,PDF_Sp_LOADING__c,
SpecialDeliveryAccount__c, SpecialDeliveryAccount_D__c, SpecialDeliveryContact2__c, SpecialDeliveryContact2_D__c, PDF_Order_No__c, Total_price_E__c, ContractPriceTotal__c,
PDF_Shipment_Term2_Text__c, PDF_PaymentTerms__c, PDF_PaymentTerms_E__c, PDF_Sign_Name__c, PDF_Sign_Title__c, org_order__c, Is_Already_Splited__c, PDF_Is_True__c
from Order where id = :Id];
@@ -171,6 +171,12 @@
if (od.PDF_B_contactperson__c == null || od.PDF_B_contactperson__c == '') {
od.PDF_B_contactperson__c = od.B_contactperson__c;
}*/
+ if (od.PDF_Sp_LOADING_E__c == null || od.PDF_Sp_LOADING_E__c == '') {
+ od.PDF_Sp_LOADING_E__c = 'Hong Kong';
+ }
+ if (od.PDF_Sp_LOADING__c == null || od.PDF_Sp_LOADING__c == '') {
+ od.PDF_Sp_LOADING__c = '棣欐腐';
+ }
if (od.PDF_SELLER__c == null || od.PDF_SELLER__c == '') {
od.PDF_Bi_q1__c = '2';
@@ -192,31 +198,31 @@
od.PDF_Co_SContra_E__c = 'one';
}
if ((Opp.ProductSegment__c == 'IE' || Opp.ProductSegment__c == 'RVI' || Opp.ProductSegment__c == 'BS') && Opp.TradeType__c == 'Tax Exemption') {
- od.PDF_SELLER__c = '濂ユ灄宸存柉棣欐腐涓浗鏈夐檺鍏徃';
- od.PDF_THE_SELLER__c = 'Olympus Hong Kong and China Limited';
- od.PDF_S_Adds__c = '棣欐腐鏂扮晫钁垫秾钁垫槍璺�51铏熶節榫嶈部鏄撲腑蹇�1搴�26妯�';
- od.PDF_S_Address__c = 'L26, Tower 1, Kowloon Commerce Centre, 51 Kwai Cheong Road, Kwai Chung, New Territories, Hong Kong.';
- od.PDF_S_TEL__c = '锛�852锛�2170 5678';
- od.PDF_S_FAX__c = '锛�852锛�2170 5679';
- od.PDF_S_Bank_Name__c = 'MUFG Bank锛孡td';
- od.PDF_S_Branch__c = 'Kowloon Branch';
- od.PDF_S_Bank_Address__c = '15/F, Peninsula Office Tower 18 Middle Road, Kowloon, Hong Kong';
- od.PDF_S_Account_No__c = '047-821-85800023837锛圲SD Saving Account锛�';
- od.PDF_S_Swift_Code__c = 'BOTKHKHH';
- od.PDF_S_Account_Name__c = 'Evident Corporation';
+ od.PDF_SELLER__c = '浠櫙閫氬厜瀛︾鎶�锛堜笂娴凤級鏈夐檺鍏徃';
+ od.PDF_THE_SELLER__c = 'Evident (Shanghai) Co., Ltd';
+ od.PDF_S_Adds__c = '涓浗锛堜笂娴凤級鑷敱璐告槗璇曢獙鍖烘棩妯卞寳璺�199-9鍙�102鍙�302閮ㄤ綅';
+ od.PDF_S_Address__c = 'PART 302&102,NO.199-9,NORTH RIYING ROAD,CHINA (SHANGHAI) PILOT FREE TRADE ZONE';
+ od.PDF_S_TEL__c = '021-58881300';
+ od.PDF_S_FAX__c = '';
+ od.PDF_S_Bank_Name__c = 'SUMITOMO MITSUI BANKING CORPORATION锛圕HINA锛塋IMITED';
+ od.PDF_S_Branch__c = '';
+ od.PDF_S_Bank_Address__c = '11F, SHANGHAI WORLD FINANCIAL CENTER, 100 CENTURY AVENUE, PUDONG NEW AREA ,SHANGHAI 200120, PEOPLE\'S REPUBLIC OF CHINA';
+ od.PDF_S_Account_No__c = '40453301';
+ od.PDF_S_Swift_Code__c = 'SMBCCNSH';
+ od.PDF_S_Account_Name__c = 'Evident(Shanghai)CO.,LTD';
} else if (( Opp.ProductSegment__c == 'NDT' || Opp.ProductSegment__c == 'ANI') && Opp.TradeType__c == 'Tax Exemption') {
- od.PDF_SELLER__c = '濂ユ灄宸存柉棣欐腐涓浗鏈夐檺鍏徃';
- od.PDF_THE_SELLER__c = 'Olympus Hong Kong and China Limited';
- od.PDF_S_Adds__c = '棣欐腐鏂扮晫钁垫秾钁垫槍璺�51铏熶節榫嶈部鏄撲腑蹇�1搴�26妯�';
- od.PDF_S_Address__c = 'L26, Tower 1, Kowloon Commerce Centre, 51 Kwai Cheong Road, Kwai Chung, New Territories, Hong Kong';
- od.PDF_S_TEL__c = '锛�852锛�2170 5678';
- od.PDF_S_FAX__c = '锛�852锛�2170 5679';
- od.PDF_S_Bank_Name__c = 'The Bank Of Tokyo-Mitsubishi UFJ锛孡td.';
- od.PDF_S_Branch__c = 'Kowloon Branch ';
- od.PDF_S_Bank_Address__c = '15/F., Peninsula Office Tower, 18 Middle Road, Kowloon';
- od.PDF_S_Account_No__c = '047-821-85800023837锛圲SD Saving Account锛�';
- od.PDF_S_Swift_Code__c = 'BOTKHKHH';
- od.PDF_S_Account_Name__c = 'Olympus Hong Kong and China Limited';
+ od.PDF_SELLER__c = '浠櫙閫氬厜瀛︾鎶�锛堜笂娴凤級鏈夐檺鍏徃';
+ od.PDF_THE_SELLER__c = 'Evident (Shanghai) Co., Ltd';
+ od.PDF_S_Adds__c = '涓浗锛堜笂娴凤級鑷敱璐告槗璇曢獙鍖烘棩妯卞寳璺�199-9鍙�102鍙�302閮ㄤ綅';
+ od.PDF_S_Address__c = 'PART 302&102,NO.199-9,NORTH RIYING ROAD,CHINA (SHANGHAI) PILOT FREE TRADE ZONE';
+ od.PDF_S_TEL__c = '021-58881300';
+ od.PDF_S_FAX__c = '';
+ od.PDF_S_Bank_Name__c = 'SUMITOMO MITSUI BANKING CORPORATION锛圕HINA锛塋IMITED';
+ od.PDF_S_Branch__c = '';
+ od.PDF_S_Bank_Address__c = '11F, SHANGHAI WORLD FINANCIAL CENTER, 100 CENTURY AVENUE, PUDONG NEW AREA ,SHANGHAI 200120, PEOPLE\'S REPUBLIC OF CHINA';
+ od.PDF_S_Account_No__c = '40453301';
+ od.PDF_S_Swift_Code__c = 'SMBCCNSH';
+ od.PDF_S_Account_Name__c = 'Evident(Shanghai)CO.,LTD';
od.DeliveryTimeTextEn__c = 'Please refer to order confirmation';
od.DeliveryTimeText__c = '璇峰弬鑰冭鍗曠‘璁�';
od.PDF_Bi_AllBill__c = '涓嶉殢璐�';
@@ -530,7 +536,7 @@
PDF_C_Address__c, PDF_C_TEL__c, PDF_C_FAX__c, PDF_C_CONTACT__c , PDF_G_TrAndPre__c , PDF_G_SpecNo__c, PDF_F_Add__c, PDF_F_ContactPerson__c,
Opportunity.SpecialDeliveryAddress__c, Opportunity.SpecialDeliveryContact__c, Shipment_Term__c, Shipment_Term_D__c, Shipment_Term2__c, Shipment_Term2_D__c,
SpecialDeliveryAccount__c, SpecialDeliveryAccount_D__c, SpecialDeliveryContact2__c, SpecialDeliveryContact2_D__c, PDF_Order_No__c, DeliveryTimeText__c, DeliveryTimeTextEn__c, Total_price_E__c, ContractPriceTotal__c,
- PDF_Shipment_Term2_Text__c, PDF_PaymentTerms__c, PDF_PaymentTerms_E__c, PDF_Sign_Name__c, PDF_Sign_Title__c
+ PDF_Shipment_Term2_Text__c, PDF_PaymentTerms__c, PDF_PaymentTerms_E__c, PDF_Sign_Name__c, PDF_Sign_Title__c,PDF_Sp_LOADING__c,PDF_Sp_LOADING_E__c
from Order
where id = :Id];
ndtList = [select id, U8_Code__c, Quantity__c, Part_Number__c, Name_of_Goods__c from NDT_Produce__c where NDTOrder__c = :Id order by Id];
@@ -640,6 +646,23 @@
'51涓湀' => 'fifty-one (51) monthss',
'63涓湀' => 'sixty-three (63) months'
};
+ private static Map<String, String> QAapiMap1 = new Map<String, String> {
+ '12涓湀' => '12涓湀',
+ '15涓湀' => '15涓湀',
+ '18涓湀' => '18涓湀',
+ '21涓湀' => '21涓湀',
+ '24涓湀' => '24涓湀',
+ '27涓湀' => '27涓湀',
+ '30涓湀' => '30涓湀',
+ '33涓湀' => '33涓湀',
+ '36涓湀' => '36涓湀',
+ '48涓湀' => '48涓湀',
+ '60涓湀' => '60涓湀',
+ '39涓湀' => '39涓湀',
+ '51涓湀' => '51涓湀',
+ '63涓湀' => '63涓湀'
+ };
+
public class SetInfo {
private Integer maxLine = 36;
@@ -803,6 +826,8 @@
public String AllBills { get; private set; }
public String QAeng { get; private set; }
public String QAeng2 { get; private set; }
+ public String QAeng3 { get; private set; }
+ public String QAeng4 { get; private set; }
public String ShippingTerms { get; private set; }
public String pdf_c_consignee { get; private set; }
@@ -821,8 +846,10 @@
} else if (o.PDF_Bi_AllBill__c == '涓嶉殢璐�') {
AllBills = 'not with';
}
- QAeng = QAapiMap.get(o.PDF_QA__c);
+ QAeng = QAapiMap1.get(o.PDF_QA__c);
+ QAeng4 = QAapiMap1.get(o.PDF_QA2__c);
QAeng2 = QAapiMap.get(o.PDF_QA2__c);
+ QAeng3 = QAapiMap.get(o.PDF_QA__c);
if (o.PDF_Sp_ShippingTerms__c == '娴疯繍') {
ShippingTerms = 'by sea';
} else if (o.PDF_Sp_ShippingTerms__c == '绌鸿繍') {
--
Gitblit v1.9.1