xignzi006 发布系统代码

app_CRM/src/service/account/account-service-base.ts

@@ -65,6 +65,21 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -110,21 +125,6 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -134,10 +134,10 @@ export default class AccountServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/accounts`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -152,6 +152,21 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -197,27 +212,12 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/accounts/${context.account}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -245,10 +245,10 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/accounts/${context.account}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -264,10 +264,10 @@ export default class AccountServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/accounts/getdraft`,isloading);
         res.data.account = data.account;
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -338,6 +338,21 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -383,27 +398,12 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/accounts/${context.account}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 

app_CRM/src/service/campaign/campaign-service-base.ts

@@ -64,21 +64,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -109,6 +94,21 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -118,9 +118,9 @@ export default class CampaignServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/campaigns`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -135,21 +135,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -180,11 +165,26 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -212,9 +212,9 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -230,9 +230,9 @@ export default class CampaignServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -275,21 +275,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -320,11 +305,26 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 

app_CRM/src/service/competitor/competitor-service-base.ts

@@ -62,6 +62,21 @@ export default class CompetitorServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -92,21 +107,6 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         masterData.competitorproducts = competitorproductsData;
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class CompetitorServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/competitors`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         return res;
     }
 
@@ -133,6 +133,21 @@ export default class CompetitorServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -163,26 +178,11 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         masterData.competitorproducts = competitorproductsData;
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/competitors/${context.competitor}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class CompetitorServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/competitors/${context.competitor}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class CompetitorServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/competitors/getdraft`,isloading);
         res.data.competitor = data.competitor;
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         return res;
     }
 
@@ -258,6 +258,21 @@ export default class CompetitorServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -288,26 +303,11 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         masterData.competitorproducts = competitorproductsData;
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/competitors/${context.competitor}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorproducts',JSON.stringify(res.data.competitorproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 

app_CRM/src/service/contact/contact-service-base.ts

@@ -83,36 +83,36 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -123,8 +123,8 @@ export default class ContactServiceBase extends EntityService {
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts`,data,isloading);
             this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
         let masterData:any = {};
@@ -143,36 +143,36 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -183,8 +183,8 @@ export default class ContactServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/contacts`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -215,41 +215,41 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
         let masterData:any = {};
@@ -268,41 +268,41 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/contacts/${context.contact}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -335,14 +335,14 @@ export default class ContactServiceBase extends EntityService {
         if(context.account && context.contact){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -360,15 +360,15 @@ export default class ContactServiceBase extends EntityService {
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/getdraft`,isloading);
             res.data.contact = data.contact;
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/contacts/getdraft`,isloading);
         res.data.contact = data.contact;
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -414,41 +414,41 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/addlist`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/addlist`,data,isloading);
@@ -481,41 +481,41 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/checkkey`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/checkkey`,data,isloading);
@@ -563,41 +563,41 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
         let masterData:any = {};
@@ -616,41 +616,41 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/contacts/${context.contact}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -681,41 +681,41 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        masterData.opportunities = opportunitiesData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/setprimary`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/setprimary`,data,isloading);

app_CRM/src/service/ibiz-list/ibiz-list-service-base.ts

@@ -64,6 +64,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -109,21 +124,6 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -133,10 +133,10 @@ export default class IBizListServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibizlists`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -151,6 +151,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -196,27 +211,12 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibizlists/${context.ibizlist}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -244,10 +244,10 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibizlists/${context.ibizlist}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -263,10 +263,10 @@ export default class IBizListServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/ibizlists/getdraft`,isloading);
         res.data.ibizlist = data.ibizlist;
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -309,6 +309,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -354,27 +369,12 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibizlists/${context.ibizlist}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 

app_CRM/src/service/opportunity/opportunity-service-base.ts

@@ -74,21 +74,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && true){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -119,22 +104,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && true){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -150,6 +119,22 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && true){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -180,22 +165,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.account && true){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -211,6 +180,22 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && true){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -241,21 +226,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -271,6 +241,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -301,6 +286,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -310,9 +310,9 @@ export default class OpportunityServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/opportunities`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         return res;
     }
 
