From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/classes/NFM103Controller.cls | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/classes/NFM103Controller.cls b/force-app/main/default/classes/NFM103Controller.cls
index 57a4729..fb0767e 100644
--- a/force-app/main/default/classes/NFM103Controller.cls
+++ b/force-app/main/default/classes/NFM103Controller.cls
@@ -203,11 +203,12 @@
//XLIU-CGAD3Z 銆愬鎵樸�戝鍝佺浉鍏冲瓧娈典紶杈撹嚦SAP LY 20220714 end
// 鍒拌揪涓婇檺 淇悊鍗曚慨鏀规椂 涓婇檺鍚堝悓 by20230104 start
- if ( rpr.ZFLAG_SX__c == true){
+ if ((rpr.ZFLAG_SX__c == true && oldMap.get(rpr.Id).ZFLAG_SX__c !=rpr.ZFLAG_SX__c && rpr.Agreed_Date__c!=null) ||
+ (rpr.ZFLAG_SX__c == false && oldMap.get(rpr.Id).ZFLAG_SX__c !=rpr.ZFLAG_SX__c && rpr.Agreed_Date__c==null) ){
if (NFM103Controller.NFM103_Ids.contains(rpr.Id) == false) {
NFM103_Ids.add(rpr.Id);
rprIds.add(rpr.Id);
- updMap.put(rpr.Id, new Repair__c(Id = rpr.Id));
+ updMap.put(rpr.Id, new Repair__c(Id = rpr.Id,Address_type__c = 'X'));
NFM103Controller.debug_msg += 'NFM103_callout_update3_' + rpr.Name;
}
}
@@ -246,8 +247,9 @@
// NFM103Controller.callout(iflog.Id, rprIds);
String uid = UserInfo.getUserId();
String BUid = System.Label.Batch_User_Id;
+ String OLYid = System.Label.OlympusSystem_ID;
System.debug('zheli');
- if (uid.substring(0,15) == BUid.substring(0,15)) {
+ if (uid.substring(0,15) == BUid.substring(0,15) || uid.substring(0,15) == OLYid.substring(0,15)) {
NFM103Controller.calloutNotfuture(iflog.Id, rprIds, null);
}else{
NFM103Controller.callout(iflog.Id, rprIds, null);
@@ -414,6 +416,7 @@
,Maintenance_Contract__r.Sum_repair_price_new__c
,Repair_Quotation_Id__r.Usage_Ratio_Price__c
,Maintenance_Contract__r.Remaining_Amount__c
+ ,Maintenance_Contract__r.Limit_Price__c
,ZFLAG_CGSX__c
,ZFLAG_SX__c
// 涓婇檺鍚堝悓 by20230104 end
@@ -524,17 +527,18 @@
&& rpr.FSE_ApplyForRepair_Day__c >= rpr.Contract_Start_Date__c && rpr.FSE_ApplyForRepair_Day__c <= rpr.Contract_End_Date__c) {
// 涓婇檺鍚堝悓 by20230201 LY start 濡傛灉鏄笂闄愬悎鍚屾墠鍘诲垽鏂槸鍚︹�滆秴杩囧悎鍚屼笂闄愨�濆拰鈥滃埌杈句笂闄愨�濇爣璇�
if (rpr.Maintenance_Contract__r.Limit_Price__c == true){
- // 鈥滆秴杩囧悎鍚屼笂闄愨�濅负true锛屼笉浼犲悎鍚屼俊鎭紝ZFLAG_CGSX浼燳
- if (rpr.ZFLAG_CGSX__c == true) {
- element.ZFLAG_CGSX = 'Y';
- }
- //鈥滃埌杈句笂闄愨�濅负true锛屼紶鍚堝悓淇℃伅锛孼FLAG_SX浼燳
- if (rpr.ZFLAG_SX__c == true) {
- element.ZFLAG_SX = 'Y';
+
+ if (rpr.ZFLAG_CGSX__c == true) { // 鈥滆秴杩囧悎鍚屼笂闄愨�濅负true锛屼笉浼犲悎鍚屼俊鎭紝ZFLAG_CGSX浼燳
+ element.ZFLAG_CGSX = 'X';
+ }else if (rpr.ZFLAG_SX__c == true) { //鈥滃埌杈句笂闄愨�濅负true锛屼紶鍚堝悓淇℃伅锛孼FLAG_SX浼燳
+ element.ZFLAG_SX = 'X';
+ element.RepairContractObject = 'X';
+ element.RepairContractNumber = rpr.Maintenance_Contract__r.Maintenance_Contract_No__c;
+ }else { //娌¤秴杩囧悎鍚屼笂闄愪篃娌¤揪鍒颁笂闄� 浼犲悎鍚屼俊鎭� ZFLAG_CGSX浼犵┖ ZFLAG_SX浼犵┖
element.RepairContractObject = 'X';
element.RepairContractNumber = rpr.Maintenance_Contract__r.Maintenance_Contract_No__c;
}
- }else {
+ }else { //涓嶆槸涓婇檺鍚堝悓 浼犲悎鍚屼俊鎭�
element.RepairContractObject = 'X';
element.RepairContractNumber = rpr.Maintenance_Contract__r.Maintenance_Contract_No__c;
}
@@ -845,11 +849,21 @@
// 銈ㄣ儵銉笺亴鐧虹敓銇椼仧鍫村悎
System.debug(Logginglevel.ERROR, 'NFM103_' + iflog.Name + ':' + ex.getMessage());
System.debug(Logginglevel.ERROR, 'NFM103_' + iflog.Name + ':' + ex.getStackTraceString());
- logstr += ex.getMessage();
- iflog.ErrorLog__c += ex.getMessage() + '\n';
- iflog.ErrorLog__c += ex.getStackTraceString() + '\n';
+ //NFM105瑙﹀彂103鎺ュ彛 20230303 LY start
+ // logstr += ex.getMessage();
+ // iflog.ErrorLog__c += ex.getMessage() + '\n';
+ // iflog.ErrorLog__c += ex.getStackTraceString() + '\n';
System.debug('鏍囪0--------------------1:' + rowData.retry_cnt__c);
+ // Callout from triggers are currently not supported.
+ System.debug('NFM201jiekou'+ex.getMessage());
+ if (!String.valueOf(ex.getMessage()).contains('Callout from triggers')) {
+
+ logstr += ex.getMessage();
+ iflog.ErrorLog__c += ex.getMessage() + '\n';
+ iflog.ErrorLog__c += ex.getStackTraceString() + '\n';
+ }
+ //NFM105瑙﹀彂103鎺ュ彛 20230303 LY end
//---Gaozw---add
if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
if (rowData.retry_cnt__c < batch_retry_max_cnt) {
--
Gitblit v1.9.1