From 5c01ebbfddb6b8674430b47c22977bea2e350084 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 13 四月 2022 10:58:46 +0800
Subject: [PATCH] BackupPIPLFunction0413
---
force-app/main/default/pages/StraightBackAddress.page | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 deletions(-)
diff --git a/force-app/main/default/pages/StraightBackAddress.page b/force-app/main/default/pages/StraightBackAddress.page
index fe52d01..64926a3 100644
--- a/force-app/main/default/pages/StraightBackAddress.page
+++ b/force-app/main/default/pages/StraightBackAddress.page
@@ -424,6 +424,30 @@
rc.address_ZipCode__c=addressAwsData[address.AWS_Data_Id__c].zipCode;
}
+ let GetAsset = function(){
+ let ast = new sforce.SObject('Asset');
+ ast.Id = '{!pc.Delivered_Product__c}',
+ ast.address_Contacts__c= contactsName,
+ ast.address_ZipCode__c = address.ZipCode__c,
+ ast.address_City__c = cityName,
+ ast.address_Telephone__c = address.Telephone__c,
+ ast.address_Contacts_Name__c = ContactPerson,
+ ast.Detailed_Address__c= address_str
+ if (addressAwsData.hasOwnProperty(address.AWS_Data_Id__c)) {
+ ast.address_ZipCode__c=addressAwsData[address.AWS_Data_Id__c].zipCode;
+ ast.address_Telephone__c=addressAwsData[address.AWS_Data_Id__c].telephone;
+ }
+ return ast;
+ }
+
+ //淇濆瓨鏁版嵁鍒颁繚鏈夎澶囪〃涓�
+ let UpdateAsset = function(){
+ let ast = GetAsset();
+ let result = sforce.connection.update([ast]);
+ let b = result[0].getBoolean('success');
+ return b;
+ }
+
let UpdateRepair = function(callback){
AWSService.post(staticResourceRepair.updateUrl,[{
dataId:'{!pc.AWS_Data_Id__c}',
@@ -446,7 +470,43 @@
rc.Detailed_Address__c = data.object[0].detailedAddress;
rc.Detailed_Address_Encrypt__c = data.object[0].detailedAddressEncrypt;
- UpdateSobject(staticResourceRepair,rc,data.txId,callback);
+ //UpdateSobject(staticResourceRepair,rc,data.txId,callback);
+ Visualforce.remoting.Manager.invokeAction(
+ 'StraightBackAddressController.SaveEx',
+ JSON.stringify(rc), JSON.stringify(GetAsset()), address.Id,
+ function (result, event) {
+
+ let message = '';
+ if (event.status) {
+ if (result) {
+ message = result;
+ }else{
+ }
+ }else{
+ }
+ let tobj = {
+ txId: data.txId
+ };
+ if(message) {
+ console.log('call sf to insert log');
+ tobj.isSuccess = 0;
+ }else {
+ console.log('call sf Log Id: ' + rc.id);
+ tobj.sfRecordId = rc.id;
+ tobj.isSuccess = 1;
+ }
+
+ AWSService.post(staticResource.transactionUrl,tobj,function(data){
+ if (message) {
+ ub();
+ alert(message);
+ }else{
+ window.location.href = '/{!RepairId}';
+ }
+ },staticResource.token);
+ },
+ { escape: true }
+ );
}else{
alert('AWS鏇存柊淇悊澶辫触');
ub();
@@ -454,24 +514,7 @@
},staticResourceRepair.token)
}
- //淇濆瓨鏁版嵁鍒颁繚鏈夎澶囪〃涓�
- let UpdateAsset = function(){
- let ast = new sforce.SObject('Asset');
- ast.Id = '{!pc.Delivered_Product__c}',
- ast.address_Contacts__c= contactsName,
- ast.address_ZipCode__c = address.ZipCode__c,
- ast.address_City__c = cityName,
- ast.address_Telephone__c = address.Telephone__c,
- ast.address_Contacts_Name__c = ContactPerson,
- ast.Detailed_Address__c= address_str
- if (addressAwsData.hasOwnProperty(address.AWS_Data_Id__c)) {
- ast.address_ZipCode__c=addressAwsData[address.AWS_Data_Id__c].zipCode;
- ast.address_Telephone__c=addressAwsData[address.AWS_Data_Id__c].telephone;
- }
- let result = sforce.connection.update([ast]);
- let b = result[0].getBoolean('success');
- return b;
- }
+
let UpdateAddress = function(){
@@ -485,6 +528,8 @@
}
b();
+ UpdateRepair();
+ /*
UpdateRepair(function(data){
if (data.isSuccess) {
let b = UpdateAsset();
@@ -505,7 +550,7 @@
ub();
alert('SF鏇存柊淇悊澶辫触');
}
- })
+ })*/
//椤甸潰閲嶅畾鍚�
//return redirectPag();
@@ -827,10 +872,10 @@
<apex:param name="addressDataIds" assignTo="{!addressDataIds}" value=""></apex:param>
</apex:actionFunction>
<!-- 閲囩敤鏂规硶 -->
- <apex:actionFunction name="adoptSave" action="{!adoptSave}" rerender="oppBlock2,message" onComplete="ub();">
+ <!--<actionFunction name="adoptSave" action="{!adoptSave}" rerender="oppBlock2,message" onComplete="ub();">
<apex:param name="adoptId" assignTo="{!adoptId}" value="" />
<apex:param name="isUpload" assignTo="{!isUpload}" value="" />
- </apex:actionFunction>
+ </actionFunction>-->
<!-- 淇濆瓨鍜屼慨鏀规柟娉� -->
<apex:actionFunction name="save" action="{!save}" rerender="oppBlock2,message" onComplete="ub();Trans()"></apex:actionFunction>
<!-- 鐐瑰嚮淇敼鎸夐挳鑾峰彇淇敼鏁版嵁鏂规硶 -->
--
Gitblit v1.9.1