Merge branch 'PIPLFunctionCode0408'

buli

2022-04-08 f1c525740c6a45b875d8ed96fb0ddb68c97ef3df

 force-app/main/default/classes/OrderPdfController.cls

@@ -192,31 +192,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，Ltd';
                    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（USD 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（CHINA）LIMITED';
                    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，Ltd.';
                    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（USD 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（CHINA）LIMITED';
                    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 = '不随货';