From bb40778647eee144863ee08cb20506838847d884 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期四, 14 四月 2022 17:41:42 +0800
Subject: [PATCH] Merge branch 'WLIG-CC78MX'
---
force-app/main/default/classes/NFM105Rest.cls | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/NFM105Rest.cls b/force-app/main/default/classes/NFM105Rest.cls
index 7b4bb1f..80e7a37 100644
--- a/force-app/main/default/classes/NFM105Rest.cls
+++ b/force-app/main/default/classes/NFM105Rest.cls
@@ -26,7 +26,7 @@
public String ReturnType;
public String InspectType;
//WLIG-CC78MX 銆愬鎵樸�慛FM105鎺ュ彛澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220307 start
- // public String OTSRepairOrder;
+ public String OTSRepairOrder;
//WLIG-CC78MX 銆愬鎵樸�慛FM105鎺ュ彛澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220307 end
public InspectionResultInformation[] InspectionResultInformation;
public FailureInformation[] FailureInformation;
@@ -475,9 +475,9 @@
// L65-OGZ淇悊鍝佸嚭搴�
// L80-RC淇悊鍝佸嚭搴�
//WLIG-CC78MX 銆愬鎵樸�慛FM105鎺ュ彛澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220307 start
- // if(String.isNotBlank(quoteInfo.OTSRepairOrder)){
- // rpr.OTSRepairOrder__c = quoteInfo.OTSRepairOrder;
- // }
+ 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) {
@@ -554,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