From 7db779f2a7cfb723463a81c0572f2b37475ee0e8 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 31 三月 2022 18:43:14 +0800
Subject: [PATCH] PIPL0331V2Deploy
---
force-app/main/default/classes/NFM103Controller.cls | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/classes/NFM103Controller.cls b/force-app/main/default/classes/NFM103Controller.cls
index 6bf6784..19abb6d 100644
--- a/force-app/main/default/classes/NFM103Controller.cls
+++ b/force-app/main/default/classes/NFM103Controller.cls
@@ -104,11 +104,11 @@
public String UpdateStatus;//鐩磋繑淇敼鏍囪瘑
//add by wangweipeng 2021/07/14 end
//add pi 鍔犲瘑 sushanhu 20220222 start
- //public String DataId;//AWS瀛樺偍鍑瘉
+ public String DataId;//AWS瀛樺偍鍑瘉
//add pi 鍔犲瘑 sushanhu 20220222 end
//20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� start
- public String QuotationDate;
+ public Datetime QuotationDate;
//20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� end
@@ -336,7 +336,7 @@
,Returns_Product_way__c //杩斿搧鏂瑰紡
,FSE_ApplyForRepair_time__c //鐢宠淇悊鏃堕棿
//add by wangweipeng 2021/07/14 start
- //,AWS_Data_Id__c //add by sushanhu AWSDateID for PIPL
+ ,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
@@ -394,7 +394,8 @@
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('/', '');
+ //element.QuotationDate = NFMUtil.getMapValue(transferMap, 'SAP_Send_OK_Date__c', rpr.Delivered_Product__r.Backorder__r.Opportunity__r.SAP_Send_OK_Date__c, iflog);
+ element.QuotationDate = rpr.Delivered_Product__r.Backorder__r.Opportunity__r.SAP_Send_OK_Date__c;
//20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� end
// 澶氬勾淇濅慨 LHJ Start
@@ -426,6 +427,10 @@
}*/
// 2021-01-07 mzy update 澶氬勾淇濅慨澶栬锤NFM103鎺ュ彛淇敼 start
String tradeType = rpr.Delivered_Product__r.Backorder__r.Opportunity__r.Trade__c;
+
+ //20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� start
+ //Date QuotationDate = rpr.Delivered_Product__r.Backorder__r.Opportunity__r.SAP_Send_OK_Date__c;
+ //20220330 lt WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� end
String NewProductGuaranteeObject = rpr.NewProductGuaranteeObject__c == null ? '': rpr.NewProductGuaranteeObject__c;
@@ -492,7 +497,7 @@
element.UpdateStatus = rpr.Address_type__c; //鐢宠淇悊鏃堕棿
//add by wangweipeng 2021/07/14 end
//add pi 瀵嗘枃 sushanhu 20220222 start
- //element.DataId =rpr.AWS_Data_Id__c;//aws瀛樺偍鍑瘉
+ element.DataId =rpr.AWS_Data_Id__c;//aws瀛樺偍鍑瘉
//add pi 瀵嗘枃 sushanhu 20220222 end
}
@@ -593,18 +598,23 @@
// NFM103淇敼Rest end
// WLIG-BXQBH6 start
- NFMUtil.response response =
- NFMUtil.sendToSapStatusAndBody(rowDataStr, NFMUtil.NFM103_ENDPOINT);
+ // NFMUtil.response response =
+ // NFMUtil.sendToSapStatusAndBody(rowDataStr, NFMUtil.NFM103_ENDPOINT);
//update to aws 20220222 sushanhu start for PIPL
- // PIHelper.PIIntegration NFM103AWS =PIHelper.getPIIntegrationInfo('NFM103');
- // NFMUtil.response response = NFMUtil.sendToPiAWS(rowDataStr, NFM103AWS.newUrl,NFM103AWS.token);
+ 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);
//update to aws 20220222 sushanhu end for PIPL
status = response.status;
system.debug('AWS Response status:'+status);
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);
+ 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();
system.debug(ResponseBody);
--
Gitblit v1.9.1