GWY
2022-04-15 89972a97b196b6ea08520f04bfce5f5affb26741
force-app/main/default/classes/OrderPdf2Controller.cls
@@ -66,9 +66,8 @@
    public Boolean notSpecialDealer { get; set; }
    //4月11号之后
    //public Boolean fourMaand { get; set; }
    //是否发货
    //发货月
    public Boolean delivered { get; set; }
    public OrderPdf2Controller() {
        id = ApexPages.currentPage().getParameters().get('id');
@@ -112,7 +111,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,
                                        SpecialDeliveryAccount__c, SpecialDeliveryAccount_D__c, SpecialDeliveryContact2__c, SpecialDeliveryContact2_D__c,ApproveStatus__c,CreatedDate,Is_DeliveredTem__c
                                        SpecialDeliveryAccount__c, SpecialDeliveryAccount_D__c, SpecialDeliveryContact2__c, SpecialDeliveryContact2_D__c,Opportunity.DeliveryDate__c
                                   from Order where Id = :id];
        if (orderList.size() == 0) {
            return null;
@@ -123,7 +122,12 @@
        is_parts_direct = false;
        is_ie_direct = false;
        //gwy 4月11号新公司还没有二级备案证
        delivered = order.Is_DeliveredTem__c;
        delivered = false;
        Date deliveryM = order.Opportunity.DeliveryDate__c;
        Date isDelivery = Date.newInstance(2022, 4, 11);
        if (deliveryM <> null) {
            delivered = deliveryM >= isDelivery ? false : true;
        }
        /*approveStatus = order.ApproveStatus__c;
        Datetime date2 = order.CreatedDate;
        Datetime date3 = Datetime.newInstance(2022,4,11,0,0,0);