From 17ef9dd2ae1d3de83cfa769d02ebe066ffb238dd Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 28 三月 2023 14:54:29 +0800
Subject: [PATCH] 上限合同补充
---
force-app/main/default/classes/NFM104Rest.cls | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/NFM104Rest.cls b/force-app/main/default/classes/NFM104Rest.cls
index 123bd2a..7bdbf44 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;
}*/
@@ -272,6 +285,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);
}
@@ -295,6 +312,10 @@
// add by hanchao 2016.7.21
else if (di.DiscountType == '杩愯緭绱㈣禂') {
rq.Delivery_compensation__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
+ }
+ //DB202303075842 LY 2023/3/6 add
+ else if (di.DiscountType == '涓婇檺鍚堝悓'){
+ rq.LimitPrice_contract_discount_amount__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
}
//
else if (di.DiscountType == '鍏朵粬') {
@@ -373,7 +394,6 @@
upsert rqList;
deleteInsertReasons(rqUpdateMap, quotationReasonsMap, null); // repairReasonsMap
}
-
if (repairUpdateMap.size() > 0) {
//鍚屾湡涓殑鎶ヤ环銈抴rite back, Id銇仱銇勩仸瑕嬬銈娿亴upsert寰屻仐銇嬨仺銈屻仾銇勩仹銇欍��
for (String sapQuotationNo : repairUpdateMap.keySet()) {
@@ -381,6 +401,7 @@
rpr.Repair_Quotation_Id__c = rqUpdateMap.get(sapQuotationNo).Id;
rpr.Repair_Estimated_Date__c = rqUpdateMap.get(sapQuotationNo).FirstQuotationDate__c;
rpr.Repair_Discount_Date__c = rqUpdateMap.get(sapQuotationNo).Repair_Discount_Date__c;
+
}
update repairUpdateMap.values();
}
@@ -446,6 +467,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);
@@ -457,11 +479,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