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/NFM104Rest.cls | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/NFM104Rest.cls b/force-app/main/default/classes/NFM104Rest.cls
index 074a13e..90c1002 100644
--- a/force-app/main/default/classes/NFM104Rest.cls
+++ b/force-app/main/default/classes/NFM104Rest.cls
@@ -26,6 +26,9 @@
// PK 2021/12/6 start
public String AdvancePaymentFlag;
// PK 2021/12/6 end
+ //DB202211397391鈥滅淮淇濋鍒も�濆拰鈥滅淮淇濋」鐩�濇柊澧炴柟妗� fy start
+ public String MAFINAL;
+ //DB202211397391鈥滅淮淇濋鍒も�濆拰鈥滅淮淇濋」鐩�濇柊澧炴柟妗� fy end
}
global class DiscountInformation {
public String DiscountType;
@@ -131,7 +134,8 @@
}
//淇悊銈掓绱�
- List<Repair__c> sfdcRpairList = [select Id, Name, SAPRepairNo__c, Repair_Quotation_Id__c
+ //DB202211397391鈥滅淮淇濋鍒も�濆拰鈥滅淮淇濋」鐩�濇柊澧炴柟妗� fy start MAFINAL__c
+ List<Repair__c> sfdcRpairList = [select Id, Name, SAPRepairNo__c, Repair_Quotation_Id__c,MAFINAL__c
, Repair_Quotation_Id__r.MessageGroupNumber__c
from Repair__c
where Name in :receiptNoList];
@@ -191,6 +195,15 @@
repairUpdateMap.put(quoteInfo.SAPQuotationNo, rpr);
rpr.SAPRepairNo__c = quoteInfo.SAPRepairNo;
rpr.Repair_Rank__c = quoteInfo.RepairRank;
+ //DB202211397391鈥滅淮淇濋鍒も�濆拰鈥滅淮淇濋」鐩�濇柊澧炴柟妗� fy start
+ rpr.MAFINAL__c = 'X'.equals(quoteInfo.MAFINAL) ? '缁存姢淇濆吇椤圭洰锛圫AP)':'';
+ system.debug('quoteInfo.MAFINAL++'+quoteInfo.MAFINAL);
+ // if('X'.equals(quoteInfo.MAFINAL)){
+ // rpr.MAFINAL__c ='缁存姢淇濆吇椤圭洰锛圫AP)';
+ // }else{
+ // rpr.MAFINAL__c ='';
+ // }
+ //DB202211397391鈥滅淮淇濋鍒も�濆拰鈥滅淮淇濋」鐩�濇柊澧炴柟妗� fy end
/*if (String.isBlank(quoteInfo.CafeteriaFlag) == false && ( quoteInfo.CafeteriaFlag.length() == 15 || quoteInfo.CafeteriaFlag.length() == 18)) {
rpr.Dealer__c = quoteInfo.CafeteriaFlag;
}*/
@@ -225,6 +238,7 @@
rq.Repair_Rank__c = quoteInfo.RepairRank;
rq.ListPrice__c = String.isBlank(quoteInfo.ListPrice) ? null : Decimal.valueOf(quoteInfo.ListPrice);
rq.TotalPrice__c = String.isBlank(quoteInfo.TotalPrice) ? null : Decimal.valueOf(quoteInfo.TotalPrice);
+
// 2018/8/17 HWAG-B3P55Z start 娉ㄩ噴
//rq.CafeteriaFlag__c = quoteInfo.CafeteriaFlag == 'X' ? true : false;
// 2018/8/17 HWAG-B3P55Z start 娉ㄩ噴
@@ -270,6 +284,10 @@
}
else if (di.DiscountType == 'CCD绾跨煭') {
rq.CCD_cut__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
+ }
+ // 鎵撴姌鐞嗙敱澧炲姞锛氬彫鍥炲搴旓紙鏈嶅姟绠＄悊)
+ else if (di.DiscountType == '鍙洖瀵瑰簲') {
+ rq.callback_corresponding__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
}
else if (di.DiscountType == '鐗瑰埆瀵瑰簲') {
rq.Special_offer__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
@@ -445,6 +463,7 @@
}
List<Repair_Quotation_reason__c> qrsnList = new List<Repair_Quotation_reason__c>();
List<Repair_reason__c> rrsnList = new List<Repair_reason__c>();
+ Map<String ,Repair__c> repMap = new Map<String ,Repair__c>(); // 2023-01-06 zyh add
for (String rqName : quotationReasonsMap.keySet()) {
List<Repair_Quotation_reason__c> quotationReasons = quotationReasonsMap.get(rqName);
qrsnList.addAll(quotationReasons);
@@ -456,11 +475,20 @@
rrsnList.addAll(repairReasons);
for (Repair_reason__c rrsn : repairReasons) {
rrsn.Repair_quotation__c = rqNameMap.get(rqName).Id;
+ // 2022-01-06 zyh add start
+ Repair__c repTemp = new Repair__c();
+ repTemp.Id = rrsn.Repair__c;
+ repTemp.RepairReasonTrigger__c = Datetime.now();
+ repMap.put(repTemp.Id, repTemp);
+ // 2022-01-06 zyh add end
}
}
}
System.debug('deleteInsertReasons qrsnList=' + qrsnList);
if (rrsnList.size() > 0) insert rrsnList;
+ // 2022-01-06 zyh add start
+ if (repMap.size() > 0) update repMap.values();
+ // 2022-01-06 zyh add end
if (qrsnList.size() > 0) insert qrsnList;
}
--
Gitblit v1.9.1