From 1b1347f2e6d40aa75bbfdfb4789d60efeff13ea8 Mon Sep 17 00:00:00 2001
From: GWY <guweiyiscp096@foxmail.com>
Date: 星期五, 15 四月 2022 09:41:12 +0800
Subject: [PATCH] LS内贸未发货和以后的不显示二级经营证(临时)

---
 force-app/main/default/pages/OrderPdf2.page            |   12 +++++++++++-
 force-app/main/default/classes/OrderPdf2Controller.cls |   15 ++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/classes/OrderPdf2Controller.cls b/force-app/main/default/classes/OrderPdf2Controller.cls
index 8383a32..5de7524 100644
--- a/force-app/main/default/classes/OrderPdf2Controller.cls
+++ b/force-app/main/default/classes/OrderPdf2Controller.cls
@@ -20,6 +20,7 @@
     public String strToday { get; set; }
     public boolean is_parts_direct { get; set; }
     public boolean is_ie_direct { get; set; }
+    //public String approveStatus { get; set; }
 
     public Integer pageCnt { get; set; }
     public boolean fistPageBreak { get; set; }
@@ -63,6 +64,11 @@
     public String ndt_fax{get;set;}
 
     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');
@@ -106,7 +112,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
+                                        SpecialDeliveryAccount__c, SpecialDeliveryAccount_D__c, SpecialDeliveryContact2__c, SpecialDeliveryContact2_D__c,ApproveStatus__c,CreatedDate,Is_DeliveredTem__c  
                                    from Order where Id = :id];
         if (orderList.size() == 0) {
             return null;
@@ -116,6 +122,13 @@
         productSegment = order.Opportunity.ProductSegment__c;
         is_parts_direct = false;
         is_ie_direct = false;
+        //gwy 4鏈�11鍙锋柊鍏徃杩樻病鏈変簩绾у妗堣瘉
+        delivered = order.Is_DeliveredTem__c;
+        /*approveStatus = order.ApproveStatus__c;
+        Datetime date2 = order.CreatedDate;
+        Datetime date3 = Datetime.newInstance(2022,4,11,0,0,0);
+        fourMaand = date2>date3 ? true:false;*/
+        //杩樺墿涓嬫湁浜嗘柊鐨勪簩绾у妗堣瘉鐨勪唬鐮�
         if (order.Opportunity.ProductSegment__c == 'IE' && order.Opportunity.SalesChannel__c == 'direct') {
             is_ie_direct = true;
         }
diff --git a/force-app/main/default/pages/OrderPdf2.page b/force-app/main/default/pages/OrderPdf2.page
index 9737a5a..aa0870c 100644
--- a/force-app/main/default/pages/OrderPdf2.page
+++ b/force-app/main/default/pages/OrderPdf2.page
@@ -45,7 +45,17 @@
             </apex:outputPanel>
         </tr>
 
-        <apex:outputPanel rendered="{!IF(productSegment == 'BS', true, false)}" layout="none">
+        <apex:outputPanel rendered="{!IF(productSegment == 'BS' && delivered, true, false)}" layout="none">
+            <tr>
+                <td style="text-align: right;" >浜岀被缁忚惀澶囨鍑瘉锛�</td>
+                <td style="text-align: left;">{!header.buyer_code}</td>
+                <td style="text-align: right;">&nbsp;</td>
+                <td style="text-align: left;">&nbsp;</td>
+                <!-- <td style="text-align: right;">浜岀被缁忚惀澶囨鍑瘉锛�</td>
+                <td style="text-align: left;">娌緪椋熻嵂鐩戞缁忚惀澶�20160318鍙�</td> -->
+            </tr>
+        </apex:outputPanel>
+        <apex:outputPanel rendered="{!IF(productSegment == 'BS' && delivered == false, true, false)}" layout="none">
             <tr>
                 <td style="text-align: right;" >浜岀被缁忚惀澶囨鍑瘉锛�</td>
                 <td style="text-align: left;">{!header.buyer_code}</td>

--
Gitblit v1.9.1