OlyMEBGProduct.git

			@@ -103,6 +103,15 @@
			public String ReturnType;//返品方式
			public String UpdateStatus;//直返修改标识
			//add by wangweipeng 2021/07/14 end
			//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

			@@ -327,7 +336,10 @@
			,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
			//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]; // 削除データを検索しないはず、All ROWS いらないはず
			System.debug(Logginglevel.DEBUG, 'NFM103_ recptList.size()=' + recptList.size());

			@@ -380,6 +392,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;
			@@ -409,6 +426,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;


			@@ -472,7 +490,11 @@
			element.Postal = rpr.address_ZipCode__c; //邮编
			element.ReturnType = NFMUtil.getMapValue(ReturnsProductWayMap,'Returns_Product_way__c', rpr.Returns_Product_way__c, iflog);//返品方式
			element.UpdateStatus = rpr.Address_type__c; //申请修理时间
			//add by wangweipeng 2021/07/14 start
			//add by wangweipeng 2021/07/14 end
			//add pi 密文 sushanhu 20220222 start
			//element.DataId =rpr.AWS_Data_Id__c;//aws存储凭证
			//add pi 密文 sushanhu 20220222 end

			}

			if (repairRequest.GeneralData.size() > 0) {
			@@ -573,8 +595,17 @@
			// WLIG-BXQBH6 start
			NFMUtil.response response =
			NFMUtil.sendToSapStatusAndBody(rowDataStr, NFMUtil.NFM103_ENDPOINT);
			status = response.status;
			//update to aws 20220222 sushanhu start for PIPL
			// 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;
			//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();
			system.debug(ResponseBody);
			if (string.isNotEmpty(ResponseBody)) {
			@@ -599,6 +630,14 @@
			// 原則非同期ですので、logsを確認する必要がないでしょう。
			if (status == 'OK') {
			rowData.retry_cnt__c = 0;
			//add wangweipeng 2022/02/18 start
			//如果为true，证明是重新发送的接口，需要把日志记录下
			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) {