From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/classes/SelectAssetEstimateVMController.cls | 160 +++++++++++++++++++++++++++--------------------------
1 files changed, 81 insertions(+), 79 deletions(-)
diff --git a/force-app/main/default/classes/SelectAssetEstimateVMController.cls b/force-app/main/default/classes/SelectAssetEstimateVMController.cls
index a471cb2..a98e211 100644
--- a/force-app/main/default/classes/SelectAssetEstimateVMController.cls
+++ b/force-app/main/default/classes/SelectAssetEstimateVMController.cls
@@ -137,7 +137,7 @@
public Decimal Denominator {get; set; }
public Decimal Accrued {get; set; }
public String ProductModel{get;set;}
- public String Category{get;set;}
+ // public String Category{get;set;}
public Decimal Consumption_rate_Gurante{get;set;}
@@ -397,9 +397,9 @@
//URF闄愭鍚堝悓2鏈� LY 20220811 end
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2022/12/14 start 娑堣垂鐜�
- // +'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,Product2.Category4__c,Product2.Asset_Model_No__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
- // +'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
- // +'CurrentContract_F__r.endDateGurantee__c,'
+ +'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,Product2.Category4__c,Product2.Asset_Model_No__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
+ +'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
+ +'CurrentContract_F__r.endDateGurantee__c,'
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2022/12/14 end
+ 'CurrentContract_End_Date__c, Extend_Gurantee_DateTo__c,EquipmentGuaranteeFlg__c,AssetMark__c,NoPartRiskDate_F__c,NoPartRiskDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\' ';
@@ -1042,14 +1042,14 @@
// ,IS_StandardPricing__c
// 鎶ヤ环瑙勫垯鏀瑰杽 20230315 end
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2023/1/17 start
- // ,CurrentContract_F_asset__r.Asset_Consumption_Rate__c
- // ,CurrentContract_F_asset__r.Maintenance_Price_Year__c
- // ,CurrentContract_F_asset__r.IS_VMContract_Asset__c
- // ,Product2.Asset_Model_No__c
- // ,Product2.Category4__c
- // ,CurrentContract_F__r.endDateGurantee__c
+ ,CurrentContract_F_asset__r.Asset_Consumption_Rate__c
+ ,CurrentContract_F_asset__r.Maintenance_Price_Year__c
+ ,CurrentContract_F_asset__r.IS_VMContract_Asset__c
+ ,Product2.Asset_Model_No__c
+ ,Product2.Category4__c
+ ,CurrentContract_F__r.endDateGurantee__c
//娣诲姞鏄惁鏈嶅姟澶氬勾淇濅慨锛屽骞翠繚缁翠慨鏈熻嚦
- // ,IS_Extend_Gurantee__c,Extend_Gurantee_DateTo__c
+ ,IS_Extend_Gurantee__c,Extend_Gurantee_DateTo__c
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2023/1/17 end
FROM Asset WHERE Hospital__c = :this.targetHospitalId AND ( AssetMark__c != '鑰楁潗' OR Product2.Family != 'ET' ) ORDER BY ID, IF_Warranty_Service__c asc];
//JZHG-BSDUT4 ---20200825---update By rentongxiao---Start
@@ -1099,12 +1099,12 @@
Asset__r.CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,
Asset__r.CurrentContract_F_asset__r.endDateGurantee_Text__c,
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2023/1/18 start 璁惧娑堣垂鐜�
- // Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c,
- // Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c,
- // Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c,
- // Asset__r.Product2.Asset_Model_No__c,
- // Asset__r.Product2.Category4__c,
- // Asset__r.CurrentContract_F__r.endDateGurantee__c,
+ Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c,
+ Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c,
+ Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c,
+ Asset__r.Product2.Asset_Model_No__c,
+ Asset__r.Product2.Category4__c,
+ Asset__r.CurrentContract_F__r.endDateGurantee__c,
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2022/1/18 end
Asset__r.CurrentContract_F__r.First_Estimate_Date__c,
Asset__r.CurrentContract_F__r.Contract_Consumption_rate__c,
@@ -1224,7 +1224,7 @@
Asset__r.EquipmentGuaranteeFlg__c,
//2021-11-30 fy add LJPH-C8W8FV 缃《 start
Asset__r.OwnershipMachine_No__c,
- // Product_Manual__r.Category4__c,
+ Product_Manual__r.Category4__c,
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
Asset_Consumption_rate__c,
Asset__r.CurrentContract_F__c,
@@ -1297,12 +1297,12 @@
// Gzw 20200807 浜斾釜鍘诲勾鍚堝悓鐩稿叧锛屾墍浠ユ姤浠蜂骇鍝侊紝鑾峰彇涓婃湡鍚堝悓 eng
// LJPH-C9GD34 gzw fix start
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� 2023/01/28 start
- // ,Asset__r.Product2.Asset_Model_No__c
- // ,Asset__r.Product2.Category4__c
- // ,Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c
- // ,Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c
- // ,Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c
- // ,Asset__r.CurrentContract_F__r.endDateGurantee__c
+ ,Asset__r.Product2.Asset_Model_No__c
+ ,Asset__r.Product2.Category4__c
+ ,Asset__r.CurrentContract_F_asset__r.Asset_Consumption_Rate__c
+ ,Asset__r.CurrentContract_F_asset__r.Maintenance_Price_Year__c
+ ,Asset__r.CurrentContract_F_asset__r.IS_VMContract_Asset__c
+ ,Asset__r.CurrentContract_F__r.endDateGurantee__c
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� 2023/01/28 end
,Estimate_List_Price_Page__c
@@ -1353,7 +1353,7 @@
// Map<String,repair__c> assNewRepMap = new Map<String,repair__c>();
// assNewRepMap = getNewrep(this.assetRecords);
datatemp = getChartData();
- // System.debug(LoggingLevel.INFO, '*** this.assetRecords: ' + this.assetRecords);
+ System.debug(LoggingLevel.INFO, '*** this.assetRecords: ' + this.assetRecords);
for (Asset ast : this.assetRecords) {
Boolean isNew = false;
Decimal listPrice = ast.Maintenance_Price_Month__c;
@@ -1410,7 +1410,7 @@
//
//
//
- // ast.CurrentContract_End_Date__c = ast.CurrentContract_F_asset__r.IS_VMContract_Asset__c ? ast.Extend_Gurantee_DateTo__c : ast.CurrentContract_End_Date__c;
+ ast.CurrentContract_End_Date__c = ast.CurrentContract_F_asset__r.IS_VMContract_Asset__c ? ast.Extend_Gurantee_DateTo__c : ast.CurrentContract_End_Date__c;
checkedAssets.add(new AssetInfo(checkedAssets.size(), ast, isNew, listPrice, selectedLocal,estimate));
} else {
@@ -1434,7 +1434,7 @@
*/
}
- // System.debug(LoggingLevel.INFO, '*** checkedAssets: ' + checkedAssets);
+ System.debug(LoggingLevel.INFO, '*** checkedAssets: ' + checkedAssets);
totalPage = (totalRecords / selctRecordNum) + (Math.mod(totalRecords, selctRecordNum) > 0 ? 1 : 0);
system.debug('椤哄簭妫�娴�' + checkedAssets);
@@ -1461,7 +1461,7 @@
//2021-11-30 fy add LJPH-C8W8FV 缃《 start
List<AssetInfo> topAsset =new List<AssetInfo>();
List<AssetInfo> otherAsset =new List<AssetInfo>();
- // System.debug(LoggingLevel.INFO, '*** 椤哄簭: ' + checkedAssets);
+ System.debug(LoggingLevel.INFO, '*** 椤哄簭: ' + checkedAssets);
for(AssetInfo ched : checkedAssets){
system.debug('椤哄簭妫�娴�2' + ched.ProductModelNoc);
system.debug('椤哄簭妫�娴�3' + ched.AssetModelNoc);
@@ -1486,7 +1486,7 @@
}
checkedAssets=NumberSort;
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
- // System.debug(LoggingLevel.INFO, '*** checkedAssetsEND: ' + checkedAssets);
+ System.debug(LoggingLevel.INFO, '*** checkedAssetsEND: ' + checkedAssets);
}
//
@@ -1535,12 +1535,12 @@
+ 'URF_Maintenance_Contract__c,URF_Maintenance_Contract__r.Management_Code__c,URF_Maintenance_Contract__r.Contract_End_Date__c,'
//URF闄愭鍚堝悓2鏈� LY 20220811 end
//甯傚満澶氬勾淇濅环鏍煎紑鍙� start DC 2023/01/17 璁惧娑堣垂鐜� 浜у搧鍨嬪彿 绗洓鍒嗙被 鏄惁涓哄骞翠繚璁惧
- // + 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,'
- // + 'CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
- // + 'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
- // + 'Product2.Asset_Model_No__c,'
- // + 'Product2.Category4__c,'
- // + 'CurrentContract_F__r.endDateGurantee__c,'
+ + 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,'
+ + 'CurrentContract_F_asset__r.Maintenance_Price_Year__c,'
+ + 'CurrentContract_F_asset__r.IS_VMContract_Asset__c,'
+ + 'Product2.Asset_Model_No__c,'
+ + 'Product2.Category4__c,'
+ + 'CurrentContract_F__r.endDateGurantee__c,'
//甯傚満澶氬勾淇濅环鏍煎紑鍙� end DC 2023/01/17
+ 'Product2.ProductURF__c,CurrentContract_F__r.Contract_Range__c,AssetMark__c,NoPartRiskDate__c,NoPartRiskDate_F__c,Product2.PartSupplyFinishDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\' '
+ 'AND Id NOT IN ' + notInId;
@@ -1600,7 +1600,7 @@
//URF闄愭鍚堝悓2鏈� LY 20220811 end
//甯傚満澶氬勾淇濅环鏍煎紑鍙� start DC 2023/01/17 璁惧娑堣垂鐜�
- // sqlStr += 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,CurrentContract_F_asset__r.IS_VMContract_Asset__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,Product2.Asset_Model_No__c,Product2.Category4__c,CurrentContract_F__r.endDateGurantee__c,';
+ sqlStr += 'CurrentContract_F_asset__r.Asset_Consumption_Rate__c,CurrentContract_F_asset__r.IS_VMContract_Asset__c,CurrentContract_F_asset__r.Maintenance_Price_Year__c,Product2.Asset_Model_No__c,Product2.Category4__c,CurrentContract_F__r.endDateGurantee__c,';
//甯傚満澶氬勾淇濅环鏍煎紑鍙� start DC 2023/01/17
sqlStr += ' CurrentContract_F__r.Contract_Range__c,AssetMark__c,NoPartRiskDate__c,NoPartRiskDate_F__c,Product2.PartSupplyFinishDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\'';
@@ -3956,23 +3956,23 @@
//2.涓�骞翠互涓婄殑鍚堝悓锛屽湪缁撴潫鍓�6涓湀寮�濮嬪彲浠ュ紑鏀剧画绛炬姤浠枫��
//3.绠＄悊鍛樿烦杩囷紝
//WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220413
- if (input.rec.CurrentContract_F__r.Open_RenewalQuotation__c == false && UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin &&
- String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c != 'VM_Contract') {
+ // if (input.rec.CurrentContract_F__r.Open_RenewalQuotation__c == false && UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin &&
+ // String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c != 'VM_Contract') {
- Integer noOfDays = today.daysBetween(input.rec.CurrentContract_F__r.Contract_End_Date__c);
- Decimal monthCon = (Decimal)noOfDays / 365 * 12;
- // 鍙紑濮嬫姤浠风殑鏈堟暟闄愬埗
- if (input.rec.CurrentContract_F__r.Contract_Range__c >= 12 && monthCon > 6) {
- input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 鍚堝悓缁撴潫鍓�6涓湀寮�濮嬪彲浠ュ埗浣滄姤浠枫��');
- rtn = false;
- }
- //ApexPages.addMessage(new ApexPages.message(ApexPages.severity.INFO, '---' + monthCon + ' +++ ' + Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c/2)));
- //rtn = false;
- if (input.rec.CurrentContract_F__r.Contract_Range__c < 12 && monthCon > Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c / 2)) {
- input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 缁忓巻鏈堟暟杩囧崐鏂瑰彲鍒朵綔鎶ヤ环');
- rtn = false;
- }
- }
+ // Integer noOfDays = today.daysBetween(input.rec.CurrentContract_F__r.Contract_End_Date__c);
+ // Decimal monthCon = (Decimal)noOfDays / 365 * 12;
+ // // 鍙紑濮嬫姤浠风殑鏈堟暟闄愬埗
+ // if (input.rec.CurrentContract_F__r.Contract_Range__c >= 12 && monthCon > 6) {
+ // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 鍚堝悓缁撴潫鍓�6涓湀寮�濮嬪彲浠ュ埗浣滄姤浠枫��');
+ // rtn = false;
+ // }
+ // //ApexPages.addMessage(new ApexPages.message(ApexPages.severity.INFO, '---' + monthCon + ' +++ ' + Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c/2)));
+ // //rtn = false;
+ // if (input.rec.CurrentContract_F__r.Contract_Range__c < 12 && monthCon > Math.floor(input.rec.CurrentContract_F__r.Contract_Range__c / 2)) {
+ // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 缁忓巻鏈堟暟杩囧崐鏂瑰彲鍒朵綔鎶ヤ环');
+ // rtn = false;
+ // }
+ // }
// 澶氬勾淇濆垽鏂�
if ( String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') {
//if (UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin && String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') {
@@ -3982,16 +3982,18 @@
Decimal monthCon = (Decimal)noOfDays/365*12;
- //甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/02 Start 缁撴潫鏃ョ┖鐧芥湡澶т簬6涓湀 鎶ラ敊鎻愮ず
+ //甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/02 Start 缁撴潫鏃ョ┖鐧芥湡澶т簬6涓湀 鎶ラ敊鎻愮ず 鏂扮殑鍚堝悓鎶ヤ环寮�濮嬫棩鏈熷拰涓婁竴鏈熷悎鍚�
- // Date endDate6Month = input.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c.addMonths(6);
- // Date cotractEndDay = input.rec.CurrentContract_F__r.endDateGurantee__c;
-
-
- // if(today>endDate6Month && cotractEndDay <today){
- // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 甯傚満澶氬勾淇濈粨鏉熷凡瓒呰繃6涓湀锛岀敱浜庣┖鐧芥湡杩囬暱锛岃鍏堣仈绯绘湇鍔＄鐞嗛儴璇勪及銆�');
-
- // }
+ Date endDate6Month = input.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c.addMonths(6);
+ Date cotractEndDay = input.rec.CurrentContract_F__r.endDateGurantee__c;
+ System.debug(LoggingLevel.INFO, '*** endDate6Month: ' + endDate6Month);
+ System.debug(LoggingLevel.INFO, '*** cotractEndDay: ' + cotractEndDay);
+ System.debug(LoggingLevel.INFO, '*** this.estimate.Contract_Esti_Start_Date__c: ' + this.estimate.Contract_Esti_Start_Date__c);
+ if(this.estimate.Contract_Esti_Start_Date__c >endDate6Month && cotractEndDay < this.estimate.Contract_Esti_Start_Date__c){
+ System.debug(LoggingLevel.INFO, '*** meet error: ' );
+ input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 甯傚満澶氬勾淇濈粨鏉熷凡瓒呰繃6涓湀锛岀敱浜庣┖鐧芥湡杩囬暱锛岃鍏堣仈绯绘湇鍔＄鐞嗛儴璇勪及銆�');
+ rtn = false;
+ }
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/02 end
@@ -4001,18 +4003,18 @@
// gzw 20220630 寮�閫氱画绛炬姤浠锋潈闄愬悗锛岃秴杩�6涓湀涔熷彲浠ョ画绛�
// 缁鎯呭喌 鈶� 涓婃湡鍚堝悓 Open_RenewalQuotation__c & 6涓湀浠ュ唴 鈶� VM_Contract_Check__c Open_RenewalQuotation__c 2涓兘鎵撻挬
// 鈶� 2涓紑鍏抽兘鎵撳紑 鈶M_Contract_Check__c鎵撳紑 灏忎簬6涓湀
- if (!((this.contract.Open_RenewalQuotation__c && input.rec.CurrentContract_F__r.VM_Contract_Check__c) || (input.rec.CurrentContract_F__r.VM_Contract_Check__c && monthCon < 6))) {
- if(monthCon < 6){
- input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 鍙互鍔犲叆鏈嶅姟鍚堝悓锛屽姞鍏ヤ环鏍艰鑱旂郴鏈嶅姟绠＄悊閮ㄣ��');
- }else{
- input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 娌℃湁缁鎶ヤ环鏉冮檺锛屾垨鑰呰繕娌″埌缁鏃堕棿銆�');
- }
- // System.debug(LoggingLevel.INFO, '*** this.contract.Open_RenewalQuotation__c: ' + this.contract.Open_RenewalQuotation__c);
- // System.debug(LoggingLevel.INFO, '*** : input.rec.CurrentContract_F__r.VM_Contract_Check__c' + input.rec.CurrentContract_F__r.VM_Contract_Check__c);
- // System.debug(LoggingLevel.INFO, '*** monthCon: ' + monthCon);
- //input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 娌℃湁缁鎶ヤ环鏉冮檺锛屾垨鑰呰繕娌″埌缁鏃堕棿銆�');
- rtn = false;
- }
+ // if (!((this.contract.Open_RenewalQuotation__c && input.rec.CurrentContract_F__r.VM_Contract_Check__c) || (input.rec.CurrentContract_F__r.VM_Contract_Check__c && monthCon < 6))) {
+ // if(monthCon < 6){
+ // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 鍙互鍔犲叆鏈嶅姟鍚堝悓锛屽姞鍏ヤ环鏍艰鑱旂郴鏈嶅姟绠＄悊閮ㄣ��');
+ // }else{
+ // input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 娌℃湁缁鎶ヤ环鏉冮檺锛屾垨鑰呰繕娌″埌缁鏃堕棿銆�');
+ // }
+ // System.debug(LoggingLevel.INFO, '*** this.contract.Open_RenewalQuotation__c: ' + this.contract.Open_RenewalQuotation__c);
+ // System.debug(LoggingLevel.INFO, '*** : input.rec.CurrentContract_F__r.VM_Contract_Check__c' + input.rec.CurrentContract_F__r.VM_Contract_Check__c);
+ // System.debug(LoggingLevel.INFO, '*** monthCon: ' + monthCon);
+ // //input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 娌℃湁缁鎶ヤ环鏉冮檺锛屾垨鑰呰繕娌″埌缁鏃堕棿銆�');
+ // rtn = false;
+ // }
/*if (input.rec.CurrentContract_F__r.Gurantee_Renew_startDate__c > Date.today()) {
input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 绗竴涓澶囩粨鏉熷悗鍙互鍒朵綔鎶ヤ环銆�');
rtn = false;
@@ -4169,7 +4171,7 @@
public class AssetInfo {
// 鏂板悎鍚屽鍝佺‘淇濇彁渚� 褰撳墠鏍囪
public Boolean etGFlg {get; set;}
- // public String ISStandardPricing{get; set;}
+ public String ISStandardPricing{get; set;}
public Integer lineNo {get; private set;}
public Decimal Repair_Price_Auto {get; set;}
public String Agreed_Date{get; set;}
@@ -4180,7 +4182,7 @@
public Maintenance_Contract_Estimate__c estimate {get; set;}
public Transient Decimal orgPrice {get; private set;}
public Transient Decimal orgPrice12 {get; private set;}
- // public String Blank_period {get; set;}
+ public String Blank_period {get; set;}
// add by fxk 2021/9/9 鎺у埗鐐规瀵硅薄鏄惁鍙�� Star
public Boolean CheckRows {get; private set;}
// add by fxk 2021/9/9 鎺у埗鐐规瀵硅薄鏄惁鍙�� End
@@ -4202,7 +4204,7 @@
public String MDMModelNoc;
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� start 2023/01/17
- // public String Category;
+ public String Category;
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� end 2023/01/17
public Id getRecId() {
Id rtn = null;
@@ -4237,7 +4239,7 @@
public AssetInfo(Integer lineNo, Asset record, Boolean isNew, Decimal listPrice, Maintenance_Contract_Asset_Estimate__c mcae,Maintenance_Contract_Estimate__c estimate) {
this.lineNo = lineNo;
this.rec = record;
- // this.rec.CurrentContract_End_Date__c = record.CurrentContract_End_Date__c;
+ this.rec.CurrentContract_End_Date__c = record.CurrentContract_End_Date__c;
// this.rec.CurrentContract_End_Date__c = record.IS_Extend_Gurantee__c ? record.Extend_Gurantee_DateTo__c : record.CurrentContract_End_Date__c;
// this.ISStandardPricing = record.IS_StandardPricing__c;
this.estimate = new Maintenance_Contract_Estimate__c();
@@ -4329,7 +4331,7 @@
//add by rentx 2020-11-12 LJPH-BV93RZ end
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� start 2023/01/17
- // this.Category = mcae.Product_Manual__r.Category4__c;
+ this.Category = mcae.Product_Manual__r.Category4__c;
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� end 2023/01/17
//add by mzy 2021-02-07 start
@@ -4387,7 +4389,7 @@
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� start 2023/01/17
- // this.Category = mcae.Product_Manual__r.Category4__c;
+ this.Category = mcae.Product_Manual__r.Category4__c;
//甯傚満澶氬勾淇� 浠锋牸寮�鍙� end 2023/01/17
}
--
Gitblit v1.9.1