From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/classes/NFM612Rest.cls | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/NFM612Rest.cls b/force-app/main/default/classes/NFM612Rest.cls
index 7ba17ef..d9cfaad 100644
--- a/force-app/main/default/classes/NFM612Rest.cls
+++ b/force-app/main/default/classes/NFM612Rest.cls
@@ -8,6 +8,13 @@
global class GeData {
public RepairOderInfo repairOderInfo;
public ApplyRepairInfo applyRepairInfo;
+ public problem problem;
+ public Logistics logistics; //鐗╂祦 zhj 鏀归�犳柊澧炲瓧娈� 2023-02-14
+ public String item0010; //澶囩敤瀛楁 zhj 鏀归�犳柊澧炲瓧娈� 2023-02-14
+ public String item0020; //澶囩敤瀛楁 zhj 鏀归�犳柊澧炲瓧娈� 2023-02-14
+ public String item0030; //澶囩敤瀛楁 zhj 鏀归�犳柊澧炲瓧娈� 2023-02-14
+ public String item0040; //澶囩敤瀛楁 zhj 鏀归�犳柊澧炲瓧娈� 2023-02-14
+ public String item0050; //澶囩敤瀛楁 zhj 鏀归�犳柊澧炲瓧娈� 2023-02-14
}
//鎶ヤ慨鍗曚俊鎭�
public class RepairOderInfo {
@@ -69,6 +76,9 @@
public String cancelleRepairDate; //鍙栨秷鎶ヤ慨鏃�
public String cancelReportReason; //鍙栨秷鎶ヤ慨鍘熷洜
+
+
+
}
//璁惧淇℃伅
@@ -77,6 +87,47 @@
public String equipmentCd; //鏈鸿韩缂栫爜(宸ョ▼甯�)
public String responseResultDesc; //搴斿鎻忚堪
public String processResult; //澶勭悊缁撴灉
+ }
+ //鏁呴殰澶勭悊淇℃伅
+ public class problem {
+ public String dateReceiptQuestions; //鎶曡瘔鐭ユ倝鏃ワ紙Complaint Aware Date锛�
+ public String ifDeadHurt; //鏄惁鏈夋浜°�佷激瀹炽�佹劅鏌�
+ public String problemOccurred; //闂鍙戠敓鏃堕棿鎯呭喌
+ public String problemOccurredSelect; //闂鍙戠敓鏃堕棿鎯呭喌 鍏朵粬
+ public String reportAdverseEvents; //鍖婚櫌鏈夋病鏈夊悜鏀垮簻鏈哄叧鎶ュ憡涓嶈壇浜嬩欢鎴栫枒浼间笉鑹簨浠�
+ public String whatProject; //鍋氱殑鏄摢涓」鐩�
+ public String operationOrExaminationName; //鎵嬫湳/妫�鏌ュ悕绉�
+ public String breakORFallOff; //鏄惁鏈夊彂鐢熸柇瑁傛垨鑴辫惤
+ public String useFailProductFinish; //鏄惁鐢ㄨ浜у搧瀹屾垚浜嗘墜鏈�/妫�鏌�
+ public String supportingProducts; //閰嶅浣跨敤浜у搧
+ public String afterFailureInformation; //鍙戠幇鏁呴殰鍚庯紝鍖婚櫌瀵规偅鑰呯殑澶勭悊鎯呭喌
+ public String delay15Min; //鍙戠幇鏁呴殰鐜拌薄鍚庯紝鏈夊欢璇�15鍒嗛挓浠ヤ笂鐨勬墜鏈疄鏂界殑鎯呭喌鍙戠敓鍚�
+ public String informationFrom; //淇℃伅鏄粠鍖婚櫌鐨勮皝閭ｉ噷寰楀埌鐨�
+ public String failureQInHospital; //鍦ㄥ尰闄紝鏁呴殰鍙戠敓鐨勯鐜囨槸澶氬皯
+ public String delayReportReason; //瓒呮椂鎶ュ憡鐨勭悊鐢�
+ public String isProductFaultRelated; //鏄惁涓庤繖娆′骇鍝佹晠闅滅浉鍏�
+ }
+ //鐗╂祦
+ public class logistics {
+ public String isOts; //鏄惁浣跨敤ots
+ public String senderOrgCode; //閫佷慨鏈烘瀯浠ｇ爜
+ public String senderCompany; //閫佷慨鏈烘瀯鍚嶇О
+ public String senderName; //閫佷慨浜哄鍚�
+ public String senderMobilePhone; //閫佷慨浜烘墜鏈�
+ public String senderAddress; //閫佷慨浜哄湴鍧�
+ public String recepientCompany; //鎺ユ敹鏈烘瀯鍚嶇О
+ public String recepientName; //鎺ユ敹閫佷慨浜哄鍚�
+ public String recepientMobilePhone; //鎺ユ敹浜烘墜鏈�
+ public String recepientAddress; //鎺ユ敹浜哄湴鍧�
+ public String returnWayType; //杩斿搧鏂瑰紡
+ public String orderNumber; //閫佷慨鐗╂祦鍗曞彿
+ public String failureReason; //涓嬪崟澶辫触鍘熷洜
+ public String logisticsSendDate; //閫佷慨鐗╂祦鍙戦�佹棩
+ public String item0010; //澶囩敤瀛楁1
+ public String item0020; //澶囩敤瀛楁2
+ public String item0030; //澶囩敤瀛楁3
+ public String item0040; //澶囩敤瀛楁4
+ public String item0050; //澶囩敤瀛楁5
}
@HttpPost
global static void doPost() {
@@ -131,6 +182,11 @@
return;
}
Savepoint sp = Database.setSavepoint();
+ /*List<RepairSubOrder__c> rsoList = [SELECT Id FROM RepairSubOrder__c WHERE Name = ged.repairOderInfo.repairOrderNo2];
+ if (rsoList.size() > 0) {
+
+ }
+*/
try {
List < RepairSubOrder__c > repairList = new List < RepairSubOrder__c > ();
Map < String, GeData > gedMap = new Map < String, GeData > ();
@@ -177,6 +233,7 @@
// 闄勪欢涓嬭浇鏍囪
Boolean attachmentDownloadFlg = false;
String repairOrderNo2Str = '鎶ヤ慨瀛愬崟No [ \n';
+ Map<String,RepairSubOrder__c> RsoMap = new Map<String,RepairSubOrder__c>();
for (String repairOrderNo2: gedMap.keySet()) {
GeData ged = gedMap.get(repairOrderNo2);
@@ -272,7 +329,43 @@
// repair.CancelleRepairTime__c = NFMUtil.parseStr2Date(ged.repairOderInfo.CancelDate); //鍙楃悊浜哄彇娑堟姤淇棩
repair.RepairCancelReason__c = ged.repairOderInfo.cancelReportReason; //淇悊鍙栨秷鍘熷洜
// 2022/4/6 zhangyuheng update end
-
+ // 2023-02-20 zyh add start
+ repair.DateReceiptQuestions__c = ged.problem.dateReceiptQuestions; //鎶曡瘔鐭ユ倝鏃ワ紙Complaint Aware Date锛�
+ repair.IfDeadHurt__c = ged.problem.ifDeadHurt; //鏄惁鏈夋浜°�佷激瀹炽�佹劅鏌�
+ repair.ProblemOccurred__c = ged.problem.problemOccurred; //闂鍙戠敓鏃堕棿鎯呭喌
+ repair.ProblemOccurredSelect__c = ged.problem.problemOccurredSelect; //闂鍙戠敓鏃堕棿鎯呭喌 鍏朵粬
+ repair.ReportAdverseEvents__c = ged.problem.reportAdverseEvents; //鍖婚櫌鏈夋病鏈夊悜鏀垮簻鏈哄叧鎶ュ憡涓嶈壇浜嬩欢鎴栫枒浼间笉鑹簨浠�
+ repair.WhatProject__c = ged.problem.whatProject; //鍋氱殑鏄摢涓」鐩�
+ repair.OperationOrExaminationName__c = ged.problem.operationOrExaminationName; //鎵嬫湳/妫�鏌ュ悕绉�
+ repair.BreakORFallOff__c = ged.problem.breakORFallOff; //鏄惁鏈夊彂鐢熸柇瑁傛垨鑴辫惤
+ repair.UseFailProductFinish__c = ged.problem.useFailProductFinish; //鏄惁鐢ㄨ浜у搧瀹屾垚浜嗘墜鏈�/妫�鏌�
+ repair.SupportingProducts__c = ged.problem.supportingProducts; //閰嶅浣跨敤浜у搧
+ repair.AfterFailureInformation__c = ged.problem.afterFailureInformation; //鍙戠幇鏁呴殰鍚庯紝鍖婚櫌瀵规偅鑰呯殑澶勭悊鎯呭喌
+ repair.Delay15Min__c = ged.problem.delay15Min; //鍙戠幇鏁呴殰鐜拌薄鍚庯紝鏈夊欢璇�15鍒嗛挓浠ヤ笂鐨勬墜鏈疄鏂界殑鎯呭喌鍙戠敓鍚�
+ repair.InformationFrom__c = ged.problem.informationFrom; //淇℃伅鏄粠鍖婚櫌鐨勮皝閭ｉ噷寰楀埌鐨�
+ repair.FailureQInHospital__c = ged.problem.failureQInHospital; //鍦ㄥ尰闄紝鏁呴殰鍙戠敓鐨勯鐜囨槸澶氬皯
+ repair.DelayReportReason__c = ged.problem.delayReportReason; //瓒呮椂鎶ュ憡鐨勭悊鐢�
+ repair.IsProductFaultRelated__c = ged.problem.isProductFaultRelated; //鏄惁涓庤繖娆′骇鍝佹晠闅滅浉鍏�
+ repair.IsOts__c = ged.logistics.isOts; //鏄惁浣跨敤ots
+ repair.SenderOrgCode__c = ged.logistics.senderOrgCode; //閫佷慨鏈烘瀯浠ｇ爜
+ repair.SenderCompany__c = ged.logistics.senderCompany; //閫佷慨鏈烘瀯鍚嶇О
+ repair.SenderName__c = ged.logistics.senderName; //閫佷慨浜哄鍚�
+ repair.SenderMobilePhone__c = ged.logistics.senderMobilePhone; //閫佷慨浜烘墜鏈�
+ repair.SenderAddress__c = ged.logistics.senderAddress; //閫佷慨浜哄湴鍧�
+ repair.RecepientCompany__c = ged.logistics.recepientCompany; //鎺ユ敹鏈烘瀯鍚嶇О
+ repair.RecepientName__c = ged.logistics.recepientName; //鎺ユ敹閫佷慨浜哄鍚�
+ repair.RecepientMobilePhone__c = ged.logistics.recepientMobilePhone; //鎺ユ敹浜烘墜鏈�
+ repair.RecepientAddress__c = ged.logistics.recepientAddress; //鎺ユ敹浜哄湴鍧�
+ repair.ReturnWayType__c = ged.logistics.returnWayType; //杩斿搧鏂瑰紡
+ repair.OrderNumber__c = ged.logistics.orderNumber; //閫佷慨鐗╂祦鍗曞彿
+ repair.FailureReason__c = ged.logistics.failureReason; //涓嬪崟澶辫触鍘熷洜
+ repair.LogisticsSendDate__c = ged.logistics.logisticsSendDate; //閫佷慨鐗╂祦鍙戦�佹棩
+ repair.Item0010__c = ged.item0010; //澶囩敤瀛楁1
+ repair.Item0020__c = ged.item0020; //澶囩敤瀛楁2
+ repair.Item0030__c = ged.item0030; //澶囩敤瀛楁3
+ repair.Item0040__c = ged.item0040; //澶囩敤瀛楁4
+ repair.Item0050__c = ged.item0050; //澶囩敤瀛楁5
+ // 2023-02-20 zyh add end
//LLIU-CG53S9 20220715 LY start
if ('闂宸茶В鍐�'.equals(ged.applyRepairInfo.processResult) ||'闇�鍋氳川閲忓垽瀹�'.equals(ged.applyRepairInfo.processResult) ||'鐢ㄦ埛閫夋嫨涓嶄慨鐞�'.equals(ged.applyRepairInfo.processResult)) {
//LLIU-CG53S9 20220715 LY end
@@ -298,11 +391,24 @@
repairOrderNo2Str += repairOrderNo2 + '\n';
repairList.add(repair);
repairNoList.add(ged.repairOderInfo.repairOrderNo2);
+ RsoMap.put(ged.repairOderInfo.repairOrderNo2,repair);
}
// 2022/4/6 zhangyuheng update start
- List<RepairSubOrder__c> repairList1 = [SELECT Id FROM RepairSubOrder__c WHERE RepairSubOrderNo__c in: repairNoList];
- if (repairList1.size() > 0) {
+ List<RepairSubOrder__c> upList = new List<RepairSubOrder__c>();
+ List<RepairSubOrder__c> repairSOList1 = [SELECT Id,RepairSubOrderNo__c,DateReceiptQuestions__c FROM RepairSubOrder__c WHERE RepairSubOrderNo__c in: repairNoList];
+ if (repairSOList1.size() > 0) {
+ for(RepairSubOrder__c rso: repairSOList1){
+ if(RsoMap.containsKey(rso.RepairSubOrderNo__c)){
+ RepairSubOrder__c temp = new RepairSubOrder__c();
+ temp = RsoMap.get(rso.RepairSubOrderNo__c);
+ temp.Id = rso .Id;
+ upList.add(temp);
+ }
+ }
logstr += repairOrderNo2Str + ']-宸插瓨鍦�';
+ update upList;
+ System.debug(repairSOList1[0].Id + '===' + repairSOList1[0].DateReceiptQuestions__c);
+ logstr += repairOrderNo2Str + '鏇存柊瀹屾垚, 鏇存柊鎬绘暟涓猴細' + repairSOList1.size() + '\n' + repairSOList1;
}
// if (repairList.size() > 0) {==== 2022/4/6 zhangyuheng娉ㄩ噴鎺�
else {
--
Gitblit v1.9.1