From 843f41fdaf41c0f8178f8f6b391f17a880423e2e Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 31 三月 2022 18:45:39 +0800
Subject: [PATCH] Merge branch 'PIPLFunctionDeployProd0331'
---
force-app/main/default/classes/FixtureRentalPDFController.cls | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/FixtureRentalPDFController.cls b/force-app/main/default/classes/FixtureRentalPDFController.cls
index eeeb5c1..c0f63b5 100644
--- a/force-app/main/default/classes/FixtureRentalPDFController.cls
+++ b/force-app/main/default/classes/FixtureRentalPDFController.cls
@@ -30,12 +30,20 @@
public String centreAddress { get; set; }
public Boolean IsShowLU { get; set; } //鏄惁鏄剧ず绛炬敹鍗曞乏涓婅鏂囧瓧 true鏄剧ず 20201119 LJH OCSM_BP5-61 add
public Boolean IsMain; //鏄惁鏄幇鍦板垎閰嶇殑涓诲崟 20201120 LJH OCSM_BP5-61 add
+
+ public string staticResource { get; private set; }
+ public string staticResourceFile { get; private set; }
+ public Boolean addFlag { get; private set; }//鏁忔劅鍦板潃浣跨敤鏍囪
+ public String qrcode { get; private set; }
+ public String barcode { get; private set; }
public FixtureRentalPDFController() {
pageNum = Integer.valueOf(ApexPages.currentPage().getParameters().get('page'));
rentalApplyIdIMG = ApexPages.currentPage().getParameters().get('raid');
//Apexpages.currentPage().getHeaders().put('X-UA-Compatible', 'IE=8');
// rentalApplyId = ApexPages.currentPage().getParameters().get('raid');//20201120 ljh
String tempStr = ApexPages.currentPage().getParameters().get('raid');
+
+ addFlag = false;
rentalApplyId = new List<String>();
if(tempStr != null){
rentalApplyId.add(tempStr);
@@ -48,6 +56,8 @@
// 鐢婚潰鍒濆鍖�
public void init() {
+ staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Rental_Apply__c'));
+ staticResourceFile = JSON.serialize(PIHelper.getPIIntegrationInfo('Document'));
// 鏂拌濂ユ灄宸存柉澶囧搧绛炬敹鍗昉DF鐢婚潰鍒濆鍖�
PageCutList = new List<List<String>>();
List<Rental_Apply__c> ApplyList = new List<Rental_Apply__c>();
@@ -96,13 +106,18 @@
Root_Rental_Apply__c,//20210617 ljh 1732 add
BRId__c, // 20211209 ljh SFDC-C923SR add
QRImg__c,
- QRId__c
+ QRId__c,
+ AWS_Data_Id__c,//20220304
+ Direct_Shippment_Address_Encrypt__c,//20220304
+ Phone_Number_Encrypt__c//20220304
from Rental_Apply__c
where id = :rentalApplyId];
}
if(ApplyList.size()>0){
ApplyHeadShow = ApplyList[0];
+ qrcode = ConsumTrialPDFController.GetImageBase64(ApplyHeadShow.QRId__c);
+ barcode = ConsumTrialPDFController.GetImageBase64(ApplyHeadShow.BRId__c);
}
//澧炲姞鍊熷嚭澶囧搧SET涓�瑙圠ist锛屼负浜嗚幏鍙栧�熷嚭澶囧搧SET涓�瑙堟槑缁�
List<String> RAESSearchList = New List<String>();
@@ -191,6 +206,7 @@
ShippMentAdr = ApplyHeadShow.Shippment_adress_detail__c;
} else {
ShippMentAdr = ApplyHeadShow.Direct_shippment_address__c;
+ addFlag = true;
}
Integer ShipAdrSize = ShippMentAdr == null ? 0 : ShippMentAdr.length();
@@ -313,7 +329,6 @@
Rental_Apply_Equipment_Set__r.Name,
Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name,
Rental_Apply_Equipment_Set__r.Loaner_code__c,
- // Rental_Apply_Equipment_Set__r.Received_ng_detail__c,// 20220124 ljh SFDC-C4U3PH add start
FSD_Name_CHN__c,
Fixture_Name_text__c,
Fixture_Model_No_F__c,
@@ -341,7 +356,7 @@
mainCnt = 0;
accessoryCnt = 0;
for (Rental_Apply_Equipment_Set_Detail__c ra : RAESDLine) {
- if (ra.Is_Body__c) {
+ if (ra.Is_Body__c) {
mainCnt += 1;
} else {
accessoryCnt += 1;
@@ -607,8 +622,6 @@
public String dQRCode { get; private set; } // 浜岀淮鐮�
private Integer maxLineContact;
public String wh_location { get; private set; } // 璐т綅鍙�
- // 20220124 ljh SFDC-C4U3PH add start
- // public String Received_ng_detail { get; private set; } // 鏀跺埌纭NG鍐呭
public String name1 { get; private set; }
@@ -672,7 +685,6 @@
//serialNumber2 = esd2.SerialNumber__c;
height = height ==null ? MAXLINEHRIGHT: height;
wh_location = raesd.Asset__r.WH_location__c;
- // Received_ng_detail = raesd.Rental_Apply_Equipment_Set__r.Received_ng_detail__c; // 20220124 ljh SFDC-C4U3PH add start
}
}
// Data Bean
--
Gitblit v1.9.1