From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容
---
force-app/main/default/classes/NFM105Rest.cls | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/NFM105Rest.cls b/force-app/main/default/classes/NFM105Rest.cls
index 8ef3c2e..78cd7cd 100644
--- a/force-app/main/default/classes/NFM105Rest.cls
+++ b/force-app/main/default/classes/NFM105Rest.cls
@@ -25,6 +25,9 @@
public String IncorrectDataComment;
public String ReturnType;
public String InspectType;
+ //WLIG-CC78MX 銆愬鎵樸�慛FM105鎺ュ彛澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220307 start
+ public String OTSRepairOrder;
+ //WLIG-CC78MX 銆愬鎵樸�慛FM105鎺ュ彛澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220307 end
public InspectionResultInformation[] InspectionResultInformation;
public FailureInformation[] FailureInformation;
}
@@ -265,6 +268,7 @@
// continue;
// }
logstr += ' ';
+ System.debug('rpr1:' + rpr);
rprUpdateMap.put(rpr.SAPRepairNo__c, rpr);
} else {
logstr += quoteInfo.SAPRepairNo + ':' + quoteInfo.RepairOrderStatusCode + '(' + quoteInfo.SAPQuotationNo + ') ';
@@ -379,10 +383,12 @@
if (quoteInfo.RepairOrderStatusCode == 'A20') {
// A20-RC鍙楃悊瀹屾垚
rpr.Repair_Ordered_Date__c = statusUpdateDateTime.date();
+ rpr.Repair_Ordered_DateTime__c = statusUpdateDateTime;
rpr.Repair_Ordered_Date_PersonName__c = quoteInfo.StatusUpdatePersonName;
} else if (quoteInfo.RepairOrderStatusCode == 'A30') {
// A30-鍙楃悊妫�鏌ュ畬鎴�
rpr.Repair_Inspection_Date__c = statusUpdateDateTime.date();
+ rpr.Repair_Inspection_DateTime__c = statusUpdateDateTime;
rpr.ReRepairObject_result__c = quoteInfo.ReRepairObject == 'X' ? true : false;
// 2020/06/08 tqz add start
@@ -400,6 +406,7 @@
// A96-鍙栨秷淇悊銆�銆�銆�銆�鍥犳姤浠烽噾棰濋珮绛夊師鍥狅紝閿�鍞湰閮ㄧ敵璇锋湭淇悊 锛堥攢鍞湰閮ㄧ敵璇蜂负涓伙級
rpr.Invalid_check__c = true; //淇悊璁板綍鏃犳晥
rpr.repair_cancel_date__c = statusUpdateDateTime.date();
+ rpr.repair_cancel_dateTime__c = statusUpdateDateTime;
rpr.CancellationReason__c = quoteInfo.CancellationReason;
} else if (quoteInfo.RepairOrderStatusCode == 'A99') {
// A99-淇悊鍗曞叧闂��銆�銆�鍥犵敵璇峰唴瀹瑰拰瀹為檯瀹炵墿淇℃伅鐢卞樊寮傦紝RC椹冲洖姝ゆ鐢宠鐨勪慨鐞�
@@ -410,6 +417,7 @@
ast.Agreed_Repair__c = rpr.Id;
// B95-鎶ヤ环鍚屾剰纭
rpr.Agreed_Date__c = statusUpdateDateTime.date();
+ rpr.Agreed_DateTime__c = statusUpdateDateTime;
rpr.Agreed_Date2__c = statusUpdateDateTime.date();
// rpr.Agreed_Date__c <== TODO goto OFS銇仸瑷畾銇欍倠銇с仐銈囥亞銇嬶紵
} else if (quoteInfo.RepairOrderStatusCode == 'B99') {
@@ -423,16 +431,20 @@
} else if (quoteInfo.RepairOrderStatusCode == 'X30') {
// X30-鍏ㄩ儴鍒嗛厤
rpr.part_arrangement_complete__c = statusUpdateDateTime.date();
+ rpr.part_arrangement_complete_DateTime__c = statusUpdateDateTime;
} else if (quoteInfo.RepairOrderStatusCode == 'C50') {
// C50-寮�濮嬩慨鐞�
rpr.Repair_Start_Date__c = statusUpdateDateTime.date();
+ rpr.Repair_Start_DateTime__c = statusUpdateDateTime;
rpr.Planned_Repair_Completed_Date__c = NFMUtil.parseStr2Date(quoteInfo.PlannedRepairFinishDate);
} else if (quoteInfo.RepairOrderStatusCode == 'C70') {
// C70-淇悊瀹屾垚
rpr.Repair_Completed_Date__c = statusUpdateDateTime.date();
+ rpr.Repair_Completed_DateTime__c = statusUpdateDateTime;
} else if (quoteInfo.RepairOrderStatusCode == 'C90') {
// C90-鏈�缁堟鏌�
rpr.Repair_Final_Inspection_Date__c = statusUpdateDateTime.date();
+ rpr.Repair_Final_Inspection_DateTime__c = statusUpdateDateTime;
Asset ast = getAstUpdate(astUpdateMap, rpr);
ast.LastSFDCRepairReturn_day__c = statusUpdateDateTime.date();
ast.LastSFDCRepairNo__c = rpr.Name;
@@ -462,6 +474,11 @@
// L60-SORC淇悊鍝佸嚭搴�
// L65-OGZ淇悊鍝佸嚭搴�
// L80-RC淇悊鍝佸嚭搴�
+ //WLIG-CC78MX 銆愬鎵樸�慛FM105鎺ュ彛澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220307 start
+ if(String.isNotBlank(quoteInfo.OTSRepairOrder)){
+ rpr.OTSRepairOrder__c = quoteInfo.OTSRepairOrder;
+ }
+ //WLIG-CC78MX 銆愬鎵樸�慛FM105鎺ュ彛澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220307 end
Asset ast = getAstUpdate(astUpdateMap, rpr);
if (rpr.Return_Without_Repair_IF__c == true) {
rpr.Return_Without_Repair_Date__c = statusUpdateDateTime.date();
@@ -473,6 +490,7 @@
if (quoteInfo.RepairOrderStatusCode == 'L80') {
//11.RC淇悊鍝佽繑閫佹棩
rpr.Repair_Shipped_Date__c = statusUpdateDateTime.date();
+ rpr.Repair_Shipped_DateTime__c = statusUpdateDateTime;
//鍥炶繑绫诲埆
rpr.ReturnType__c = quoteInfo.ReturnType;
if (quoteInfo.ReturnType == 'A20' || quoteInfo.ReturnType == 'B30') {
@@ -507,18 +525,22 @@
else if (quoteInfo.RepairOrderStatusCode == 'L20') {
// L20-RC杞琒ORC鏃�
rpr.RcSorcDate__c = statusUpdateDateTime.date();
+ rpr.RcSorcDateTime__c = statusUpdateDateTime;
}else if (quoteInfo.RepairOrderStatusCode == 'L25') {
// L25-RC杞琌GZ鏃�
rpr.RcOgzDate__c = statusUpdateDateTime.date();
}else if (quoteInfo.RepairOrderStatusCode == 'L30') {
// L30-SORC鍙楃悊鏃�
rpr.SorcAcceptDate__c = statusUpdateDateTime.date();
+ rpr.SorcAcceptDateTime__c = statusUpdateDateTime;
}else if (quoteInfo.RepairOrderStatusCode == 'L40') {
// L40-SORC杞琌GZ鏃�
rpr.SorcOgzDate__c = statusUpdateDateTime.date();
+ rpr.SorcOgzDateTime__c = statusUpdateDateTime;
}else if (quoteInfo.RepairOrderStatusCode == 'L45') {
// L45-OGZ鍙楃悊鏃�
rpr.OgzAcceptDate__c = statusUpdateDateTime.date();
+ rpr.OgzAcceptDateTime__c = statusUpdateDateTime;
}
//WLIG-C8TACX LY 20211206 End
if (String.isBlank(rpr.NFM105_MessageGroupNumber__c) || Integer.valueOf(rpr.NFM105_MessageGroupNumber__c) <= Integer.valueOf(rowData.MessageGroupNumber__c)) {
@@ -532,6 +554,7 @@
for (Repair_Quotation__c rqfalse : rqList) {
rqfalse.Quotation_agreement__c = false;
}
+ System.debug('rqUpdateMap1:' + rqUpdateMap);
rqList.addAll(rqUpdateMap.values());
if (rqList.size() > 0) {
// TODO update false;
--
Gitblit v1.9.1