class

GWY

2022-04-06 7560140a14a60e949e6130d98225297e84f0a198

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

@@ -30,12 +30,12 @@
    private Integer eachCnt = 48;
    private Integer lastMaxCnt = 35;

    private Integer iRfirstCnt = 6;
    private Integer iRfirstCnt = 9;
    private Integer iRfirstMaxCnt = 23;
    private Integer iReachCnt = 48;
    private Integer iRlastMaxCnt = 30;

    private Integer nAfirstCnt = 6;
    private Integer nAfirstCnt = 9;
    private Integer nAfirstMaxCnt = 23;
    private Integer nAeachCnt = 48;
    private Integer nAlastMaxCnt = 30;
@@ -103,7 +103,7 @@
        List<Order> orderList = [select Id, AccountId, OpportunityId, Opportunity.Dealer__c, Opportunity.SpecialDeliveryAddress__c, Opportunity.SpecialDeliveryContact__c,Opportunity.InquiryNumber__c,
                                        PDF_S_Name__c, PDF_S_Address__c, PDF_S_City__c, PDF_S_Province__c, PDF_S_Phone__c,Opportunity.CreatedBy.ContactId,CreatedBy.ContactId,
                                        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,CrossCooperativeProject__c,Dealer_A__c,
                                        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,
                                        SpecialDeliveryAccount__c, SpecialDeliveryAccount_D__c, SpecialDeliveryContact2__c, SpecialDeliveryContact2_D__c
@@ -132,12 +132,12 @@
        }*/
        buyer = new Account();
        if (order.Opportunity.Dealer__c != null) {
             if (order.CrossCooperativeProject__c) {
             /*if (order.CrossCooperativeProject__c) {
                buyer = [select Id, Name, Address1__c,Business_license__c, City__c, Province__c, Phone from Account where Id = :order.Dealer_A__c];
            }else{
                buyer = [select Id, Name, Address1__c,Business_license__c, City__c, Province__c, Phone from Account where Id = :order.Opportunity.Dealer__c];
            }
            //buyer = [select Id, Name, Address1__c,Business_license__c, City__c, Province__c, Phone from Account where Id = :order.Opportunity.Dealer__c];
            }*/
            buyer = [select Id, Name, Address1__c,Business_license__c, City__c, Province__c, Phone from Account where Id = :order.Opportunity.Dealer__c];
        }
        notSpecialDealer = !StaticParameter.specialDealerMap.containsKey(((String)order.Opportunity.Dealer__c));
        system.debug('order.Opportunity.Dealer__c' + order.Opportunity.Dealer__c);
@@ -579,11 +579,11 @@
        seller_province1 = '北京';
        seller_phone1 = '010-58199000';

        seller_name2 = '奥林巴斯（北京）销售服务有限公司上海分公司';
        seller_address2 = '上海市徐汇区淮海中路1010号1001-1006、1101、1102、1104-1106、1601室';
        seller_name2 = '仪景通光学科技（上海）有限公司';
        seller_address2 = '中国（上海）自由贸易试验区日樱北路199-9号102及302部位';
        seller_city2 = '上海';
        seller_province2 = '上海';
        seller_phone2 = '021-51582084';
        seller_phone2 = '021-58881300';

        header = new HeaderInfo();
        inputDetails = new List<DetailInfo>();