From 2aa8da8af66aa8ae00f25831aed6bb0364176e7b Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 24 二月 2022 20:32:31 +0800
Subject: [PATCH] 1.15---2.24 变更代码
---
force-app/main/default/classes/NFM603Controller.cls | 75 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/classes/NFM603Controller.cls b/force-app/main/default/classes/NFM603Controller.cls
index 8a57ad7..b62e5c9 100644
--- a/force-app/main/default/classes/NFM603Controller.cls
+++ b/force-app/main/default/classes/NFM603Controller.cls
@@ -220,7 +220,20 @@
DnNO__c,
OgzAcceptDate__c,
DeliveryLogisticsAnnotation__c,
- Department_Class__r.Management_Code__c
+ Department_Class__r.Management_Code__c,
+ Repair_Ordered_DateTime__c,
+ Repair_Inspection_DateTime__c,
+ repair_cancel_dateTime__c,
+ RcSorcDateTime__c,
+ SorcAcceptDateTime__c,
+ OgzAcceptDateTime__c,
+ part_arrangement_complete_DateTime__c,
+ Repair_Start_DateTime__c,
+ Repair_Completed_DateTime__c,
+ Repair_Final_Inspection_DateTime__c,
+ Repair_Shipped_DateTime__c,
+ Repair_Discount_approval_DateTime_form__c,
+ Agreed_DateTime__c
from Repair__c where id in: repairOrderIdList
];
}
@@ -273,7 +286,10 @@
info.FaultDesc = reasonMap.get(repair.id); //鏁呴殰鎻忚堪List
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
info.deliveryLogisticsMode = repair.DeliveryLogisticsMode__c; //閫佷慨鐗╂祦鏂瑰紡======鑷繁鍐欏瓧娈�
- info.engineerSendDate = NFMUtil.formatDate2StrDateTime(repair.engineerSendDate__c); // 宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
+ //update wangweipeng 2022/02/16 start
+ //info.engineerSendDate = NFMUtil.formatDate2StrDateTime(repair.engineerSendDate__c); // 宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
+ info.engineerSendDate = NFMUtil.formatDateTime2Str(repair.engineerSendDate__c); // 宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
+ //update wangweipeng 2022/02/16 end
info.deliveryLogisticsNo = repair.DeliveryLogisticsNo__c; //閫佷慨鐗╂祦鍗曞彿======鑷繁鍐欏瓧娈�
info.returnLogisticsMode = repair.ReturnLogisticsMode__c; //杩旈�佺墿娴佹柟寮�======鑷繁鍐欏瓧娈�
info.DeliveryLogisticsAnnotation = repair.DeliveryLogisticsAnnotation__c; //閫佷慨鐗╂祦淇℃伅澶囨敞
@@ -283,29 +299,46 @@
info.returnLogisticsSendTime = NFMUtil.formatDateTime2Str(repair.ReturnOrderSendTime__c); //杩旈�佺墿娴佸彂閫佹椂闂�======鑷繁鍐欏瓧娈�
info.returnLogisticsReceiveTime = NFMUtil.formatDateTime2Str(repair.ReturnLogisticsReceiveTime__c); //杩旈�佺墿娴佺鏀舵椂闂�======鑷繁鍐欏瓧娈�
info.repairproductsRevDate = NFMUtil.formatDate2StrDateTime(repair.On_Site_Repair_Order_Date__c); //鏁呴殰鍝佹帴鏀舵棩
- info.FSErepairApplyDate = NFMUtil.formatDate2StrDateTime(repair.FSE_ApplyForRepair_Day__c); //FSE淇悊鐢宠鏃�======鑷繁鍐欏瓧娈�
+ //update wangweipeng 2022/02/16 start
+ //info.FSErepairApplyDate = NFMUtil.formatDate2StrDateTime(repair.FSE_ApplyForRepair_Day__c); //FSE淇悊鐢宠鏃�======鑷繁鍐欏瓧娈�
+ info.FSErepairApplyDate = NFMUtil.formatDateTime2Str(repair.FSE_ApplyForRepair_time__c); // FSE淇悊鐢宠鏃堕棿
+ //update wangweipeng 2022/02/16 end
info.logisticsSendDate = NFMUtil.formatDateTime2Str(repair.LogisticsSendTime__c); //鐗╂祦鍙戦�佹棩======鑷繁鍐欏瓧娈�
info.logisticsReceiveDate = NFMUtil.formatDateTime2Str(repair.LogisticsReceiveTime__c); //鐗╂祦鎺ユ敹鏃�======鑷繁鍐欏瓧娈�
- info.SAPrepairApplyDate = NFMUtil.formatDate2StrDateTime(repair.SAP_Transfer_day__c); //SAP淇悊鐢宠鏃�======鑷繁鍐欏瓧娈�
- info.RCacceptanceDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Ordered_Date__c); //淇悊鍝丷C鍙楃悊鏃�
- info.inspectionDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Inspection_Date__c); //淇悊妫�娴嬫棩
- info.FirstQuotationDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Firstestimated_Date_formula__c); //鍒濇鎶ヤ环鏃�
+ //update wangweipeng 2022/02/16 start
+ //info.SAPrepairApplyDate = NFMUtil.formatDate2StrDateTime(repair.SAP_Transfer_day__c); //SAP淇悊鐢宠鏃�======鑷繁鍐欏瓧娈�
+ info.SAPrepairApplyDate = NFMUtil.formatDateTime2Str(repair.SAP_Transfer_time__c); // SAP淇悊鐢宠鏃堕棿
+ //info.RCacceptanceDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Ordered_Date__c); //淇悊鍝丷C鍙楃悊鏃�
+ info.RCacceptanceDate = NFMUtil.formatDateTime2Str(repair.Repair_Ordered_DateTime__c); //4.淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級
+ //info.inspectionDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Inspection_Date__c); //淇悊妫�娴嬫棩
+ info.inspectionDate = NFMUtil.formatDateTime2Str(repair.Repair_Inspection_DateTime__c); //5.淇悊妫�娴嬫棩锛堝皬绋嬪簭锛�
+ info.FirstQuotationDate = NFMUtil.formatDate2StrDateNewTime(repair.Repair_Firstestimated_Date_formula__c); //鍒濇鎶ヤ环鏃�
+ //info.priceApprovalDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Discount_approval_Date_formula__c); //鍑忎环鐢宠鎵瑰噯鏃�
+ info.priceApprovalDate = NFMUtil.formatDateTime2Str(repair.Repair_Discount_approval_DateTime_form__c); //鍑忎环鐢宠鎵瑰噯鏃ワ紙灏忕▼搴忥級
+ info.quotationDate = NFMUtil.formatDate2StrDateNewTime(repair.Repair_Quotation_date__c); //鎶ヤ环鏃�
+ //info.cancelRepairDate = NFMUtil.formatDate2StrDateTime(repair.repair_cancel_date__c); //淇悊鍙栨秷鏃�
+ info.cancelRepairDate = NFMUtil.formatDateTime2Str(repair.repair_cancel_dateTime__c); //淇悊鍙栨秷鏃ワ紙灏忕▼搴忥級
+ //info.userAgreeDAte = NFMUtil.formatDate2StrDateTime(repair.Agreed_Date__c); //鐢ㄦ埛鍚屾剰鏃�
+ info.userAgreeDAte = NFMUtil.formatDateTime2Str(repair.Agreed_DateTime__c); //7.鐢ㄦ埛鍚屾剰鏃ワ紙灏忕▼搴忥級
+ //info.partsCompleteDate = NFMUtil.formatDate2StrDateTime(repair.part_arrangement_complete__c); //闆朵欢榻愬瀹屾瘯鏃�
+ info.partsCompleteDate = NFMUtil.formatDateTime2Str(repair.part_arrangement_complete_DateTime__c); //闆朵欢榻愬瀹屾瘯鏃�
+ //info.repairStartDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Start_Date__c); //淇悊寮�濮嬫棩
+ info.repairStartDate = NFMUtil.formatDateTime2Str(repair.Repair_Start_DateTime__c); //8.淇悊寮�濮嬫棩锛堝皬绋嬪簭锛�
+ //info.repairCompleteDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Completed_Date__c); //淇悊瀹屾垚鏃�
+ info.repairCompleteDate = NFMUtil.formatDateTime2Str(repair.Repair_Completed_DateTime__c); //9.淇悊瀹屾垚鏃ワ紙灏忕▼搴忥級
+ //info.finalTestDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Final_Inspection_Date__c); //鏈�缁堟娴嬫棩
+ info.finalTestDate = NFMUtil.formatDateTime2Str(repair.Repair_Final_Inspection_DateTime__c); //10.鏈�缁堟娴嬫棩锛堝皬绋嬪簭锛�
+ //update wangweipeng 2022/02/16 end
info.planQuotationDate = NFMUtil.formatDateTime2Str(repair.PlanQuotationTime__c); //璁″垝鎶ヤ环鏃�======鑷繁鍐欏瓧娈�
info.ActualQuotationDate = NFMUtil.formatDateTime2Str(repair.ActualQuotationStartTime__c); //瀹為檯鎶ヤ环鏃�======鑷繁鍐欏瓧娈�
- info.quotationDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Quotation_date__c); //鎶ヤ环鏃�
- info.priceApprovalDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Discount_approval_Date_formula__c); //鍑忎环鐢宠鎵瑰噯鏃�
info.finalQuotationPrice = repair.Discount_Price_formula__c; //鏈�缁堟姤浠烽噾棰�======鑷繁鍐欏瓧娈�
- info.userAgreeDAte = NFMUtil.formatDate2StrDateTime(repair.Agreed_Date__c); //鐢ㄦ埛鍚屾剰鏃�
- info.partsCompleteDate = NFMUtil.formatDate2StrDateTime(repair.part_arrangement_complete__c); //闆朵欢榻愬瀹屾瘯鏃�
- info.repairStartDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Start_Date__c); //淇悊寮�濮嬫棩
info.repairCompleteExpectedDate = NFMUtil.formatDate2StrDateTime(repair.Planned_Repair_Completed_Date__c); //淇悊瀹屾垚棰勮鏃�
- info.repairCompleteDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Completed_Date__c); //淇悊瀹屾垚鏃�
- info.finalTestDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Final_Inspection_Date__c); //鏈�缁堟娴嬫棩
info.RCreturnDate = null; //RC淇悊鍝佽繑閫佹棩
info.ReturnsProductWay = null; //杩斿搧鏂瑰紡
if (repair.Repair_Shipped_Date__c != null && String.isNotBlank(repair.Returns_Product_waySAP__c)) {
- info.RCreturnDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Shipped_Date__c); //RC淇悊鍝佽繑閫佹棩
+ //info.RCreturnDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Shipped_Date__c); //RC淇悊鍝佽繑閫佹棩
+ info.RCreturnDate = NFMUtil.formatDateTime2Str(repair.Repair_Shipped_DateTime__c); //RC淇悊鍝佽繑閫佹棩 wangweipeng 2022/02/16
info.ReturnsProductWay = repair.Returns_Product_waySAP__c; //杩斿搧鏂瑰紡
}
@@ -319,17 +352,21 @@
info.payCompleteDate = NFMUtil.formatDate2StrDateTime(repair.Received_Date__c); //鍥炴瀹屾瘯鏃�
info.incomeReckoninDate = NFMUtil.formatDate2StrDateTime(repair.Facility_Return_Receipt_Collection_Date__c); //鏀跺叆璁″叆鏃�
info.abandonPayDate = NFMUtil.formatDate2StrDateTime(repair.BaddebtsDate__c); //鏀惧純鍥炴鏃�
- info.cancelRepairDate = NFMUtil.formatDate2StrDateTime(repair.repair_cancel_date__c); //淇悊鍙栨秷鏃�
info.repairOrderCompleteDate = NFMUtil.formatDate2StrDateTime(repair.RepairOrder_Complete_Day__c); //淇悊鍗曞畬鎴愭棩
info.applySpareEquip = repair.if_Rental_Apply__c; //鏄惁鐢宠澶囧搧======鑷繁鍐欏瓧娈�
info.supplySpareEquip = repair.Offer_Rental_New__c + ''; //鏄惁鎻愪緵澶囧搧
info.SparePartsLendingRecord = rentalMap.get(repair.Id);
+ //update wangweipeng 2022/02/16 start
+ //info.RcSorcDate = NFMUtil.formatDate2StrDateTime(repair.RcSorcDate__c);//RC杞琒ORC鏃�
+ info.RcSorcDate = NFMUtil.formatDateTime2Str(repair.RcSorcDateTime__c);//RC杞琒ORC鏃ワ紙灏忕▼搴忥級
+ //info.SorcAcceptDate = NFMUtil.formatDate2StrDateTime(repair.SorcAcceptDate__c);//SORC鍙楃悊鏃�
+ info.SorcAcceptDate = NFMUtil.formatDateTime2Str(repair.SorcAcceptDateTime__c);//SORC鍙楃悊鏃ワ紙灏忕▼搴忥級
+ //info.OgzAcceptDate = NFMUtil.formatDate2StrDateTime(repair.OgzAcceptDate__c);//OGZ鍙楃悊鏃�
+ info.OgzAcceptDate = NFMUtil.formatDateTime2Str(repair.OgzAcceptDateTime__c);//OGZ鍙楃悊鏃ワ紙灏忕▼搴忥級
+ //update wangweipeng 2022/02/16 end
- info.RcSorcDate = NFMUtil.formatDate2StrDateTime(repair.RcSorcDate__c);
- info.SorcAcceptDate = NFMUtil.formatDate2StrDateTime(repair.SorcAcceptDate__c);
info.SorcOgzDate = NFMUtil.formatDate2StrDateTime(repair.SorcOgzDate__c);
- info.OgzAcceptDate = NFMUtil.formatDate2StrDateTime(repair.OgzAcceptDate__c);
info.cus_dn = repair.DnNO__c;
repairs.add(info);
--
Gitblit v1.9.1