@@ -328,21 +328,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -373,15 +358,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -397,6 +373,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -427,15 +412,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.account && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -451,6 +427,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -481,14 +466,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -504,6 +481,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -534,11 +519,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 
@@ -576,29 +576,29 @@ export default class OpportunityServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.account && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 
@@ -615,32 +615,32 @@ export default class OpportunityServiceBase extends EntityService {
         if(context.account && context.contact && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.account && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         return res;
     }
 
@@ -656,21 +656,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async Active(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -701,15 +686,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -725,6 +701,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -755,15 +740,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.account && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -779,6 +755,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -809,11 +794,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/active`,data,isloading);
@@ -831,21 +831,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -876,15 +861,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -900,6 +876,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -930,15 +915,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.account && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -954,6 +930,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -984,11 +969,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/checkkey`,data,isloading);
@@ -1021,21 +1021,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1066,15 +1051,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1090,6 +1066,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1120,15 +1105,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.account && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1144,6 +1120,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1174,14 +1159,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1197,6 +1174,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1227,11 +1212,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 

app_CRM/src/service/product/product-service-base.ts

@@ -65,21 +65,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productassociationid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productsubstitutes = productsubstitutesData;
+        masterData.productassociations = productassociationsData;
         let productpricelevelsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
             productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
@@ -95,21 +95,21 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
+        let productsubstitutesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
+            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
+            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
+                productsubstitutesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productassociations = productassociationsData;
+        masterData.productsubstitutes = productsubstitutesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -119,9 +119,9 @@ export default class ProductServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/products`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
         return res;
     }
 
@@ -136,21 +136,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productassociationid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productsubstitutes = productsubstitutesData;
+        masterData.productassociations = productassociationsData;
         let productpricelevelsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
             productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
@@ -166,26 +166,26 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
+        let productsubstitutesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
+            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
+            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
+                productsubstitutesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productassociations = productassociationsData;
+        masterData.productsubstitutes = productsubstitutesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/products/${context.product}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
-            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
+            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             return res;
     }
 
@@ -213,9 +213,9 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/products/${context.product}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
-            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
+            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             return res;
     }
 
@@ -231,9 +231,9 @@ export default class ProductServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/products/getdraft`,isloading);
         res.data.product = data.product;
-            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
-            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
+            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
         return res;
     }
 
@@ -291,21 +291,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productassociationid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productsubstitutes = productsubstitutesData;
+        masterData.productassociations = productassociationsData;
         let productpricelevelsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
             productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
@@ -321,26 +321,26 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
+        let productsubstitutesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
+            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
+            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
+                productsubstitutesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productassociations = productassociationsData;
+        masterData.productsubstitutes = productsubstitutesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/products/${context.product}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
-            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
+            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             return res;
     }
 

app_CRM/src/service/quote/quote-service-base.ts

@@ -78,21 +78,6 @@ export default class QuoteServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && true){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -108,21 +93,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && true){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -138,6 +108,21 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && true){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -153,21 +138,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && true){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -183,6 +153,21 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && true){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -198,21 +183,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && true){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -228,6 +198,21 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && true){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -243,20 +228,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -272,6 +243,20 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -287,6 +272,21 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -296,8 +296,8 @@ export default class QuoteServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/quotes`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
         return res;
     }
 
@@ -313,21 +313,6 @@ export default class QuoteServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -343,14 +328,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -366,6 +343,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -381,14 +366,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -404,6 +381,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -419,14 +404,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -442,6 +419,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -457,13 +442,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -479,6 +457,13 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -494,10 +479,25 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
     }
 
@@ -538,31 +538,31 @@ export default class QuoteServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.contact && context.opportunity && context.quote){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.account && context.opportunity && context.quote){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.opportunity && context.quote){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
             let res:any = await Http.getInstance().get(`/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
     }
 
@@ -579,35 +579,35 @@ export default class QuoteServiceBase extends EntityService {
         if(context.account && context.contact && context.opportunity && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/getdraft`,isloading);
             res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.contact && context.opportunity && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/getdraft`,isloading);
             res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.account && context.opportunity && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/getdraft`,isloading);
             res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.opportunity && true){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/getdraft`,isloading);
             res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/quotes/getdraft`,isloading);
         res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
         return res;
     }
 
@@ -638,21 +638,6 @@ export default class QuoteServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -668,14 +653,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -691,6 +668,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -706,14 +691,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -729,6 +706,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -744,14 +729,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -767,6 +744,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -782,10 +767,25 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
             return Http.getInstance().post(`/quotes/${context.quote}/checkkey`,data,isloading);
@@ -818,21 +818,6 @@ export default class QuoteServiceBase extends EntityService {
     public async GenSalesOrder(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -848,14 +833,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -871,6 +848,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -886,14 +871,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -909,6 +886,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -924,14 +909,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -947,6 +924,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -962,10 +947,25 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
             return Http.getInstance().post(`/quotes/${context.quote}/gensalesorder`,data,isloading);
@@ -983,21 +983,6 @@ export default class QuoteServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1013,14 +998,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -1036,6 +1013,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1051,14 +1036,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -1074,6 +1051,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1089,14 +1074,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -1112,6 +1089,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1127,13 +1112,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -1149,6 +1127,13 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1164,10 +1149,25 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
     }
 

app_CRM/src/service/sales-literature/sales-literature-service-base.ts

@@ -62,6 +62,21 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let salesliteratureitemsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
+            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
+            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
+                salesliteratureitemsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesliteratureitemid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesliteratureitems = salesliteratureitemsData;
         let productsalesliteraturesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
             productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
@@ -92,21 +107,6 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.competitorsalesliteratures = competitorsalesliteraturesData;
-        let salesliteratureitemsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
-            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
-            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
-                salesliteratureitemsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesliteratureitemid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesliteratureitems = salesliteratureitemsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesliteratures`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         return res;
     }
 
@@ -133,6 +133,21 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let salesliteratureitemsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
+            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
+            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
+                salesliteratureitemsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesliteratureitemid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesliteratureitems = salesliteratureitemsData;
         let productsalesliteraturesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
             productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
