From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/NFM106Controller.cls | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 83 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/classes/NFM106Controller.cls b/force-app/main/default/classes/NFM106Controller.cls
index a3d52f2..eb2fe2e 100644
--- a/force-app/main/default/classes/NFM106Controller.cls
+++ b/force-app/main/default/classes/NFM106Controller.cls
@@ -24,7 +24,18 @@
public String QuotationAmount;
public String ContractPeriod;
public PaymentInformation_element[] PaymentInformation;
+ //URF闄愭鍚堝悓2鏈� LY 20220811 start
+ public SeriesInformation_element[] SeriesInformation;
+ //URF闄愭鍚堝悓2鏈� LY 20220811 end
+
}
+ //URF闄愭鍚堝悓2鏈� LY 20220811 start
+ public class SeriesInformation_element {
+ public String SeriesNo;
+ public String RepairTime;
+ public String SeriesAmount;
+ }
+ //URF闄愭鍚堝悓2鏈� LY 20220811 end
public class RepairContractLogin_element {
public NFMUtil.Monitoring Monitoring;
public GeneralData_element[] GeneralData;
@@ -66,24 +77,58 @@
}
}
}
+ //Repair娴嬭瘯绫昏烦杩� thh 20220401 start
+ if(StaticParameter.EscapeNFM106Trigger){
+ return;
+ }
+ //Repair娴嬭瘯绫昏烦杩� thh 20220401 end
if (Trigger.isBefore) {
if (Trigger.isUpdate) {
for(Maintenance_Contract__c mc : newList) {
// 铏氭嫙缁翠慨鍚堝悓璺宠繃
if (mc.RecordType_DeveloperName__c == 'VM_Contract')continue ;
- if (NFM106Controller.NFM106_Ids.contains(mc.Id) == false && mc.Status__c == '濂戠磩') {
- if (oldMap.get(mc.Id).Status__c != mc.Status__c
- || oldMap.get(mc.Id).Contract_Conclusion_Date__c != mc.Contract_Conclusion_Date__c
- ) {
- if (String.isBlank(mc.Maintenance_Contract_No__c)) {
- mc.addError('鐘舵�佸彉涓哄悎鍚屾椂锛屽繀椤昏緭鍏ャ��' + Schema.SObjectType.Maintenance_Contract__c.fields.Maintenance_Contract_No__c.label + '銆�');
- continue;
- }
- mcIds.put(mc.Id, mc.Id);
- mcNoList.add(mc.Maintenance_Contract_No__c);
- NFM106Controller.debug_msg += 'NFM106_callout_update_' + mc.Name;
+
+ //update wangweipeng 2021/11/16 start
+ //鏂板鍏堟鍚庝慨鍔熻兘锛屽鏋滅粡閿�鍟嗘槸鍏堟瀵硅薄锛岄渶瑕佸厛璁ゆ鍚堝悓涓婁紶鐒跺悗鍐嶄笂浼燬AP
+ //鍒ゆ柇鏄惁闇�瑕佽蛋璁ゆ鐨勬帴鍙�
+ boolean flag = false;
+ if(mc.old_Is_RecognitionModel__c){
+ //鍒ゆ柇褰撳墠鍚堝悓鏄惁宸茬粡璁ゆ瀹屾垚
+ if(!mc.Is_Recognition_Model_True__c){
+ flag = true;
}
}
+ //涓簍rue鏃讹紝璇佹槑姝ゅ悎鍚屽繀椤诲厛涓婁紶璁ゆ鍚堝悓锛岀劧鍚庡啀鑳借蛋涓婁紶SAP鎺ュ彛
+ if(flag){
+ //濡傛灉鏄惁璁ゆ鍚堝悓瀛楁涓簍rue,骞朵笖璁ゆ鍚堝悓鐘舵�佸彉涓� 璁ゆ涓紝閭ｄ箞灏辫蛋璁ゆ鎺ュ彛
+ if(mc.upload_to_RM_time__c != null && (oldMap.get(mc.Id).upload_to_RM_time__c != mc.upload_to_RM_time__c)){
+ //璧拌娆炬帴鍙ｏ紝鐘舵�佷笉鍙�
+ if(NFM106Controller.NFM106_Ids.contains(mc.Id) == false && mc.Status__c == '寮曞悎涓�'){
+ if (String.isBlank(mc.Maintenance_Contract_No__c)) {
+ mc.addError('鐘舵�佸彉涓哄悎鍚屾椂锛屽繀椤昏緭鍏ャ��' + Schema.SObjectType.Maintenance_Contract__c.fields.Maintenance_Contract_No__c.label + '銆�');
+ continue;
+ }
+ mcIds.put(mc.Id, mc.Id);
+ mcNoList.add(mc.Maintenance_Contract_No__c);
+ NFM106Controller.debug_msg += 'NFM106_callout_update_' + mc.Name;
+ }
+ }
+ } else {//姝ｅ父涓婁紶SAP鎺ュ彛
+ if (NFM106Controller.NFM106_Ids.contains(mc.Id) == false && mc.Status__c == '濂戠磩') {
+ if (oldMap.get(mc.Id).Status__c != mc.Status__c
+ || oldMap.get(mc.Id).Contract_Conclusion_Date__c != mc.Contract_Conclusion_Date__c
+ ) {
+ if (String.isBlank(mc.Maintenance_Contract_No__c)) {
+ mc.addError('鐘舵�佸彉涓哄悎鍚屾椂锛屽繀椤昏緭鍏ャ��' + Schema.SObjectType.Maintenance_Contract__c.fields.Maintenance_Contract_No__c.label + '銆�');
+ continue;
+ }
+ mcIds.put(mc.Id, mc.Id);
+ mcNoList.add(mc.Maintenance_Contract_No__c);
+ NFM106Controller.debug_msg += 'NFM106_callout_update_' + mc.Name;
+ }
+ }
+ }
+ //update wangweipeng 2021/11/16 end
}
}
}
@@ -177,6 +222,14 @@
// LJPH-BS89NQ start
upload_to_sap_time__c
// LJPH-BS89NQ end
+ //URF闄愭鍚堝悓2鏈� LY 20220811 start
+ ,Estimation_Id__r.Total_Number_Asset_P__c
+ ,Estimation_Id__r.URF_P_RepairTime__c
+ ,Estimation_Id__r.Estimate_List_Price_Sum_P__c
+ ,Estimation_Id__r.Total_Number_Asset_V__c
+ ,Estimation_Id__r.URF_V_RepairTime__c
+ ,Estimation_Id__r.Estimate_List_Price_Sum_V__c
+ //URF闄愭鍚堝悓2鏈� LY 20220811 end
from Maintenance_Contract__c where Id IN :mcIds]; // 鍓婇櫎銉囥兗銈裤倰妞滅储銇椼仾銇勩伅銇氥�丄ll ROWS 銇勩倝銇亜銇仛
System.debug(Logginglevel.DEBUG, 'NFM106_ recptList.size()=' + mcList.size());
@@ -255,6 +308,23 @@
}
// HWAG-BE88UG 銆愬鎵樸�慡FDC-SAP鎼幇鏈夋帴鍙ｆ坊鍔犲悎鍚屸�滀粯娆捐鍒掆�濅俊鎭� by vivek end
+ //URF闄愭鍚堝悓2鏈� LY 20220811 start
+ element.SeriesInformation = new List<SeriesInformation_element>();
+ if(mc.Estimation_Id__r.Total_Number_Asset_P__c != null && mc.Estimation_Id__r.Total_Number_Asset_P__c != 0){
+ SeriesInformation_element seriesInformationP = new SeriesInformation_element();
+ element.SeriesInformation.add(seriesInformationP);
+ seriesInformationP.SeriesNo = 'P';
+ seriesInformationP.RepairTime = mc.Estimation_Id__r.URF_P_RepairTime__c.toPlainString();
+ seriesInformationP.SeriesAmount = mc.Estimation_Id__r.Estimate_List_Price_Sum_P__c.toPlainString();
+ }
+ if(mc.Estimation_Id__r.Total_Number_Asset_V__c != null && mc.Estimation_Id__r.Total_Number_Asset_V__c != 0){
+ SeriesInformation_element seriesInformationP = new SeriesInformation_element();
+ element.SeriesInformation.add(seriesInformationP);
+ seriesInformationP.SeriesNo = 'V';
+ seriesInformationP.RepairTime = mc.Estimation_Id__r.URF_V_RepairTime__c.toPlainString();
+ seriesInformationP.SeriesAmount = mc.Estimation_Id__r.Estimate_List_Price_Sum_V__c.toPlainString();
+ }
+ //URF闄愭鍚堝悓2鏈� LY 20220811 end
logstr += '[' + element.ContractNo + ']EndUserNoorAgentNo[' + element.EndUserNoorAgentNo + '] ';
}
@@ -362,7 +432,8 @@
// CHAN-BSV3GZ start
// 鍘熶唬鐮�
// rowData.retry_cnt__c=0;
- if (status == 'OK') {
+ system.debug('status15122021'+status);
+ if (status == 'ok') {
rowData.retry_cnt__c = 0;
} else {
if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
--
Gitblit v1.9.1