Open/U8API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.优化日志结构

Browse Source 
2.增加日志时间
3.增加日志标识
4.删除部分代码
5.车间管理-报工单功能实现全面异步
This commit is contained in:
qmj
2025-07-24 10:04:22 +08:00
parent 55740e4bcf
commit 98905adc86
6 changed files with 783 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UFIDA.U8.Framework.Api/Controllers/U8/SFCController.cs
+507 -134
View File
@@ -11,6 +11,8 @@ using UFIDA.U8.Framework.Api.Unit;
using UFIDA.U8.Framework.Api.Models;
using Convert = System.Convert;
using SqlSugar;
using System.Linq;
using UFIDA.U8.Framework.Api.Entity;
// ReSharper disable InconsistentNaming
// ReSharper disable IdentifierTypo
@@ -28,10 +30,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// </summary>
private readonly ILog _logInfo = LogManager.GetLogger("logInfo");
/// <summary>
/// 缓存组件
/// </summary>
private static readonly MemoryCache _cache = new MemoryCache(new MemoryCacheOptions { ExpirationScanFrequency = TimeSpan.FromMinutes(10) });
/// <summary>
/// 新增报工
/// 保存报工单
/// </summary>
/// <param name="cAccId">系统号</param>
/// <param name="cCardNum">单据类型编码</param>
@@ -39,24 +44,30 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/MoRoutingBillSave")]
public async Task<BaseResult<string>> MoRoutingBillSave(string cAccId,string cCardNum, [FromBody] Dictionary<string, object> input)
public async Task<BaseResult<string>> MoRoutingBillSave(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input)
{
//var taskId = 0L;
var workId = SnowFlakeSingle.Instance.NextId();
try
{
var db = CommUnit.GetDbClient();
var userToken = Request.Headers.GetValues("userToken").First();
var workId = SnowFlakeSingle.Instance.NextId();
if (!string.IsNullOrWhiteSpace(userToken))
{
return await MoRoutingBillSaveToken(cCardNum, input);
}
_logInfo.Debug($"作业Id:{workId}-----接口标识:MoRoutingBillSave,系统号:{cAccId},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----当前接口:api/U8/SFC/MoRoutingBillSave,单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
{
_logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----未获取到缓存的登录信息,正在重新构建");
//可能存在其他的缓存,先清掉
_cache.Clear();
baseLogin = new BaseLogin();
@@ -69,15 +80,6 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
baseLogin.Init(param);
try
{
_cache.Remove($"U8_{cAccId}");
}
catch
{
_logInfo.Debug($"不存在[U8_{cAccId}]的缓存");
}
_cache.Set($"U8_{cAccId}", baseLogin);
}
@@ -85,73 +87,94 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
{
throw new Exception("登录对象加载失败");
}
if (!baseLogin.CheckCallar())
{
baseLogin.RefreshCallar(baseLogin.userToken);
}
var bo = new MoRoutingBill();
BaseResult<string> res;
//var runtimes = 0;
if (input.ContainsKey("bBatch") && Convert.ToBoolean(input["bBatch"]))
{
var inputs = input["inputs"] as List<Dictionary<string, object>> ?? $"{input["inputs"]}".ToObject<List<Dictionary<string, object>>>();
//var u8mTask = new SysU8MTask()
//{
// U8MPool = $"U8M_{cAccId}"
//};
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始保存(批量)");
res = await bo.Save(baseLogin, cCardNum, inputs);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束保存(批量)");
}
else
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始保存");
res = await bo.Save(baseLogin, cCardNum, input);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束保存");
}
//#if !DEBUG
// while (await db.Queryable<SysU8MTask>().AnyAsync())
// {
// if (runtimes > 20)
// {
// throw new Exception("当前任务队列过长");
// }
return res;
// runtimes++;
}
catch (Exception ex)
{
_logInfo.Error($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----错误信息:{ex.Message}", ex);
// await Task.Delay(100 * runtimes);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
// //u8mTask.Id = DateTime.Now.Ticks;
/// <summary>
/// 保存报工单
/// </summary>
/// <param name="cCardNum">单据类型编码</param>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/MoRoutingBillSave/Token")]
public async Task<BaseResult<string>> MoRoutingBillSaveToken(string cCardNum, [FromBody] Dictionary<string, object> input)
{
var workId = SnowFlakeSingle.Instance.NextId();
// if (await db.Queryable<SysU8MTask>()
// .AnyAsync(a => SqlFunc.DateDiff(DateType.Minute, a.dDate, DateTime.Now) > 1))
// {
// await db.Deleteable<SysU8MTask>()
// .Where(a => SqlFunc.DateDiff(DateType.Minute, a.dDate, DateTime.Now) > 1)
// .ExecuteCommandAsync();
// }
try
{
var userToken = Request.Headers.GetValues("userToken").First();
// }
//#endif
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----当前接口:api/U8/SFC/MoRoutingBillSave/{userToken},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
//u8mTask.dDate = DateTime.Now;
if (string.IsNullOrWhiteSpace(userToken))
{
throw new Exception("校验userToken失败");
}
//if (u8mTask.Id == null)
//{
// u8mTask.Id = DateTime.Now.Ticks;
//}
var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
//taskId = await db.Insertable(u8mTask).ExecuteReturnSnowflakeIdAsync();
var token = CommUnit.GetDecrypt(output.userToken);
//var taskid = SnowFlakeSingle.Instance.NextId();
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
//_logInfo.Debug($"开始操作,当前任务ID:{taskId}");
//if (!_cache.TryGetValue($"U8M_{cAccId}", out BaseLogin baseLogin))
//{
// _cache.Clear();
if (!_cache.TryGetValue($"U8_{userToken}_{output.cAccId}", out BaseLogin baseLogin))
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----未获取到缓存的登录信息,正在重新构建");
////baseLogin = new BaseLogin();
//可能存在其他的缓存,先清掉
_cache.Clear();
////var param = await CommUnit.GetLoginParamter(cAccId);
baseLogin = new BaseLogin();
////if (param == null)
////{
//// throw new Exception("未能加载指定系统号的登录信息");
////}
baseLogin.Init(token, true, 5);
////_logInfo.Debug("开始登录");
_cache.Set($"U8_{userToken}_{output.cAccId}", baseLogin);
}
////baseLogin.Init(param,true);
if (baseLogin == null)
{
throw new Exception("登录对象加载失败");
}
if (!baseLogin.CheckCallar())
{
baseLogin.RefreshCallar(baseLogin.userToken);
}
var bo = new MoRoutingBill();
BaseResult<string> res;
@@ -159,77 +182,32 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
{
var inputs = input["inputs"] as List<Dictionary<string, object>> ?? $"{input["inputs"]}".ToObject<List<Dictionary<string, object>>>();
res =await bo.Save(baseLogin, cCardNum, inputs);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始保存(批量)");
res = await bo.Save(baseLogin, cCardNum, inputs);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束保存(批量)");
}
else
{
res =await bo.Save(baseLogin, cCardNum, input);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始保存");
res = await bo.Save(baseLogin, cCardNum, input);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束保存");
}
//loader.Unload();
//var res= loader.Save(param, cCardNum, input);
//_cache.Set($"U8M_{cAccId}", baseLogin);
//}
//var bf = new MoRoutingBill();
_logInfo.Debug($"开始保存");
//BaseResult<string> res;
//if (input.ContainsKey("bBatch") && Convert.ToBoolean(input["bBatch"]))
//{
// var inputs = input["inputs"] as List<Dictionary<string, object>> ?? $"{input["inputs"]}".ToObject<List<Dictionary<string, object>>>();
// res = bf.Save(cCardNum, inputs);
//}
//else
//{
// res = bf.Save(cCardNum, input);
//}
_logInfo.Debug($"退出登录");
//baseLogin.ShutDown();
//if (taskId != 0)
//{
// await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
//}
return res;
}
catch (Exception ex)
{
_logInfo.Error(ex.Message, ex);
//if (taskId != 0)
//{
// await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
//}
_logInfo.Error($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----错误信息:{ex.Message}", ex);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
finally
{
//if (taskId != 0)
//{
// await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
//}
//baseLogin?.ShutDown();
}
}
/// <summary>
/// 新增订单报工
/// 保存订单报工
/// </summary>
/// <param name="cAccId">系统号</param>
/// <param name="input">报文数据</param>
@@ -243,7 +221,19 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
}
/// <summary>
/// 新增工序报工
/// 保存订单报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC90/Save/Token")]
public async Task<BaseResult<string>> FC90SaveToken([FromBody] Dictionary<string, object> input)
{
return await MoRoutingBillSaveToken("FC90", input);
}
/// <summary>
/// 保存工序报工
/// </summary>
/// <param name="cAccId">系统号</param>
/// <param name="input">报文数据</param>
@@ -257,7 +247,19 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
}
/// <summary>
/// 新增转移报工
/// 保存工序报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC91/Save/Token")]
public async Task<BaseResult<string>> FC91SaveToken([FromBody] Dictionary<string, object> input)
{
return await MoRoutingBillSaveToken("FC91", input);
}
/// <summary>
/// 保存转移报工
/// </summary>
/// <param name="cAccId">系统号</param>
/// <param name="input">报文数据</param>
@@ -271,7 +273,19 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
}
/// <summary>
/// 删除报工
/// 保存转移报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC92/Save/Token")]
public async Task<BaseResult<string>> FC92SaveToken([FromBody] Dictionary<string, object> input)
{
return await MoRoutingBillSaveToken("FC92", input);
}
/// <summary>
/// 删除报工单
/// </summary>
/// <param name="cAccId">系统号</param>
/// <param name="cCardNum">单据类型编码</param>
@@ -279,11 +293,20 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/MoRoutingBillDelete")]
public async Task<BaseResult<string>> MoRoutingBillDelete(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
public async Task<BaseResult<string>> MoRoutingBillDelete(string cAccId, string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
{
var workId = SnowFlakeSingle.Instance.NextId();
try
{
_logInfo.Debug($"接口标识:MoRoutingBillDelete,系统号:{cAccId},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
var userToken = Request.Headers.GetValues("userToken").First();
if (!string.IsNullOrWhiteSpace(userToken))
{
return await MoRoutingBillDeleteToken(cCardNum, input);
}
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----当前接口:api/U8/SFC/MoRoutingBillDelete,单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
@@ -308,24 +331,101 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
if (input.cVouchCode != null && input.cVouchCode.Count > 0)
{
return await bf.Delete(baseLogin,cCardNum, input.cVouchCode);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始删除(单号)(批量)");
var res = await bf.Delete(baseLogin, cCardNum, input.cVouchCode);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束删除(单号)(批量)");
return res;
}
else
{
return await bf.Delete(baseLogin,input.MID);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始删除(ID)(批量)");
var res = await bf.Delete(baseLogin, input.MID);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束删除(ID)(批量)");
return res;
}
}
catch (Exception ex)
{
_logInfo.Error(ex.Message, ex);
_logInfo.Error($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----错误信息:{ex.Message}", ex);
return new BaseResult<string> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 删除报工单
/// </summary>
/// <param name="cCardNum">单据类型编码</param>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/MoRoutingBillDelete/Token")]
public async Task<BaseResult<string>> MoRoutingBillDeleteToken(string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
{
var workId = SnowFlakeSingle.Instance.NextId();
try
{
var userToken = Request.Headers.GetValues("userToken").First();
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----当前接口:api/U8/SFC/MoRoutingBillDelete/{userToken},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
if (string.IsNullOrWhiteSpace(userToken))
{
throw new Exception("校验userToken失败");
}
var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
var token = CommUnit.GetDecrypt(output.userToken);
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
if (!_cache.TryGetValue($"U8_{userToken}_{output.cAccId}", out BaseLogin baseLogin))
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----未获取到缓存的登录信息,正在重新构建");
//可能存在其他的缓存,先清掉
_cache.Clear();
baseLogin = new BaseLogin();
baseLogin.Init(token, true, 5);
_cache.Set($"U8_{userToken}_{output.cAccId}", baseLogin);
}
var bf = new MoRoutingBill();
if (input.cVouchCode != null && input.cVouchCode.Count > 0)
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始删除(单号)(批量)");
var res = await bf.Delete(baseLogin, cCardNum, input.cVouchCode);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束删除(单号)(批量)");
return res;
}
else
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始删除(ID)(批量)");
var res = await bf.Delete(baseLogin, input.MID);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束删除(ID)(批量)");
return res;
}
}
catch (Exception ex)
{
_logInfo.Error($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----错误信息:{ex.Message}", ex);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 删除订单报工
@@ -341,6 +441,18 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
return await MoRoutingBillDelete(cAccId, "FC90", input);
}
/// <summary>
/// 删除订单报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC90/Delete/Token")]
public async Task<BaseResult<string>> FC90DeleteToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillDeleteToken("FC90", input);
}
/// <summary>
/// 删除工序报工
/// </summary>
@@ -355,6 +467,18 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
return await MoRoutingBillDelete(cAccId, "FC91", input);
}
/// <summary>
/// 删除工序报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC91/Delete/Token")]
public async Task<BaseResult<string>> FC91DeleteToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillDeleteToken("FC91", input);
}
/// <summary>
/// 删除转移报工
/// </summary>
@@ -370,7 +494,19 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
}
/// <summary>
/// 审核报工
/// 删除转移报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC92/Delete/Token")]
public async Task<BaseResult<string>> FC92DeleteToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillDeleteToken("FC92", input);
}
/// <summary>
/// 审核报工单
/// </summary>
/// <param name="cAccId">系统号</param>
/// <param name="cCardNum">单据类型编码</param>
@@ -378,11 +514,20 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/MoRoutingBillVerify")]
public async Task<BaseResult<string>> MoRoutingBillVerify(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
public async Task<BaseResult<string>> MoRoutingBillVerify(string cAccId, string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
{
var workId = SnowFlakeSingle.Instance.NextId();
try
{
_logInfo.Debug($"接口标识:MoRoutingBillVerify,系统号:{cAccId},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
var userToken = Request.Headers.GetValues("userToken").First();
if (!string.IsNullOrWhiteSpace(userToken))
{
return await MoRoutingBillVerifyToken(cCardNum, input);
}
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----当前接口:api/U8/SFC/MoRoutingBillVerify,单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
@@ -419,12 +564,83 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
{
_logInfo.Error(ex.Message, ex);
return new BaseResult<string> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 审核报工单
/// </summary>
/// <param name="cCardNum">单据类型编码</param>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/MoRoutingBillVerify/Token")]
public async Task<BaseResult<string>> MoRoutingBillVerifyToken(string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
{
var workId = SnowFlakeSingle.Instance.NextId();
try
{
var userToken = Request.Headers.GetValues("userToken").First();
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----当前接口:api/U8/SFC/MoRoutingBillVerify/{userToken},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
if (string.IsNullOrWhiteSpace(userToken))
{
throw new Exception("校验userToken失败");
}
var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
var token = CommUnit.GetDecrypt(output.userToken);
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
if (!_cache.TryGetValue($"U8_{userToken}_{output.cAccId}", out BaseLogin baseLogin))
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----未获取到缓存的登录信息,正在重新构建");
//可能存在其他的缓存,先清掉
_cache.Clear();
baseLogin = new BaseLogin();
baseLogin.Init(token, true, 5);
_cache.Set($"U8_{userToken}_{output.cAccId}", baseLogin);
}
var bf = new MoRoutingBill();
if (input.cVouchCode != null && input.cVouchCode.Count > 0)
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始审核(单号)(批量)");
var res = await bf.Verify(baseLogin, cCardNum, input.cVouchCode);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束审核(单号)(批量)");
return res;
}
else
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始审核(ID)(批量)");
var res = await bf.Verify(baseLogin, input.MID);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束审核(ID)(批量)");
return res;
}
}
catch (Exception ex)
{
_logInfo.Error(ex.Message, ex);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 审核订单报工
@@ -440,6 +656,18 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
return await MoRoutingBillVerify(cAccId, "FC90", input);
}
/// <summary>
/// 审核订单报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC90/Verify/Token")]
public async Task<BaseResult<string>> FC90VerifyToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillVerifyToken("FC90", input);
}
/// <summary>
/// 审核工序报工
/// </summary>
@@ -454,6 +682,18 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
return await MoRoutingBillVerify(cAccId, "FC91", input);
}
/// <summary>
/// 审核工序报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC91/Verify/Token")]
public async Task<BaseResult<string>> FC91VerifyToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillVerifyToken("FC91", input);
}
/// <summary>
/// 审核转移报工
/// </summary>
@@ -468,6 +708,18 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
return await MoRoutingBillVerify(cAccId, "FC92", input);
}
/// <summary>
/// 审核转移报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC92/Verify/Token")]
public async Task<BaseResult<string>> FC92VerifyToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillVerifyToken("FC92", input);
}
/// <summary>
/// 弃审报工
/// </summary>
@@ -477,12 +729,20 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/MoRoutingBillUnVerify")]
public async Task<BaseResult<string>> MoRoutingBillUnVerify(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
public async Task<BaseResult<string>> MoRoutingBillUnVerify(string cAccId, string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
{
var workId = SnowFlakeSingle.Instance.NextId();
try
{
_logInfo.Debug($"接口标识:MoRoutingBillUnVerify,系统号:{cAccId},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
var userToken = Request.Headers.GetValues("userToken").First();
if (!string.IsNullOrWhiteSpace(userToken))
{
return await MoRoutingBillUnVerifyToken(cCardNum, input);
}
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----当前接口:api/U8/SFC/MoRoutingBillUnVerify,单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
@@ -507,24 +767,101 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
if (input.cVouchCode != null && input.cVouchCode.Count > 0)
{
return bf.UnVerify(cCardNum, input.cVouchCode);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始弃审(单号)(批量)");
var res = await bf.UnVerify(baseLogin, cCardNum, input.cVouchCode);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束弃审(单号)(批量)");
return res;
}
else
{
return bf.UnVerify(input.MID);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始弃审(单号)(批量)");
var res = await bf.UnVerify(baseLogin, input.MID);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束弃审(单号)(批量)");
return res;
}
}
catch (Exception ex)
{
_logInfo.Error(ex.Message, ex);
_logInfo.Error($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----错误信息:{ex.Message}", ex);
return new BaseResult<string> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 弃审报工
/// </summary>
/// <param name="cCardNum">单据类型编码</param>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/MoRoutingBillUnVerify/Token")]
public async Task<BaseResult<string>> MoRoutingBillUnVerifyToken(string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
{
var workId = SnowFlakeSingle.Instance.NextId();
try
{
var userToken = Request.Headers.GetValues("userToken").First();
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----当前接口:api/U8/SFC/MoRoutingBillUnVerify/{userToken},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
if (string.IsNullOrWhiteSpace(userToken))
{
throw new Exception("校验userToken失败");
}
var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
var token = CommUnit.GetDecrypt(output.userToken);
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
if (!_cache.TryGetValue($"U8_{userToken}_{output.cAccId}", out BaseLogin baseLogin))
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----未获取到缓存的登录信息,正在重新构建");
//可能存在其他的缓存,先清掉
_cache.Clear();
baseLogin = new BaseLogin();
baseLogin.Init(token, true, 5);
_cache.Set($"U8_{userToken}_{output.cAccId}", baseLogin);
}
var bf = new MoRoutingBill();
if (input.cVouchCode != null && input.cVouchCode.Count > 0)
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始弃审(单号)(批量)");
var res = await bf.UnVerify(baseLogin, cCardNum, input.cVouchCode);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束弃审(单号)(批量)");
return res;
}
else
{
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----开始弃审(ID)(批量)");
var res = await bf.UnVerify(baseLogin, input.MID);
_logInfo.Debug($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----结束弃审(ID)(批量)");
return res;
}
}
catch (Exception ex)
{
_logInfo.Error($"作业Id:{workId}-----{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}-----错误信息:{ex.Message}", ex);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 弃审订单报工
@@ -540,6 +877,18 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
return await MoRoutingBillVerify(cAccId, "FC90", input);
}
/// <summary>
/// 弃审订单报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC90/UnVerify/Token")]
public async Task<BaseResult<string>> FC90UnVerifyToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillVerifyToken("FC90", input);
}
/// <summary>
/// 弃审工序报工
/// </summary>
@@ -554,6 +903,18 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
return await MoRoutingBillUnVerify(cAccId, "FC91", input);
}
/// <summary>
/// 弃审工序报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC91/UnVerify/Token")]
public async Task<BaseResult<string>> FC91UnVerifyToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillUnVerifyToken("FC91", input);
}
/// <summary>
/// 弃审转移报工
/// </summary>
@@ -568,5 +929,17 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
return await MoRoutingBillUnVerify(cAccId, "FC92", input);
}
/// <summary>
/// 弃审转移报工
/// </summary>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/SFC/FC92/UnVerify/Token")]
public async Task<BaseResult<string>> FC92UnVerifyToken([FromBody] DeleteMoRoutingBillInput input)
{
return await MoRoutingBillUnVerifyToken("FC92", input);
}
}
}