OlympusSSBG.git

			@@ -64,6 +64,7 @@
			public String ndt_fax{get;set;}

			public Boolean notSpecialDealer { get; set; }
			public String staticResource { get;private set; }
			//4月11号之后
			//public Boolean fourMaand { get; set; }
			//发货月
			@@ -82,6 +83,8 @@

			Date today = Date.today();
			strToday = today.format();

			staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));// 20220222 PI改造 by Bright
			}

			public PageReference init() {
			@@ -111,6 +114,7 @@
			PDF_Property__c, Opportunity.Name, PDF_No__c, Description, PDF_Order_No__c,CrossCooperativeProject__c,
			Olympus_Price_BeforeDiscount_D__c, Discount_D__c, OlympusContractPricesD__c, CustomerContractPriceD__c,
			Opportunity.ProductSegment__c, Opportunity.SalesChannel__c, Opportunity.Machine_Parts__c,
			AWS_Data_Id__c, // 20220222 PI改造 by Bright
			SpecialDeliveryAccount__c, SpecialDeliveryAccount_D__c, SpecialDeliveryContact2__c, SpecialDeliveryContact2_D__c,Opportunity.DeliveryDate__c
			from Order where Id = :id];
			if (orderList.size() == 0) {
			@@ -174,7 +178,9 @@

			delivery_contact = new Contact();
			if (order.SpecialDeliveryContact2_D__c != null) {
			delivery_contact = [select Id, Department, Name, Phone, MobilePhone,Address1__c from Contact where Id = :order.SpecialDeliveryContact2_D__c];
			delivery_contact = [select Id, Department, Name, Phone, MobilePhone,
			AWS_Data_Id__c, // 20220222 PI改造 by Bright
			Address1__c from Contact where Id = :order.SpecialDeliveryContact2_D__c];
			}

			user = new Account();
			@@ -192,7 +198,9 @@
			}
			contact = new Contact();
			if (contactid != null && contactid.length() > 0) {
			contact = [select Id, Department, Name, Phone, MobilePhone,Fax,Email from Contact where Id = :contactid];
			contact = [select Id, Department, Name, Phone, MobilePhone,Fax,
			AWS_Data_Id__c, // 20220222 PI改造 by Bright
			Email from Contact where Id = :contactid];
			}

			List<OrderItem> oiList = [select Id, PriceBookEntry.Product2.ProductCode, PriceBookEntry.Product2.Product_ECCode__c,PriceBookEntry.Product2.Name,PriceBookEntry.Product2.registrationCode__c,
			@@ -611,6 +619,7 @@
			Name, Opportunity.ExpectedDeliveryDate__c, PDF_Sap_No__c, OrderNumber, Opportunity.SubDealer__c,
			PDF_Property__c, Opportunity.Name, PDF_No__c, Description, PDF_Order_No__c,
			Olympus_Price_BeforeDiscount_D__c, Discount_D__c, OlympusContractPricesD__c, CustomerContractPriceD__c,
			AWS_Data_Id__c, // 20220222 PI改造 by Bright
			Opportunity.ProductSegment__c
			from Order where Id = :id];
			if (orderList.size() == 0) {
			@@ -757,6 +766,7 @@
			public String delivery_user { get; set; }
			public String delivery_phone { get; set; }
			public String delivery_tel { get; set; }
			public String delivery_aws_data_id { get; set; }// 20220222 PI改造 by Bright
			// 最终用户信息
			public String user_name { get; set; }
			public String user_no { get; set; }
			@@ -772,6 +782,7 @@
			public String user_property_IE { get; set; }
			public String user_product_IE { get; set; }
			public String user_market_RVI { get; set; }
			public String user_aws_data_id { get; set; }// 20220222 PI改造 by Bright
			// 订单信息2
			public Decimal order_subtotal { get; set; }
			public Decimal order_discount_rate { get; set; }
			@@ -819,6 +830,7 @@
			delivery_user = delivery_contact.Name;
			delivery_phone = delivery_contact.Phone;
			delivery_tel = delivery_contact.MobilePhone;
			delivery_aws_data_id = delivery_contact.AWS_Data_Id__c;// 20220222 PI改造 by Bright

			user_name = user.Name;
			user_no = user.ManagementCode_F__c;
			@@ -831,6 +843,7 @@
			user_fax = contact.Fax;
			user_email = Contact.Email;
			user_tel = contact.MobilePhone;
			user_aws_data_id = contact.AWS_Data_Id__c;// 20220222 PI改造 by Bright
			user_property_IE = order.PDF_Property__c;
			user_product_IE = user.Sub_Use__c == 'Automotive' ? '汽车' : user.Sub_Use__c;
			user_market_RVI = user.Sub_Use__c;