@@ -163,26 +178,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.competitorsalesliteratures = competitorsalesliteraturesData;
-        let salesliteratureitemsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
-            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
-            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
-                salesliteratureitemsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesliteratureitemid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesliteratureitems = salesliteratureitemsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesliteratures/${context.salesliterature}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/salesliteratures/${context.salesliterature}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/salesliteratures/getdraft`,isloading);
         res.data.salesliterature = data.salesliterature;
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         return res;
     }
 
@@ -258,6 +258,21 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let salesliteratureitemsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
+            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
+            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
+                salesliteratureitemsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesliteratureitemid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesliteratureitems = salesliteratureitemsData;
         let productsalesliteraturesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
             productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
@@ -288,26 +303,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.competitorsalesliteratures = competitorsalesliteraturesData;
-        let salesliteratureitemsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
-            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
-            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
-                salesliteratureitemsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesliteratureitemid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesliteratureitems = salesliteratureitemsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesliteratures/${context.salesliterature}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             return res;
     }
 

app_CRM/src/widgets/incident-customer/default-searchform/default-searchform.html

@@ -9,26 +9,14 @@
           <i-col v-show="detailsModel.n_customertype_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
               <app-form-item name='n_customertype_eq' :itemRules="this.rules.n_customertype_eq" class='' :caption="$t('entities.incidentcustomer.default_searchform.details.n_customertype_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_customertype_eq.error" :isEmptyCaption="false" labelPos="TOP">
               
-          <dropdown-list 
-              v-model="data.n_customertype_eq"
-              :data="data"
-              :context="context"
-              :viewparams="viewparams"
-              :localContext ='{ }' 
-              :localParam ='{ }' 
-              :disabled="detailsModel.n_customertype_eq.disabled"
-              valueType="string"
-              tag='IncidentCustomer'
-              codelistType='STATIC'
-              placeholder='请选择...'
-              
-          />
+          <app-span name='n_customertype_eq' :value="data.n_customertype_eq" tag='IncidentCustomer' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
           </app-form-item>
           
           </i-col>
           <i-col v-show="detailsModel.n_customername_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
               <app-form-item name='n_customername_like' :itemRules="this.rules.n_customername_like" class='' :caption="$t('entities.incidentcustomer.default_searchform.details.n_customername_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_customername_like.error" :isEmptyCaption="false" labelPos="TOP">
-              <input-box v-model="data.n_customername_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_customername_like.disabled" type='text'  style=""></input-box>
+              
+          <app-span name='n_customername_like' :value="data.n_customername_like" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
           </app-form-item>
           
           </i-col>

app_CRM/src/widgets/incident-customer/main-grid/main-grid-model.ts

@@ -36,6 +36,11 @@ export default class MainModel {
           prop: 'customername',
           dataType: 'TEXT',
         },
+        {
+          name: 'srfdatatype',
+          prop: 'customertype',
+          dataType: 'SSCODELIST',
+        },
         {
           name: 'srfdataaccaction',
           prop: 'customerid',

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/mapping/AccountInheritMapping.java

+
+
+package cn.ibizlab.businesscentral.core.base.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.businesscentral.core.base.domain.Account;
+import cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer;
+import java.util.List;
+
+@Mapper(componentModel = "spring", uses = {})
+public interface AccountInheritMapping {
+
+    @Mappings({
+        @Mapping(source ="accountid",target = "customerid"),
+        @Mapping(source ="accountname",target = "customername"),
+        @Mapping(target ="focusNull",ignore = true),
+    })
+    IncidentCustomer toIncidentcustomer(Account account);
+
+    @Mappings({
+        @Mapping(source ="customerid" ,target = "accountid"),
+        @Mapping(source ="customername" ,target = "accountname"),
+        @Mapping(target ="focusNull",ignore = true),
+    })
+    Account toAccount(IncidentCustomer incidentcustomer);
+
+    List<IncidentCustomer> toIncidentcustomer(List<Account> account);
+
+    List<Account> toAccount(List<IncidentCustomer> incidentcustomer);
+
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/mapping/ContactInheritMapping.java

+
+
+package cn.ibizlab.businesscentral.core.base.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.businesscentral.core.base.domain.Contact;
+import cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer;
+import java.util.List;
+
+@Mapper(componentModel = "spring", uses = {})
+public interface ContactInheritMapping {
+
+    @Mappings({
+        @Mapping(source ="contactid",target = "customerid"),
+        @Mapping(source ="fullname",target = "customername"),
+        @Mapping(target ="focusNull",ignore = true),
+    })
+    IncidentCustomer toIncidentcustomer(Contact contact);
+
+    @Mappings({
+        @Mapping(source ="customerid" ,target = "contactid"),
+        @Mapping(source ="customername" ,target = "fullname"),
+        @Mapping(target ="focusNull",ignore = true),
+    })
+    Contact toContact(IncidentCustomer incidentcustomer);
+
+    List<IncidentCustomer> toIncidentcustomer(List<Contact> contact);
+
+    List<Contact> toContact(List<IncidentCustomer> incidentcustomer);
+
+}
+
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/AccountServiceImpl.java

@@ -101,6 +101,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     @Transactional
     public boolean create(Account et) {
         fillParentData(et);
+        createIndexMajorEntityData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getAccountid()),et);
@@ -117,6 +118,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     @Transactional
     public boolean update(Account et) {
         fillParentData(et);
+        incidentcustomerService.update(accountInheritMapping.toIncidentcustomer(et));
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("accountid",et.getAccountid())))
             return false;
         CachedBeanCopier.copy(get(et.getAccountid()),et);
@@ -133,6 +135,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     @Transactional
     public boolean remove(String key) {
         boolean result=removeById(key);
+        incidentcustomerService.remove(key);
         return result ;
     }
 
@@ -456,6 +459,23 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
 
 
 
+    @Autowired
+    cn.ibizlab.businesscentral.core.base.mapping.AccountInheritMapping accountInheritMapping;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.service.service.IIncidentCustomerService incidentcustomerService;
+
+    /**
+     * 创建索引主实体数据
+     * @param et
+     */
+    private void createIndexMajorEntityData(Account et){
+        if(ObjectUtils.isEmpty(et.getAccountid()))
+            et.setAccountid((String)et.getDefaultKey(true));
+        cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer incidentcustomer =accountInheritMapping.toIncidentcustomer(et);
+        incidentcustomer.set("customertype","ACCOUNT");
+        incidentcustomerService.create(incidentcustomer);
+    }
 
     @Override
     public List<JSONObject> select(String sql, Map param){

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/ContactServiceImpl.java

@@ -95,6 +95,7 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
     @Transactional
     public boolean create(Contact et) {
         fillParentData(et);
+        createIndexMajorEntityData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getContactid()),et);
@@ -111,6 +112,7 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
     @Transactional
     public boolean update(Contact et) {
         fillParentData(et);
+        incidentcustomerService.update(contactInheritMapping.toIncidentcustomer(et));
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("contactid",et.getContactid())))
             return false;
         CachedBeanCopier.copy(get(et.getContactid()),et);
@@ -127,6 +129,7 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
     @Transactional
     public boolean remove(String key) {
         boolean result=removeById(key);
+        incidentcustomerService.remove(key);
         return result ;
     }
 
@@ -399,6 +402,23 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
 
 
 
+    @Autowired
+    cn.ibizlab.businesscentral.core.base.mapping.ContactInheritMapping contactInheritMapping;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.service.service.IIncidentCustomerService incidentcustomerService;
+
+    /**
+     * 创建索引主实体数据
+     * @param et
+     */
+    private void createIndexMajorEntityData(Contact et){
+        if(ObjectUtils.isEmpty(et.getContactid()))
+            et.setContactid((String)et.getDefaultKey(true));
+        cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer incidentcustomer =contactInheritMapping.toIncidentcustomer(et);
+        incidentcustomer.set("customertype","CONTACT");
+        incidentcustomerService.create(incidentcustomer);
+    }
 
     @Override
     public List<JSONObject> select(String sql, Map param){

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/domain/IncidentCustomer.java

@@ -24,36 +24,42 @@ import org.springframework.data.annotation.Transient;
 import cn.ibizlab.businesscentral.util.annotation.Audit;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.ibizlab.businesscentral.util.domain.EntityMP;
+
 /**
- * [案例客户] 对象
+ * 实体[案例客户]
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor
-@AllArgsConstructor
-public class IncidentCustomer extends EntityBase implements Serializable {
+@JsonIgnoreProperties(value = "handler")
+@TableName(value = "INCIDENTCUSTOMER",resultMap = "IncidentCustomerResultMap")
+public class IncidentCustomer extends EntityMP implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
      * 客户
      */
-    @DEField(isKeyField=true)
-    @JSONField(name = "customerId")
-    @JsonProperty("customerId")
+    @TableId(value= "customerid",type=IdType.ASSIGN_UUID)
+    @JSONField(name = "customerid")
+    @JsonProperty("customerid")
     private String customerid;
-
     /**
      * 客户类型
      */
-    @JSONField(name = "customerType")
-    @JsonProperty("customerType")
+    @TableField(exist = false)
+    @JSONField(name = "customertype")
+    @JsonProperty("customertype")
     private String customertype;
-
     /**
      * 客户
      */
-    @JSONField(name = "customerName")
-    @JsonProperty("customerName")
+    @TableField(exist = false)
+    @JSONField(name = "customername")
+    @JsonProperty("customername")
     private String customername;
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/filter/IncidentCustomerSearchContext.java

@@ -17,19 +17,45 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 
-import cn.ibizlab.businesscentral.util.filter.SearchContextBase;
-
+import cn.ibizlab.businesscentral.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer;
 /**
- * ServiceApi数据实体[IncidentCustomer] 查询条件对象
+ * 关系型数据实体[IncidentCustomer] 查询条件对象
  */
 @Slf4j
 @Data
-public class IncidentCustomerSearchContext extends SearchContextBase {
-	private String n_customertype_eq;//[客户类型]
+public class IncidentCustomerSearchContext extends QueryWrapperContext<IncidentCustomer> {
 
+	private String n_customertype_eq;//[客户类型]
+	public void setN_customertype_eq(String n_customertype_eq) {
+        this.n_customertype_eq = n_customertype_eq;
+        if(!ObjectUtils.isEmpty(this.n_customertype_eq)){
+            this.getSearchCond().eq("customertype", n_customertype_eq);
+        }
+    }
 	private String n_customername_like;//[客户]
-
+	public void setN_customername_like(String n_customername_like) {
+        this.n_customername_like = n_customername_like;
+        if(!ObjectUtils.isEmpty(this.n_customername_like)){
+            this.getSearchCond().like("customername", n_customername_like);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("customername", query)   
+            );
+		 }
+	}
 }
 
 
 
+

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/mapper/IncidentCustomerMapper.java

+package cn.ibizlab.businesscentral.core.service.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer;
+import cn.ibizlab.businesscentral.core.service.filter.IncidentCustomerSearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface IncidentCustomerMapper extends BaseMapper<IncidentCustomer>{
+
+    Page<IncidentCustomer> searchDefault(IPage page, @Param("srf") IncidentCustomerSearchContext context, @Param("ew") Wrapper<IncidentCustomer> wrapper) ;
+    @Override
+    IncidentCustomer selectById(Serializable id);
+    @Override
+    int insert(IncidentCustomer entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) IncidentCustomer entity);
+    @Override
+    int update(@Param(Constants.ENTITY) IncidentCustomer entity, @Param("ew") Wrapper<IncidentCustomer> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/service/IIncidentCustomerService.java

@@ -18,10 +18,12 @@ import cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer;
 import cn.ibizlab.businesscentral.core.service.filter.IncidentCustomerSearchContext;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
+
 /**
  * 实体[IncidentCustomer] 服务对象接口
  */
-public interface IIncidentCustomerService{
+public interface IIncidentCustomerService extends IService<IncidentCustomer>{
 
     boolean create(IncidentCustomer et) ;
     void createBatch(List<IncidentCustomer> list) ;
@@ -35,8 +37,21 @@ public interface IIncidentCustomerService{
     boolean save(IncidentCustomer et) ;
     void saveBatch(List<IncidentCustomer> list) ;
     Page<IncidentCustomer> searchDefault(IncidentCustomerSearchContext context) ;
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
 
 }
 
 
-

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/service/impl/IncidentCustomerServiceImpl.java

@@ -30,44 +30,73 @@ import cn.ibizlab.businesscentral.core.service.service.IIncidentCustomerService;
 import cn.ibizlab.businesscentral.util.helper.CachedBeanCopier;
 
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.ibizlab.businesscentral.core.service.mapper.IncidentCustomerMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.util.StringUtils;
+
 /**
- * 实体[案例客户] 无存储服务对象接口实现
+ * 实体[案例客户] 服务对象接口实现
  */
 @Slf4j
-@Service
-public class IncidentCustomerServiceImpl implements IIncidentCustomerService {
+@Service("IncidentCustomerServiceImpl")
+public class IncidentCustomerServiceImpl extends ServiceImpl<IncidentCustomerMapper, IncidentCustomer> implements IIncidentCustomerService {
+
 
+    protected int batchSize = 500;
 
     @Override
+    @Transactional
     public boolean create(IncidentCustomer et) {
-        //代码实现
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
+        CachedBeanCopier.copy(get(et.getCustomerid()),et);
         return true;
     }
 
-    public void createBatch(List<IncidentCustomer> list){
+    @Override
+    public void createBatch(List<IncidentCustomer> list) {
+        this.saveBatch(list,batchSize);
     }
 
     @Override
+    @Transactional
     public boolean update(IncidentCustomer et) {
-        //代码实现
+        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("customerid",et.getCustomerid())))
+            return false;
+        CachedBeanCopier.copy(get(et.getCustomerid()),et);
         return true;
     }
 
-    public void updateBatch(List<IncidentCustomer> list){
+    @Override
+    public void updateBatch(List<IncidentCustomer> list) {
+        updateBatchById(list,batchSize);
     }
 
     @Override
+    @Transactional
     public boolean remove(String key) {
-        return true;
+        boolean result=removeById(key);
+        return result ;
     }
 
-    public void removeBatch(Collection<String> idList){
+    @Override
+    public void removeBatch(Collection<String> idList) {
+        removeByIds(idList);
     }
 
     @Override
+    @Transactional
     public IncidentCustomer get(String key) {
-        IncidentCustomer et = new IncidentCustomer();
-        et.setCustomerid(key);
+        IncidentCustomer et = getById(key);
+        if(et==null){
+            et=new IncidentCustomer();
+            et.setCustomerid(key);
+        }
+        else{
+        }
         return et;
     }
 
@@ -78,20 +107,38 @@ public class IncidentCustomerServiceImpl implements IIncidentCustomerService {
 
     @Override
     public boolean checkKey(IncidentCustomer et) {
-        return false;
+        return (!ObjectUtils.isEmpty(et.getCustomerid()))&&(!Objects.isNull(this.getById(et.getCustomerid())));
     }
     @Override
     @Transactional
     public boolean save(IncidentCustomer et) {
-        //代码实现
+        if(!saveOrUpdate(et))
+            return false;
         return true;
     }
 
     @Override
-    public void saveBatch(List<IncidentCustomer> list) {
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public boolean saveOrUpdate(IncidentCustomer et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
     }
 
+    @Override
+    public boolean saveBatch(Collection<IncidentCustomer> list) {
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
 
+    @Override
+    public void saveBatch(List<IncidentCustomer> list) {
+        saveOrUpdateBatch(list,batchSize);
+    }
 
 
 
@@ -100,9 +147,41 @@ public class IncidentCustomerServiceImpl implements IIncidentCustomerService {
      */
     @Override
     public Page<IncidentCustomer> searchDefault(IncidentCustomerSearchContext context) {
-        return new PageImpl<IncidentCustomer>(new ArrayList(),context.getPageable(),0);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<IncidentCustomer> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<IncidentCustomer>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+
+
+
+
+
+
+    @Override
+    public List<JSONObject> select(String sql, Map param){
+        return this.baseMapper.selectBySQL(sql,param);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql , Map param){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql,param);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
     }
 
 
 }
 
+

businesscentral-core/src/main/resources/mapper/service/incidentcustomer/IncidentCustomerMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.businesscentral.core.service.mapper.IncidentCustomerMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="IncidentCustomerResultMap" databaseId="mysql">
+        <![CDATA[select t1.* from (SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  ) t1 where customerid=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="IncidentCustomerResultMap" type="cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer" autoMapping="true">
+        <id property="customerid" column="customerid" /><!--主键字段映射-->
+            
+		
+    </resultMap>
+
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.service.filter.IncidentCustomerSearchContext"  resultMap="IncidentCustomerResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Account]-->
+    <sql id="Account" databaseId="mysql">
+		<![CDATA[ select  accountid as customerid,  accountname as customername,  'ACCOUNT' as customertype  from account
+			]]>
+    </sql>
+    <!--数据查询[Contact]-->
+    <sql id="Contact" databaseId="mysql">
+		<![CDATA[ select  contactid as customerid,  fullname as customername,  'CONTACT' as customertype  from contact
+			]]>
+    </sql>
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  
+			]]>
+    </sql>
+</mapper>
+

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/IncidentCustomerDTO.java

@@ -48,22 +48,6 @@ public class IncidentCustomerDTO extends DTOBase implements Serializable {
     private String customername;
 
 
-    /**
-     * 设置 [CUSTOMERTYPE]
-     */
-    public void setCustomertype(String  customertype){
-        this.customertype = customertype ;
-        this.modify("customertype",customertype);
-    }
-
-    /**
-     * 设置 [CUSTOMERNAME]
-     */
-    public void setCustomername(String  customername){
-        this.customername = customername ;
-        this.modify("customername",customername);
-    }
-
 
 }
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/rest/IncidentCustomerResource.java

@@ -47,6 +47,7 @@ public class IncidentCustomerResource {
     @Lazy
     public IncidentCustomerMapping incidentcustomerMapping;
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Create-all')")
     @ApiOperation(value = "新建案例客户", tags = {"案例客户" },  notes = "新建案例客户")
 	@RequestMapping(method = RequestMethod.POST, value = "/incidentcustomers")
     @Transactional
@@ -57,6 +58,7 @@ public class IncidentCustomerResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Create-all')")
     @ApiOperation(value = "批量新建案例客户", tags = {"案例客户" },  notes = "批量新建案例客户")
 	@RequestMapping(method = RequestMethod.POST, value = "/incidentcustomers/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<IncidentCustomerDTO> incidentcustomerdtos) {
@@ -64,6 +66,7 @@ public class IncidentCustomerResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Update-all')")
     @ApiOperation(value = "更新案例客户", tags = {"案例客户" },  notes = "更新案例客户")
 	@RequestMapping(method = RequestMethod.PUT, value = "/incidentcustomers/{incidentcustomer_id}")
     @Transactional
@@ -75,6 +78,7 @@ public class IncidentCustomerResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Update-all')")
     @ApiOperation(value = "批量更新案例客户", tags = {"案例客户" },  notes = "批量更新案例客户")
 	@RequestMapping(method = RequestMethod.PUT, value = "/incidentcustomers/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<IncidentCustomerDTO> incidentcustomerdtos) {
@@ -82,6 +86,7 @@ public class IncidentCustomerResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Remove-all')")
     @ApiOperation(value = "删除案例客户", tags = {"案例客户" },  notes = "删除案例客户")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/incidentcustomers/{incidentcustomer_id}")
     @Transactional
@@ -89,6 +94,7 @@ public class IncidentCustomerResource {
          return ResponseEntity.status(HttpStatus.OK).body(incidentcustomerService.remove(incidentcustomer_id));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Remove-all')")
     @ApiOperation(value = "批量删除案例客户", tags = {"案例客户" },  notes = "批量删除案例客户")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/incidentcustomers/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
@@ -96,6 +102,7 @@ public class IncidentCustomerResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Get-all')")
     @ApiOperation(value = "获取案例客户", tags = {"案例客户" },  notes = "获取案例客户")
 	@RequestMapping(method = RequestMethod.GET, value = "/incidentcustomers/{incidentcustomer_id}")
     public ResponseEntity<IncidentCustomerDTO> get(@PathVariable("incidentcustomer_id") String incidentcustomer_id) {
@@ -116,12 +123,14 @@ public class IncidentCustomerResource {
         return  ResponseEntity.status(HttpStatus.OK).body(incidentcustomerService.checkKey(incidentcustomerMapping.toDomain(incidentcustomerdto)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Save-all')")
     @ApiOperation(value = "保存案例客户", tags = {"案例客户" },  notes = "保存案例客户")
 	@RequestMapping(method = RequestMethod.POST, value = "/incidentcustomers/save")
     public ResponseEntity<Boolean> save(@RequestBody IncidentCustomerDTO incidentcustomerdto) {
         return ResponseEntity.status(HttpStatus.OK).body(incidentcustomerService.save(incidentcustomerMapping.toDomain(incidentcustomerdto)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-Save-all')")
     @ApiOperation(value = "批量保存案例客户", tags = {"案例客户" },  notes = "批量保存案例客户")
 	@RequestMapping(method = RequestMethod.POST, value = "/incidentcustomers/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<IncidentCustomerDTO> incidentcustomerdtos) {
@@ -129,6 +138,7 @@ public class IncidentCustomerResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-searchDefault-all')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"案例客户" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/incidentcustomers/fetchdefault")
 	public ResponseEntity<List<IncidentCustomerDTO>> fetchDefault(IncidentCustomerSearchContext context) {
@@ -141,6 +151,7 @@ public class IncidentCustomerResource {
                 .body(list);
 	}
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-IncidentCustomer-searchDefault-all')")
 	@ApiOperation(value = "查询DEFAULT", tags = {"案例客户" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/incidentcustomers/searchdefault")
 	public ResponseEntity<Page<IncidentCustomerDTO>> searchDefault(@RequestBody IncidentCustomerSearchContext context) {