From eeb7c0a2d6f037d515bb822d739036b69c4dc73a Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期五, 08 四月 2022 17:14:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/FixtureRentalPDFController.cls | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/FixtureRentalPDFController.cls b/force-app/main/default/classes/FixtureRentalPDFController.cls
index e46da8c..da042cf 100644
--- a/force-app/main/default/classes/FixtureRentalPDFController.cls
+++ b/force-app/main/default/classes/FixtureRentalPDFController.cls
@@ -35,14 +35,14 @@
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');
- staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Rental_Apply__c'));
- staticResourceFile = JSON.serialize(PIHelper.getPIIntegrationInfo('Document'));
+
addFlag = false;
rentalApplyId = new List<String>();
if(tempStr != null){
@@ -56,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>();
@@ -103,6 +105,7 @@
Agency_Address_Id__c,//20201124 LJH OCSM_BP5-61 add
Root_Rental_Apply__c,//20210617 ljh 1732 add
BRId__c, // 20211209 ljh SFDC-C923SR add
+ direct_send__c,
QRImg__c,
QRId__c,
AWS_Data_Id__c,//20220304
@@ -115,6 +118,7 @@
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>();
@@ -353,7 +357,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;
--
Gitblit v1.9.1