ZhongRui/ALDbanyunxiangmu.git

			@@ -6,6 +6,7 @@
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Net;
			using System.Reflection.Emit;
			using System.Text;
			using System.Threading.Tasks;
			@@ -41,7 +42,10 @@
			{
			try
			{
			var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "7e9239c1e132462a9cf03bfa342a044aMTcxODE5MzgxODI4Mw" };
			//erp 娴嬭瘯鐜
			//var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "7e9239c1e132462a9cf03bfa342a044aMTcxODE5MzgxODI4Mw" };
			////erp 姝ｅ紡鐜
			var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "9a3d0b5a37Bfc6dAM4b34ODb8ebDOSb937106d1b19DS29098" };
			var response = await PostAsync<TokenRequest, TokenResponse>("auth/getAccessToken", request, includeToken: false);
			var _token = response?.data?.access_token;
			return _token ?? "";
			@@ -226,10 +230,10 @@
			}
			else
			{
			materialRequest.modifyDateStart = DateTime.Now.AddDays(-1).Date.ToString("yyyy-MM-dd") + " 00:00:01";
			materialRequest.modifyDateEnd = DateTime.Now.ToString("yyyy-MM-dd HH:mm") + ":01";
			materialRequest.pageNum = 1;
			materialRequest.pageSize = 5000;
			//materialRequest.modifyDateStart = DateTime.Now.AddDays(-1).Date.ToString("yyyy-MM-dd") + " 00:00:01";
			//materialRequest.modifyDateEnd = DateTime.Now.ToString("yyyy-MM-dd HH:mm") + ":01";
			//materialRequest.pageNum = 1;
			//materialRequest.pageSize = 5000;

			var result = await PostAsync<MaterialRequest, MaterialResponse>("erp/getMaterialInfo", materialRequest, true, true);
			if (result != null && result.data != null && result.data.Any())
			@@ -352,11 +356,13 @@
			json = JsonConvert.SerializeObject(request);
			}


			var content = new StringContent(json, Encoding.UTF8, "application/json");
			var _client = _httpClientFactory.CreateClient("ERPUrl");
			_client.DefaultRequestHeaders.Clear();



			string timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			string base64Header = Convert.ToBase64String(Encoding.UTF8.GetBytes(timestamp));
			_client.DefaultRequestHeaders.Add("X-Custom-Header", base64Header);