From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/NFM611Rest.cls | 71 ++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/force-app/main/default/classes/NFM611Rest.cls b/force-app/main/default/classes/NFM611Rest.cls
index 4b70495..f3aaadc 100644
--- a/force-app/main/default/classes/NFM611Rest.cls
+++ b/force-app/main/default/classes/NFM611Rest.cls
@@ -129,11 +129,11 @@
Repair__c repair = new Repair__c();
repair.Id = repairMap.get(repairNo);
String logisticsType = '';
- if (ged.repairOrderInfo.api_type == 1) {
+ if (ged.repairOrderInfo.api_type == 1) {//鎶ヤ环淇℃伅
repair.PlanQuotationTime__c = NFMUtil.parseStr2DateTime(ged.quotationInfo.PlanQuotationDate); //璁″垝鎶ヤ环鏃ユ湡
repair.ActualQuotationStartTime__c = NFMUtil.parseStr2DateTime(ged.quotationInfo.ActualQuotationDate); //瀹為檯鎶ヤ环寮�濮嬫椂闂�
repair.ActualQuotationEndTime__c = NFMUtil.parseStr2DateTime(ged.quotationInfo.ActualQuotationEndTime); //瀹為檯鎶ヤ环缁撴潫鏃堕棿
- } else if (ged.repairOrderInfo.api_type == 2) {
+ } else if (ged.repairOrderInfo.api_type == 2) {//褰掕繕淇℃伅
repair.PlanReturntime__c = NFMUtil.parseStr2DateTime(ged.EquipReturnInfo.PlanReturnDate); //璁″垝褰掕繕鏃ユ湡
repair.ActualReturnStartTime__c = NFMUtil.parseStr2DateTime(ged.EquipReturnInfo.ActualReturnStartTime); //瀹為檯褰掕繕寮�濮嬫椂闂�
repair.ActualReturnEndTime__c = NFMUtil.parseStr2DateTime(ged.EquipReturnInfo.ActualReturnDate); //瀹為檯褰掕繕缁撴潫鏃堕棿
@@ -142,22 +142,25 @@
repair.DeliveryLogisticsNo__c = ged.LogisticsInfo.logisticsNo; //閫佷慨鐗╂祦鍗曞彿
repair.LogisticsSendTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsSendTime); //閫佷慨鐗╂祦鍙戦�佹棩鏈�
repair.LogisticsReceiveTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsReceiveTime); //閫佷慨鐗╂祦绛炬敹鏃ユ湡
+ repair.LogisticsLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus; //閫佷慨鐗╂祦鏈�鏂扮姸鎬�
} else if (ged.repairOrderInfo.api_type == 4) {//褰掕繕鐗╂祦淇℃伅
logisticsType = '褰掕繕鐗╂祦';
repair.ReturnLogisticsNo__c = ged.LogisticsInfo.logisticsNo;
repair.ReturnLogisticsDeliveryTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsSendTime); //褰掕繕鐗╂祦鍙戦�佹棩鏈�
repair.ReturnLogisticsSigningTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsReceiveTime); //褰掕繕鐗╂祦绛炬敹鏃ユ湡
+ repair.ReturnLogisticsLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus; //褰掕繕鐗╂祦鏈�鏂扮姸鎬�
} else if (ged.repairOrderInfo.api_type == 5) {//杩斿搧鐗╂祦淇℃伅
logisticsType = '杩斿搧鐗╂祦';
repair.ReturnOrderSendTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsSendTime); //杩斿搧鐗╂祦鍙戦�佹棩鏈�
repair.ReturnOrderReceiveTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsReceiveTime); //杩斿搧鐗╂祦绛炬敹鏃ユ湡
repair.ReturnOrderNo__c = ged.LogisticsInfo.logisticsNo; //杩斿搧鐗╂祦鍗曞彿
repair.ReturnOrderLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus;
-
}
if (String.isNotBlank(logisticsType)) {
- LogisticsInformation__c logisticsInformation = DataAssembly(ged,logisticsType,logisticsInformationMap,repairMap);
- upsertLogisticsInformationList.add(logisticsInformation);
+ if (String.isNotBlank(ged.LogisticsInfo.logisticsNo)) { // 2022-11-08 zyh insert
+ LogisticsInformation__c logisticsInformation = DataAssembly(ged,logisticsType,logisticsInformationMap,repairMap);
+ upsertLogisticsInformationList.add(logisticsInformation);
+ } // 2022-11-08 zyh insert
}
updateList.add(repair);
}
@@ -214,11 +217,11 @@
if (ged.repairOrderInfo.api_type == null) {
result += 'DataError: [ ' + repairNo + ' ] api_type is null!\n';
}
- if ((ged.repairOrderInfo.api_type == 3 || ged.repairOrderInfo.api_type == 4 || ged.repairOrderInfo.api_type == 5) &&
+ /*if ((ged.repairOrderInfo.api_type == 3 || ged.repairOrderInfo.api_type == 4 || ged.repairOrderInfo.api_type == 5) &&
String.isBlank(ged.LogisticsInfo.logisticsNo)) {
result += 'DataError: [ ' + repairNo + ' ] logisticsNo is null!\n';
- }
+ }*/ // 2022-11-08 zyh 娉ㄩ噴
}
@@ -232,19 +235,22 @@
private static Map < String, Map < String, Id >> getLogisticsInformationMap(Map < String, GeData > geDataMap) {
List < LogisticsInformation__c > logisticsInformationList = [Select Id, LogisticsNo__c, LogisticsRepair__r.Name FROM LogisticsInformation__c WHERE LogisticsRepair__r.Name IN: geDataMap.keySet()];
Map < String, Map < String, Id >> result = new Map < String, Map < String, Id >> ();
- for (LogisticsInformation__c logistics: logisticsInformationList) {
+ if (logisticsInformationList.size() > 0) { //2022-11-08 zyh insert
+
+ for (LogisticsInformation__c logistics: logisticsInformationList) {
- String repairName = logistics.LogisticsRepair__r.Name;
- String logisticsNo = logistics.LogisticsNo__c;
- Map < String, Id > logisticsMap = new Map < String, Id > ();
+ String repairName = logistics.LogisticsRepair__r.Name;
+ String logisticsNo = logistics.LogisticsNo__c;
+ Map < String, Id > logisticsMap = new Map < String, Id > ();
- if (result.containsKey(repairName)) {
- logisticsMap = result.get(repairName);
+ if (result.containsKey(repairName)) {
+ logisticsMap = result.get(repairName);
+ }
+ logisticsMap.put(logistics.LogisticsNo__c, logistics.Id);
+ result.put(repairName, logisticsMap);
+
}
- logisticsMap.put(logistics.LogisticsNo__c, logistics.Id);
- result.put(repairName, logisticsMap);
-
- }
+ } //2022-11-08 zyh insert
return result;
}
/**
@@ -272,11 +278,32 @@
System.debug('logisticsNo--->'+logisticsNo);
result.Name = logisticsNo;
result.Id = logisticsMap.containsKey(logisticsNo) ? logisticsMap.get(logisticsNo) : null;
- result.LogisticsNo__c = logisticsNo; //鐗╂祦鍗曞彿
- result.LogisticsCompany__c = ged.LogisticsInfo.carrier; //鎵胯繍鍟�
- result.LogisticsSendTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsSendTime); //鐗╂祦鍙戦�佹棩鏈�
- result.LogisticsSignTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsReceiveTime); //鐗╂祦绛炬敹鏃ユ湡
- result.LogisticsLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus; //鐗╂祦鏈�鏂扮姸鎬�
+ //update wangweipeng 2022/02/17 start
+ // result.LogisticsNo__c = logisticsNo; //鐗╂祦鍗曞彿
+ // result.LogisticsCompany__c = ged.LogisticsInfo.carrier; //鎵胯繍鍟�
+ // result.LogisticsSendTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsSendTime); //鐗╂祦鍙戦�佹棩鏈�
+ // result.LogisticsSignTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsReceiveTime); //鐗╂祦绛炬敹鏃ユ湡
+ // result.LogisticsLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus; //鐗╂祦鏈�鏂扮姸鎬�
+ if (ged.repairOrderInfo.api_type == 3) {//閫佷慨鐗╂祦淇℃伅
+ result.LogisticsNo__c = logisticsNo; //閫佷慨鐗╂祦鍗曞彿
+ result.LogisticsCompany__c = ged.LogisticsInfo.carrier; //閫佷慨鐗╂祦鎵胯繍鍟�
+ result.LogisticsSendTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsSendTime); //閫佷慨鐗╂祦鍙戦�佹棩鏈�
+ result.LogisticsSignTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsReceiveTime); //閫佷慨鐗╂祦绛炬敹鏃ユ湡
+ result.LogisticsLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus; //閫佷慨鐗╂祦鏈�鏂扮姸鎬�
+ } else if (ged.repairOrderInfo.api_type == 4) {//褰掕繕鐗╂祦淇℃伅
+ result.ReturnLogisticsNo__c = logisticsNo; //褰掕繕鐗╂祦鍗曞彿
+ result.ReturnLogisticsLogisticsCompany__c = ged.LogisticsInfo.carrier; //褰掕繕鐗╂祦鎵胯繍鍟�
+ result.ReturnLogisticsDeliveryTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsSendTime); //褰掕繕鐗╂祦鍙戦�佹棩鏈�
+ result.ReturnLogisticsSigningTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsReceiveTime); //褰掕繕鐗╂祦绛炬敹鏃ユ湡
+ result.ReturnLogisticsLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus; //褰掕繕鐗╂祦鏈�鏂扮姸鎬�
+ } else if (ged.repairOrderInfo.api_type == 5) {//杩斿搧鐗╂祦淇℃伅
+ result.ReturnOrderNo__c = logisticsNo; //杩斿搧鐗╂祦鍗曞彿
+ result.ReturnOrderLogisticsCompany__c = ged.LogisticsInfo.carrier; //杩斿搧鐗╂祦鎵胯繍鍟�
+ result.ReturnOrderDeliveryTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsSendTime); //杩斿搧鐗╂祦鍙戦�佹棩鏈�
+ result.ReturnOrderSigningTime__c = NFMUtil.parseStr2DateTime(ged.LogisticsInfo.logisticsReceiveTime); //杩斿搧鐗╂祦绛炬敹鏃ユ湡
+ result.ReturnOrderLatestStatus__c = ged.LogisticsInfo.logisticsLatestStatus; //杩斿搧鐗╂祦鏈�鏂扮姸鎬�
+ }
+ //update wangweipeng 2022/02/17 end
result.LogisticsType__c = logisticsType;//鐗╂祦鍒嗙被
result.LogisticsRepair__c = repairMap.get(repairNo);//淇悊
return result;
--
Gitblit v1.9.1