修复销售订单查询报错的问题
This commit is contained in:
@@ -53,8 +53,6 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
|
||||
_logInfo.Debug($"当前接口:api/U8/Workflow/SubmitApplicationMessage/Code,对接账套:{cAccId},单据:{cCardNum},事件:{eventId},单据编号:{cCode}");
|
||||
|
||||
var db = CommUnit.GetDbClient();
|
||||
|
||||
var workId = SnowFlakeSingle.Instance.NextId();
|
||||
|
||||
_logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:提交审批流,对接账套:{cAccId},单据编号:{cCode}");
|
||||
@@ -95,7 +93,6 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
/// <summary>
|
||||
/// 提交审批流(单号)
|
||||
/// </summary>
|
||||
/// <param name="cAccId">系统注册号</param>
|
||||
/// <param name="cCardNum">单据类型编码</param>
|
||||
/// <param name="cCode">单据编号</param>
|
||||
/// <param name="eventId">审批事件</param>
|
||||
@@ -177,8 +174,6 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
return await SubmitApplicationMessageToken(cCardNum, voucherId, eventId, bUap);
|
||||
}
|
||||
|
||||
var db = CommUnit.GetDbClient();
|
||||
|
||||
var workId = SnowFlakeSingle.Instance.NextId();
|
||||
|
||||
_logInfo.Debug($"当前接口:api/U8/Workflow/SubmitApplicationMessage/Code,作业Id:{workId},对接账套:{cAccId},单据:{cCardNum},事件:{eventId},单据ID:{voucherId}");
|
||||
@@ -281,5 +276,246 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 退回提交人后重新提交(单号)
|
||||
/// </summary>
|
||||
/// <param name="cCardNum">单据类型编码</param>
|
||||
/// <param name="cCode">单据ID</param>
|
||||
/// <param name="cAccId">系统注册号</param>
|
||||
/// <param name="bUap">是否UAP单据</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("api/U8/Workflow/SubmitResubmitMessage/Code")]
|
||||
public async Task<BaseResult<string>> SubmitResubmitMessage(string cAccId, string cCardNum, string cCode, bool bUap = false)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Request.Headers.TryGetValues("userToken", out var userToken))
|
||||
{
|
||||
return await SubmitResubmitMessageToken(cCardNum, cCode, bUap);
|
||||
}
|
||||
|
||||
_logInfo.Debug($"当前接口:api/U8/Workflow/SubmitResubmitMessage/Code,对接账套:{cAccId},单据:{cCardNum},单据编号:{cCode}");
|
||||
|
||||
var workId = SnowFlakeSingle.Instance.NextId();
|
||||
|
||||
_logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:提交审批流,对接账套:{cAccId},单据编号:{cCode}");
|
||||
|
||||
if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
|
||||
{
|
||||
_logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
|
||||
|
||||
baseLogin = new BaseLogin();
|
||||
|
||||
var param = await CommUnit.GetLoginParamter(cAccId);
|
||||
|
||||
if (param == null)
|
||||
{
|
||||
throw new Exception("未能加载指定系统号的登录信息");
|
||||
}
|
||||
|
||||
baseLogin.Init(param, true);
|
||||
|
||||
_cache.Clear();
|
||||
|
||||
_cache.Set($"U8_{cAccId}", baseLogin);
|
||||
}
|
||||
|
||||
var services = new ServiceProxy();
|
||||
|
||||
return await services.SubmitResubmitMessage(baseLogin, cCardNum, cCode, bUap);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logInfo.Error(ex.Message, ex);
|
||||
|
||||
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 退回提交人后重新提交(单号)
|
||||
/// </summary>
|
||||
/// <param name="cCardNum">单据类型编码</param>
|
||||
/// <param name="cCode">单据编号</param>
|
||||
/// <param name="bUap">是否UAP单据</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("api/U8/Workflow/SubmitResubmitMessage/Code/Token")]
|
||||
public async Task<BaseResult<string>> SubmitResubmitMessageToken(string cCardNum, string cCode, bool bUap = false)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userToken = Request.Headers.GetValues("userToken").First();
|
||||
|
||||
if (string.IsNullOrWhiteSpace(userToken))
|
||||
{
|
||||
throw new Exception("校验userToken失败");
|
||||
}
|
||||
|
||||
_logInfo.Debug($"当前接口:api/U8/Workflow/SubmitResubmitMessage/Code/{userToken},单据:{cCardNum},单据编号:{cCode}");
|
||||
|
||||
var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
|
||||
|
||||
var token = CommUnit.GetDecrypt(output.userToken);
|
||||
|
||||
var workId = SnowFlakeSingle.Instance.NextId();
|
||||
|
||||
_logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{output.cAccId},单据编号:{cCode}");
|
||||
|
||||
if (!_cache.TryGetValue($"U8_{userToken}_{output.cAccId}", out BaseLogin baseLogin))
|
||||
{
|
||||
_logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
|
||||
|
||||
baseLogin = new BaseLogin();
|
||||
|
||||
baseLogin.Init(token, true, 5);
|
||||
|
||||
try
|
||||
{
|
||||
_cache.Remove($"U8_{userToken}_{output.cAccId}");
|
||||
}
|
||||
catch
|
||||
{
|
||||
_logInfo.Debug($"不存在[U8_{userToken}_{output.cAccId}]的缓存");
|
||||
}
|
||||
|
||||
_cache.Set($"U8_{userToken}_{output.cAccId}", baseLogin);
|
||||
}
|
||||
|
||||
var services = new ServiceProxy();
|
||||
|
||||
return await services.SubmitResubmitMessage(baseLogin, cCardNum, cCode, bUap);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logInfo.Error(ex.Message, ex);
|
||||
|
||||
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 提交审批流(ID)
|
||||
/// </summary>
|
||||
/// <param name="cCardNum">单据类型编码</param>
|
||||
/// <param name="voucherId">单据ID</param>
|
||||
/// <param name="cAccId">系统注册号</param>
|
||||
/// <param name="bUap">是否UAP单据</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("api/U8/Workflow/SubmitResubmitMessage/ID")]
|
||||
public async Task<BaseResult<string>> SubmitResubmitMessage(string cAccId, string cCardNum, long voucherId, bool bUap = false)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Request.Headers.TryGetValues("userToken", out var userToken))
|
||||
{
|
||||
return await SubmitResubmitMessageToken(cCardNum, voucherId, bUap);
|
||||
}
|
||||
|
||||
var workId = SnowFlakeSingle.Instance.NextId();
|
||||
|
||||
_logInfo.Debug($"当前接口:api/U8/Workflow/SubmitApplicationMessage/Code,作业Id:{workId},对接账套:{cAccId},单据:{cCardNum},单据ID:{voucherId}");
|
||||
|
||||
if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
|
||||
{
|
||||
_logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
|
||||
|
||||
baseLogin = new BaseLogin();
|
||||
|
||||
var param = await CommUnit.GetLoginParamter(cAccId);
|
||||
|
||||
if (param == null)
|
||||
{
|
||||
throw new Exception("未能加载指定系统号的登录信息");
|
||||
}
|
||||
|
||||
baseLogin.Init(param, false);
|
||||
|
||||
_cache.Clear();
|
||||
|
||||
_cache.Set($"U8_{cAccId}", baseLogin);
|
||||
}
|
||||
|
||||
var services = new ServiceProxy();
|
||||
|
||||
return await services.SubmitResubmitMessage(baseLogin, cCardNum, voucherId, bUap);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logInfo.Error(ex.Message, ex);
|
||||
|
||||
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 提交审批流(ID)
|
||||
/// </summary>
|
||||
/// <param name="cCardNum">单据类型编码</param>
|
||||
/// <param name="voucherId">单据ID</param>
|
||||
/// <param name="bUap">是否UAP单据</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("api/U8/Workflow/SubmitResubmitMessage/ID/Token")]
|
||||
public async Task<BaseResult<string>> SubmitResubmitMessageToken(string cCardNum, long voucherId, bool bUap = false)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userToken = Request.Headers.GetValues("userToken").First();
|
||||
|
||||
if (string.IsNullOrWhiteSpace(userToken))
|
||||
{
|
||||
throw new Exception("校验userToken失败");
|
||||
}
|
||||
|
||||
_logInfo.Debug($"当前接口:api/U8/Workflow/SubmitApplicationMessage/ID/{userToken},单据:{cCardNum},单据ID:{voucherId}");
|
||||
|
||||
var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
|
||||
|
||||
var token = CommUnit.GetDecrypt(output.userToken);
|
||||
|
||||
var workId = SnowFlakeSingle.Instance.NextId();
|
||||
|
||||
_logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{output.cAccId},单据ID:{voucherId}");
|
||||
|
||||
if (!_cache.TryGetValue($"U8_{userToken}_{output.cAccId}", out BaseLogin baseLogin))
|
||||
{
|
||||
_logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
|
||||
|
||||
baseLogin = new BaseLogin();
|
||||
|
||||
baseLogin.Init(token, true, 5);
|
||||
|
||||
try
|
||||
{
|
||||
_cache.Remove($"U8_{userToken}_{output.cAccId}");
|
||||
}
|
||||
catch
|
||||
{
|
||||
_logInfo.Debug($"不存在[U8_{userToken}_{output.cAccId}]的缓存");
|
||||
}
|
||||
|
||||
_cache.Set($"U8_{userToken}_{output.cAccId}", baseLogin);
|
||||
}
|
||||
|
||||
var services = new ServiceProxy();
|
||||
|
||||
return await services.SubmitResubmitMessage(baseLogin, cCardNum, voucherId, bUap);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logInfo.Error(ex.Message, ex);
|
||||
|
||||
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user