From 89972a97b196b6ea08520f04bfce5f5affb26741 Mon Sep 17 00:00:00 2001
From: GWY <guweiyiscp096@foxmail.com>
Date: 星期五, 15 四月 2022 11:38:11 +0800
Subject: [PATCH] LS内贸等新二级证
---
force-app/main/default/classes/OrderPdf2Controller.cls | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/OrderPdf2Controller.cls b/force-app/main/default/classes/OrderPdf2Controller.cls
index 5de7524..65069b7 100644
--- a/force-app/main/default/classes/OrderPdf2Controller.cls
+++ b/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);
--
Gitblit v1.9.1