admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-08-13 19:02:40 +00:00
parent f8609e59ec
commit 706a855fbd
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/Plugins/AyaNova.Plugin.V8/V8.cs
View File

@@ -1562,6 +1562,7 @@ namespace AyaNova.PlugIn.V8
if (IsDuplicatev7v8IdMapItem(c.ID, c.PartNumber, progress)) continue; if (IsDuplicatev7v8IdMapItem(c.ID, c.PartNumber, progress)) continue;
d.name = c.Name; d.name = c.Name;
d.partNumber = GetUniqueName(c.PartNumber); d.partNumber = GetUniqueName(c.PartNumber);
progress.SubOp("");
progress.Op(ObjectTypeName + " " + d.partNumber + " " + d.name); progress.Op(ObjectTypeName + " " + d.partNumber + " " + d.name);
d.manufacturerId = Getv7v8IdMapNullOk(c.ManufacturerID); d.manufacturerId = Getv7v8IdMapNullOk(c.ManufacturerID);
d.manufacturerNumber = c.ManufacturerNumber; d.manufacturerNumber = c.ManufacturerNumber;
@@ -2983,7 +2984,7 @@ namespace AyaNova.PlugIn.V8
//set new seed number for work orders //set new seed number for work orders
_highestWorkOrderNumberExported += 1; _highestWorkOrderNumberExported += 1;
{ {
await util.PutAsync("global-biz-settings/seeds/34/" + _highestWorkOrderNumberExported.ToString()); await util.PutAsync("global-biz-setting/seeds/34/" + _highestWorkOrderNumberExported.ToString());
} }
} }
#endregion Workorders #endregion Workorders

39
source/Plugins/AyaNova.Plugin.V8/util.cs
View File

@@ -25,31 +25,26 @@ namespace AyaNova.PlugIn.V8
//url once known to be good //url once known to be good
internal static string ApiBaseUrl { get; set; } internal static string ApiBaseUrl { get; set; }
internal static string JWT { get; set; } internal static string JWT { get; set; }
// public static bool Initialized { get; set; } // public static bool Initialized { get; set; }
internal static string ServerState { get; set; } internal static string ServerState { get; set; }
public util() //public util()
{ //{
// Initialized = false; // // Initialized = false;
JWT = string.Empty; // JWT = string.Empty;
} //}
#region INIT / AUTH #region INIT / AUTH
private static void InitClient() private static void InitClient()
{ {
// if (Initialized) return;
//if (client != null) //client.Timeout = new TimeSpan(0, 0, 45);
// client.Dispose(); //client.BaseAddress = new Uri(ApiBaseUrl);
//client = null; // client.DefaultRequestHeaders.Accept.Clear();
//client = new HttpClient(); // client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
client.Timeout = new TimeSpan(0, 0, 45); //
client.BaseAddress = new Uri(ApiBaseUrl);
client.DefaultRequestHeaders.Accept.Clear();
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
// client.DefaultRequestHeaders.Add("X-AY-Import-Mode", "true");
//Initialized = true;
} }
/// <summary> /// <summary>
@@ -126,10 +121,12 @@ namespace AyaNova.PlugIn.V8
public async static Task<ApiResponse> GetAsync(string route) public async static Task<ApiResponse> GetAsync(string route)
{ {
var requestMessage = new HttpRequestMessage(HttpMethod.Get, route); var requestMessage = new HttpRequestMessage(HttpMethod.Get, ApiBaseUrl + route);
requestMessage.Headers.Add("X-AY-Import-Mode", "1"); requestMessage.Headers.Add("X-AY-Import-Mode", "1");
if (!string.IsNullOrWhiteSpace(JWT)) if (!string.IsNullOrWhiteSpace(JWT))
requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT); requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT);
// requestMessage.RequestUri = new Uri(ApiBaseUrl);
HttpResponseMessage response = await client.SendAsync(requestMessage); HttpResponseMessage response = await client.SendAsync(requestMessage);
var responseAsString = await response.Content.ReadAsStringAsync(); var responseAsString = await response.Content.ReadAsStringAsync();
@@ -144,7 +141,7 @@ namespace AyaNova.PlugIn.V8
// //
public async static Task<ApiResponse> PostAsync(string route, string postJson = null) public async static Task<ApiResponse> PostAsync(string route, string postJson = null)
{ {
var requestMessage = new HttpRequestMessage(HttpMethod.Post, route); var requestMessage = new HttpRequestMessage(HttpMethod.Post, ApiBaseUrl + route);
requestMessage.Headers.Add("X-AY-Import-Mode", "1"); requestMessage.Headers.Add("X-AY-Import-Mode", "1");
if (!string.IsNullOrWhiteSpace(JWT)) if (!string.IsNullOrWhiteSpace(JWT))
requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT); requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT);
@@ -168,7 +165,7 @@ namespace AyaNova.PlugIn.V8
public async static Task<ApiResponse> PutAsync(string route, string putJson = null) public async static Task<ApiResponse> PutAsync(string route, string putJson = null)
{ {
var requestMessage = new HttpRequestMessage(HttpMethod.Put, route); var requestMessage = new HttpRequestMessage(HttpMethod.Put, ApiBaseUrl + route);
requestMessage.Headers.Add("X-AY-Import-Mode", "1"); requestMessage.Headers.Add("X-AY-Import-Mode", "1");
if (!string.IsNullOrWhiteSpace(JWT)) if (!string.IsNullOrWhiteSpace(JWT))
requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT); requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT);
@@ -191,7 +188,7 @@ namespace AyaNova.PlugIn.V8
public async static Task<ApiResponse> PostFormDataAsync(string route, MultipartFormDataContent formContent) public async static Task<ApiResponse> PostFormDataAsync(string route, MultipartFormDataContent formContent)
{ {
var requestMessage = new HttpRequestMessage(HttpMethod.Post, route); var requestMessage = new HttpRequestMessage(HttpMethod.Post, ApiBaseUrl + route);
requestMessage.Headers.Add("X-AY-Import-Mode", "1"); requestMessage.Headers.Add("X-AY-Import-Mode", "1");
if (!string.IsNullOrWhiteSpace(JWT)) if (!string.IsNullOrWhiteSpace(JWT))
requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT); requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT);