From ffee9cf95ba62dc86680ddfe4bbfc7fcb51ef1bf Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期四, 07 四月 2022 16:04:01 +0800
Subject: [PATCH] 先款后修20220407
---
force-app/main/default/classes/SelectAssetEstimateVMController.cls | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/classes/SelectAssetEstimateVMController.cls b/force-app/main/default/classes/SelectAssetEstimateVMController.cls
index cd4eb7f..8a50dbe 100644
--- a/force-app/main/default/classes/SelectAssetEstimateVMController.cls
+++ b/force-app/main/default/classes/SelectAssetEstimateVMController.cls
@@ -1,3 +1,4 @@
+/*gzw 浼樺寲Maximum view state size limit 杩藉姞 Transient */
global class SelectAssetEstimateVMController {
//test
private String targetHospitalId = null; // 浠婂緦绯诲垪鐥呴櫌鐢�
@@ -25,7 +26,7 @@
public Asset ass { get; set; }
// 2021銆�8銆�26 鍚堝悓鎶ヤ环椤甸潰鐨勪紭鍖栵紝鏃犱繚鏈夎澶囩偣妫�瀵硅薄閫夋嫨妗嗗彉榛� fxk end
// 鐥呴櫌閰嶄笅銇磵鍏ユ鍣ㄣ伄鎯呭牨銈掓牸绱嶃仚銈嬨��
- private List<Asset> assetRecords; // TODO 绯诲垪鐥呴櫌銇牬鍚堛�併亾銇厤鍒椼伅鍥哄畾銇с亶銇亜銇с仚銆�
+ private Transient List<Asset> assetRecords; // TODO 绯诲垪鐥呴櫌銇牬鍚堛�併亾銇厤鍒椼伅鍥哄畾銇с亶銇亜銇с仚銆�
public List<AssetInfo> checkedAssets { get; set; }
private List<AssetInfo> unCheckedAssets = new List<AssetInfo>();
@@ -236,7 +237,7 @@
}
}
//2021-11-30 fy add LJPH-C8W8FV 缃《 start OwnershipMachine_No__c Product2.ProductURF__c
- //tcm 娣诲姞 Management_Code__c 20211201 start
+ //tcm 娣诲姞 Management_Code__c 20211201 start
String soql = 'SELECT Id, Name,OwnershipMachine_No__c, Asset_situation__c, SerialNumber, Department_Name__c, Installation_Site__c, '
+ 'Posting_Date__c,Management_Code__c,IF_Warranty__c,Reson_Can_not_Warranty__c, InstallDate,isNewDate_use__c, '
+ 'Asset_Owner__c, Accumulation_Repair_Amount__c, Maintenance_Price_Month__c, Final_Examination_Date__c, '
@@ -730,7 +731,7 @@
// 绱嶅叆姗熷櫒銇儏鍫便倰鍙栧緱
if (!String.isBlank(this.targetHospitalId) && (this.targetHospitalId.length() == 15 || this.targetHospitalId.length() == 18)) {
//2021-11-30 fy add LJPH-C8W8FV 缃《 start OwnershipMachine_No__c Product2.ProductURF__c
- //tcm 娣诲姞 Management_Code__c 20211201 start
+ //tcm 娣诲姞 Management_Code__c 20211201 start
assetRecords = [SELECT Id, Name,OwnershipMachine_No__c,Product2.ProductURF__c, Asset_situation__c, SerialNumber, Department_Name__c, Installation_Site__c, Posting_Date__c, Management_Code__c, IF_Warranty__c, Reson_Can_not_Warranty__c,
InstallDate, isNewDate_use__c, Asset_Owner__c, Accumulation_Repair_Amount__c, Maintenance_Price_Month__c, Final_Examination_Date__c, CurrentContract_End_Date__c, EquipmentGuaranteeFlg__c,
CurrentContract_F__c, CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c, CurrentContract_F__r.RecordType_DeveloperName__c, CurrentContract_F__r.Estimate_Num__c, CurrentContract_F__r.Contract_End_Date__c, CurrentContract_F__r.Estimate_Contract_endDate__c,
@@ -1081,12 +1082,12 @@
}
notInId += '\')';
//2021-11-30 fy add LJPH-C8W8FV 缃《 start OwnershipMachine_No__c Product2.ProductURF__c
- //tcm 娣诲姞 Management_Code__c 20211201 start
+ //tcm 娣诲姞 Management_Code__c 20211201 start
String sqlStr = 'SELECT Id, Name,OwnershipMachine_No__c, Asset_situation__c, SerialNumber, Department_Name__c, Installation_Site__c, '
+ 'Posting_Date__c,Management_Code__c,IF_Warranty__c,Reson_Can_not_Warranty__c, InstallDate,isNewDate_use__c, '
+ 'Asset_Owner__c, Accumulation_Repair_Amount__c, Maintenance_Price_Month__c, Final_Examination_Date__c, '
+ 'CurrentContract_End_Date__c, Extend_Gurantee_DateTo__c,EquipmentGuaranteeFlg__c, '
- + 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c,CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,'
+ + 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c, CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,'
+ 'CurrentContract_F_asset__c,CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,CurrentContract_F_asset__r.endDateGurantee_Text__c,CurrentContract_F__r.Gurantee_Estimate_startDate__c, '
+ 'CurrentContract_F__r.First_Estimate_Date__c,CurrentContract_F__r.Estimate_Contract_endDate__c,'
+ 'CurrentContract_F__r.Contract_Consumption_rate__c,CurrentContract_F__r.First_contract_usage_Rate__c,'
@@ -2542,14 +2543,16 @@
t = this.estimate.Contract_Start_Date__c.addMonths(Integer.valueOf(this.estimate.Contract_Range__c));
t = t.addDays(-1);
this.estimate.Contract_End_Date__c = t;
+ //浠ユ彁浜ゆ姤浠风殑鏃剁偣锛岄攣瀹氱粡閿�鍟嗙殑鍏堟鐘舵�侊紝decide鏃朵笉鍐嶆洿鏂扮粡閿�鍟嗙殑鎬ц川 thh 20220407 start
//add wangweipeng 2021/12/26 start
- if(String.isNotBlank(this.estimate.Dealer__c)){
- checkDealerId = this.estimate.Dealer__c;
- onChDealerUpdate();
- }else{
- this.estimate.Is_RecognitionModel__c = false;
- }
+ // if(String.isNotBlank(this.estimate.Dealer__c)){
+ // checkDealerId = this.estimate.Dealer__c;
+ // onChDealerUpdate();
+ // }else{
+ // this.estimate.Is_RecognitionModel__c = false;
+ // }
//add wangweipeng 2021/12/26 end
+ //浠ユ彁浜ゆ姤浠风殑鏃剁偣锛岄攣瀹氱粡閿�鍟嗙殑鍏堟鐘舵�侊紝decide鏃朵笉鍐嶆洿鏂扮粡閿�鍟嗙殑鎬ц川 thh 20220407 end
System.debug('---------345----'+this.estimate.Dealer__c+'-------'+this.estimate.Dealer__r.FirstParagraphEnd__c);
// 浣嶇疆璋冩暣 鍦�1951 line
// Date createdDate = this.estimate.CreatedDate == null ? System.today() : this.estimate.CreatedDate.date();
@@ -3179,16 +3182,16 @@
public Asset rec { get; set; }
public Maintenance_Contract_Asset_Estimate__c mcae { get; set; }
public Boolean isManual { get; set; }
- public Decimal orgPrice {get; private set;}
- public Decimal orgPrice12 {get; private set;}
+ public Transient Decimal orgPrice {get; private set;}
+ public Transient Decimal orgPrice12 {get; private set;}
// add by fxk 2021/9/9 鎺у埗鐐规瀵硅薄鏄惁鍙�� Star
public Boolean CheckRows {get; private set;}
// add by fxk 2021/9/9 鎺у埗鐐规瀵硅薄鏄惁鍙�� End
//add by rentx 2020-11-12 LJPH-BV93RZ start
- public String proName;
- public String proSerialNumber;
- public String proSerialName;
+ public Transient String proName;
+ public Transient String proSerialNumber;
+ public Transient String proSerialName;
//add by rentx 2020-11-12 LJPH-BV93RZ end
//add by mzy 2020-11-12 LJPH-BX9CVX start
//public Date NoPartRiskDate;
@@ -3543,4 +3546,4 @@
// return returnValue;
// 2021-09-10 tcm 鎺掑簭閫昏緫璋冩暣 end
}
- }
\ No newline at end of file
+}
\ No newline at end of file
--
Gitblit v1.9.1