From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/NFM103Controller.cls | 109 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 37 deletions(-)
diff --git a/force-app/main/default/classes/NFM103Controller.cls b/force-app/main/default/classes/NFM103Controller.cls
index 0913c9f..6e3fde5 100644
--- a/force-app/main/default/classes/NFM103Controller.cls
+++ b/force-app/main/default/classes/NFM103Controller.cls
@@ -11,7 +11,7 @@
public static string ResponseBody;
public static String SAPRepairNo;
public class NFM103Response {
- public RepairRequest_element RepairRequest;
+ // public RepairRequest_element RepairRequest;
public response[] response;
}
public class response {
@@ -106,6 +106,12 @@
//add pi 鍔犲瘑 sushanhu 20220222 start
public String DataId;//AWS瀛樺偍鍑瘉
//add pi 鍔犲瘑 sushanhu 20220222 end
+
+ //20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� start
+ public String QuotationDate;
+ //20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� end
+
+
}
////NFM103淇敼Rest end
@@ -211,6 +217,7 @@
*/
@future (callout = true)
public static void callout(String iflog_Id, List<Id> repairIds) {
+
if (repairIds == null || repairIds.size() == 0) {
return;
@@ -331,6 +338,9 @@
,FSE_ApplyForRepair_time__c //鐢宠淇悊鏃堕棿
//add by wangweipeng 2021/07/14 start
,AWS_Data_Id__c //add by sushanhu AWSDateID for PIPL
+ //20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� start
+ ,Delivered_Product__r.Backorder__r.Opportunity__r.SAP_Send_OK_Date__c
+ //20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� end
from Repair__c where Id IN :repairIds]; // 鍓婇櫎銉囥兗銈裤倰妞滅储銇椼仾銇勩伅銇氥�丄ll ROWS 銇勩倝銇亜銇仛
System.debug(Logginglevel.DEBUG, 'NFM103_ recptList.size()=' + recptList.size());
@@ -383,6 +393,11 @@
element.FSEReceiveDate = NFMUtil.formatDate2Str(rpr.On_Site_Repair_Order_Date__c); // TODO 蹇呴爤銇с伅銇亜銇戙仼銆佷慨鐞嗗彈浠樺緦鍏ュ姏銇椼仧銈夈仼銇嗐倓銇ｃ仸SAP銇�併倠锛�
element.FSEDeliverDate = NFMUtil.formatDate2Str(rpr.Send_To_RC_Date__c); // TODO 蹇呴爤銇с伅銇亜銇戙仼銆佷慨鐞嗗彈浠樺緦鍏ュ姏銇椼仧銈夈仼銇嗐倓銇ｃ仸SAP銇�併倠锛�
element.TradeType = NFMUtil.getMapValue(transferMap, 'Trade__c', rpr.Delivered_Product__r.Backorder__r.Opportunity__r.Trade__c, iflog);
+
+ //20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� start
+ element.QuotationDate = NFMUtil.formatDateTime2StrSprit(rpr.Delivered_Product__r.Backorder__r.Opportunity__r.SAP_Send_OK_Date__c).replaceAll('/', '');
+ //20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� end
+
// 澶氬勾淇濅慨 LHJ Start
element.RepairCostType = rpr.Delivered_Product__r.SerMarGuranteeType__c != '甯傚満澶氬勾淇濅慨' ? '' : rpr.RepairCostType__c;
element.RepairTypeQIS = rpr.RepairType_QIS__c;
@@ -412,6 +427,7 @@
}*/
// 2021-01-07 mzy update 澶氬勾淇濅慨澶栬锤NFM103鎺ュ彛淇敼 start
String tradeType = rpr.Delivered_Product__r.Backorder__r.Opportunity__r.Trade__c;
+
String NewProductGuaranteeObject = rpr.NewProductGuaranteeObject__c == null ? '': rpr.NewProductGuaranteeObject__c;
@@ -581,22 +597,17 @@
// NFMUtil.response response =
// NFMUtil.sendToSapStatusAndBody(rowDataStr, NFMUtil.NFM103_ENDPOINT);
//update to aws 20220222 sushanhu start for PIPL
- NFMUtil.response res = NFMUtil.getAwsToken();
- String token=res.responseBody;
- if(String.isBlank(token)){
- iflog.ErrorLog__c='NFM103'+'鑾峰彇aws token 澶辫触';
-
- }
- NFMUtil.response response = NFMUtil.sendToPiAWS(rowDataStr, NFMUtil.NFM103_ENDPOINT,token);
+ PIHelper.PIIntegration NFM103AWS =PIHelper.getPIIntegrationInfo('NFM103');
+ NFMUtil.response response = NFMUtil.sendToPiAWS(rowDataStr, NFM103AWS.newUrl,NFM103AWS.token);
//update to aws 20220222 sushanhu end for PIPL
- status = response.status;
- system.debug('AWS Response status:'+status);
- ResponseBody = response.responseBody;
+ status = response.status;
+ system.debug('AWS Response status:'+status);
+ system.System.debug('NGM103 AWS result--'+ response.ResponseBody);
+ ResponseBody = response.responseBody;
//update to aws 20220302 sushanhu start for PIPL
- Map<String, Object> results = (Map<String, Object>)JSON.deserializeUntyped(ResponseBody);
- system.System.debug('NGM103 AWS result--'+ ResponseBody);
- //update to aws 20220302 sushanhu end for PIPL
- NFM103Response NFM103Response = new NFM103Response();
+ if ('200'.equals(status)) {
+ Map<String, Object> results = (Map<String, Object>)JSON.deserializeUntyped(ResponseBody);
+ NFM103Response NFM103Response = new NFM103Response();
system.debug(ResponseBody);
if (string.isNotEmpty(ResponseBody)) {
NFM103Response =
@@ -606,9 +617,33 @@
NFM103Response.response.size() > 0 &&
NFM103Response.response[0].LOG != null &&
string.isNotEmpty(NFM103Response.response[0].LOG.SAPRepairNo)) {
- SAPRepairNo = NFM103Response.response[0].LOG.SAPRepairNo;
+ SAPRepairNo = NFM103Response.response[0].LOG.SAPRepairNo;
}
+ rowData.retry_cnt__c = 0;
+ //add wangweipeng 2022/02/18 start
+ //濡傛灉涓簍rue锛岃瘉鏄庢槸閲嶆柊鍙戦�佺殑鎺ュ彛锛岄渶瑕佹妸鏃ュ織璁板綍涓�
+ if(needUpdateIflog){
+ logstr += 'Status:' + status;
+ logstr += '\nResponse:' + ResponseBody;
+ logstr += '\nend';
+ }
+ //add wangweipeng 2022/02/18 start
+ } else {
+ if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
+ if (rowData.retry_cnt__c < batch_retry_max_cnt) {
+ rowData.retry_cnt__c++;
+ LogAutoSendSchedule.assignOneMinute();
+ }
+ if (rowData.retry_cnt__c >= batch_retry_max_cnt) {
+ rowData.ErrorLog__c = 'status:' + ResponseBody +
+ '\n閿欒娆℃暟宸茬粡瓒呰繃鑷姩閫佷俊璁惧畾鐨勬渶澶ф鏁帮紝璇锋墜鍔ㄩ�佷俊';
+ }
+ }
+ // Map<String, Object> results = (Map<String, Object>)JSON.deserializeUntyped(ResponseBody);
+
+ //update to aws 20220302 sushanhu end for PIPL
+
// 鍘熶唬鐮侊細
// NFM103淇敼Rest start
//status =
@@ -618,27 +653,27 @@
// WLIG-BXQBH6 end
// 鍘熷墖闈炲悓鏈熴仹銇欍伄銇с�乴ogs銈掔⒑瑾嶃仚銈嬪繀瑕併亴銇亜銇с仐銈囥亞銆�
- if (status == 'OK') {
- rowData.retry_cnt__c = 0;
- //add wangweipeng 2022/02/18 start
- //濡傛灉涓簍rue锛岃瘉鏄庢槸閲嶆柊鍙戦�佺殑鎺ュ彛锛岄渶瑕佹妸鏃ュ織璁板綍涓�
- if(needUpdateIflog){
- logstr += 'Status:' + status;
- logstr += '\nResponse:' + responseBody;
- logstr += '\nend';
- }
- //add wangweipeng 2022/02/18 start
- } else {
- if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
- if (rowData.retry_cnt__c < batch_retry_max_cnt) {
- rowData.retry_cnt__c++;
- LogAutoSendSchedule.assignOneMinute();
- }
- if (rowData.retry_cnt__c >= batch_retry_max_cnt) {
- rowData.ErrorLog__c = 'status:' + status +
- '\n閿欒娆℃暟宸茬粡瓒呰繃鑷姩閫佷俊璁惧畾鐨勬渶澶ф鏁帮紝璇锋墜鍔ㄩ�佷俊';
- }
- }
+ // if (status == 'OK') {
+ // rowData.retry_cnt__c = 0;
+ // //add wangweipeng 2022/02/18 start
+ // //濡傛灉涓簍rue锛岃瘉鏄庢槸閲嶆柊鍙戦�佺殑鎺ュ彛锛岄渶瑕佹妸鏃ュ織璁板綍涓�
+ // if(needUpdateIflog){
+ // logstr += 'Status:' + status;
+ // logstr += '\nResponse:' + responseBody;
+ // logstr += '\nend';
+ // }
+ // //add wangweipeng 2022/02/18 start
+ // } else {
+ // if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
+ // if (rowData.retry_cnt__c < batch_retry_max_cnt) {
+ // rowData.retry_cnt__c++;
+ // LogAutoSendSchedule.assignOneMinute();
+ // }
+ // if (rowData.retry_cnt__c >= batch_retry_max_cnt) {
+ // rowData.ErrorLog__c = 'status:' + status +
+ // '\n閿欒娆℃暟宸茬粡瓒呰繃鑷姩閫佷俊璁惧畾鐨勬渶澶ф鏁帮紝璇锋墜鍔ㄩ�佷俊';
+ // }
+ // }
} catch (Exception ex) {
// TODO IOException
// 銈ㄣ儵銉笺亴鐧虹敓銇椼仧鍫村悎
--
Gitblit v1.9.1