|
|
@ -152,98 +152,45 @@ namespace TaskManager.Controllers |
|
|
|
{ |
|
|
|
try |
|
|
|
{ |
|
|
|
string inputjson = string.Empty; |
|
|
|
// string inputjson = string.Empty;
|
|
|
|
|
|
|
|
string inputjson = GetSerializedInputJson(t, TaskName); |
|
|
|
|
|
|
|
if (TaskName == "日物料需求计划风险确认")//格式特殊处理
|
|
|
|
{ |
|
|
|
inputjson = JsonSerializer.Serialize(t, |
|
|
|
new JsonSerializerOptions |
|
|
|
{ |
|
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, |
|
|
|
Converters = |
|
|
|
{ |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
}, |
|
|
|
WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All) |
|
|
|
} |
|
|
|
); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
inputjson = JsonSerializer.Serialize(t, |
|
|
|
new JsonSerializerOptions |
|
|
|
{ |
|
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, |
|
|
|
Converters = |
|
|
|
{ |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
}, |
|
|
|
WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping |
|
|
|
} |
|
|
|
); |
|
|
|
} |
|
|
|
// if (TaskName.Contains("供应商共享库存"))
|
|
|
|
// {
|
|
|
|
//if (TaskName == "日物料需求计划风险确认")//格式特殊处理
|
|
|
|
//{
|
|
|
|
// inputjson = JsonSerializer.Serialize(t,
|
|
|
|
// new JsonSerializerOptions
|
|
|
|
// {
|
|
|
|
// PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
|
|
// Converters =
|
|
|
|
// {
|
|
|
|
// new DecimalTrimConverter(),
|
|
|
|
// new InputCustomDateTimeConverter(),
|
|
|
|
// new InputCustomNullableDateTimeConverter()
|
|
|
|
// },
|
|
|
|
// WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
// Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All)
|
|
|
|
// }
|
|
|
|
// );
|
|
|
|
//}
|
|
|
|
//else
|
|
|
|
//{
|
|
|
|
// inputjson = JsonSerializer.Serialize(t,
|
|
|
|
// new JsonSerializerOptions
|
|
|
|
// {
|
|
|
|
// PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
|
|
// Converters =
|
|
|
|
// {
|
|
|
|
// new DecimalTrimConverter(),
|
|
|
|
// new InputCustomDateTimeConverter(),
|
|
|
|
// new InputCustomNullableDateTimeConverter()
|
|
|
|
// new DecimalTrimConverter(),
|
|
|
|
// new InputCustomDateTimeConverter(),
|
|
|
|
// new InputCustomNullableDateTimeConverter()
|
|
|
|
// },
|
|
|
|
// WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
// Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
|
|
|
|
// }
|
|
|
|
// );
|
|
|
|
// }
|
|
|
|
|
|
|
|
//if (TaskName.Contains("物料主数据"))
|
|
|
|
//{
|
|
|
|
|
|
|
|
// inputjson = JsonSerializer.Serialize(t,
|
|
|
|
// new JsonSerializerOptions
|
|
|
|
// {
|
|
|
|
// PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
|
|
// Converters =
|
|
|
|
// {
|
|
|
|
// new DecimalTrimConverter(),
|
|
|
|
// new InputCustomDateTimeConverter(),
|
|
|
|
// new InputCustomNullableDateTimeConverter()
|
|
|
|
// },
|
|
|
|
// WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
// Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
|
|
|
|
// }
|
|
|
|
// );
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
//else
|
|
|
|
//{
|
|
|
|
// inputjson = JsonSerializer.Serialize(t,
|
|
|
|
// new JsonSerializerOptions
|
|
|
|
// {
|
|
|
|
// PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
|
|
// Converters =
|
|
|
|
// {
|
|
|
|
// new DecimalTrimConverter(),
|
|
|
|
// },
|
|
|
|
// WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
// Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All)
|
|
|
|
// }
|
|
|
|
// );
|
|
|
|
//}
|
|
|
|
//inputjson = RemoveWhitespace(inputjson);
|
|
|
|
|
|
|
|
var content = await Post(Url, Path, inputjson, taskId, version); |
|
|
|
if (!string.IsNullOrEmpty(content)) |
|
|
|
{ |
|
|
@ -374,7 +321,7 @@ namespace TaskManager.Controllers |
|
|
|
createtask.TaskName = TaskName; |
|
|
|
createtask.Subscriber = Client; |
|
|
|
createtask.TableName = tableName; |
|
|
|
createtask.DataCount = pageSize; |
|
|
|
createtask.DataCount = records.Count(); |
|
|
|
createtask.Domain = "安通林"; |
|
|
|
createtask.Site = "安通林"; |
|
|
|
createtask.FailedCount = 0; |
|
|
@ -397,57 +344,8 @@ namespace TaskManager.Controllers |
|
|
|
} |
|
|
|
catch (Exception ex) |
|
|
|
{ |
|
|
|
string inputjson = ""; |
|
|
|
if (TaskName == "日物料需求计划风险确认")//格式特殊处理
|
|
|
|
{ |
|
|
|
inputjson = JsonSerializer.Serialize(pagedRequest, |
|
|
|
new JsonSerializerOptions |
|
|
|
{ |
|
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, |
|
|
|
Converters = |
|
|
|
{ |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
}, |
|
|
|
WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All) |
|
|
|
} |
|
|
|
); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
inputjson = JsonSerializer.Serialize(pagedRequest, |
|
|
|
new JsonSerializerOptions |
|
|
|
{ |
|
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, |
|
|
|
Converters = |
|
|
|
{ |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
}, |
|
|
|
WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping |
|
|
|
} |
|
|
|
); |
|
|
|
} |
|
|
|
string inputjson = GetSerializedInputJson(pagedRequest, TaskName); |
|
|
|
|
|
|
|
// else
|
|
|
|
// {
|
|
|
|
// inputjson = JsonSerializer.Serialize(pagedRequest,
|
|
|
|
// new JsonSerializerOptions
|
|
|
|
// {
|
|
|
|
// PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
|
|
// Converters =
|
|
|
|
// {
|
|
|
|
//new DecimalTrimConverter(),
|
|
|
|
// },
|
|
|
|
// WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
// Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All)
|
|
|
|
// }
|
|
|
|
// );
|
|
|
|
// }
|
|
|
|
await _logger.AddError(ex.Message, TaskName, taskId, version, inputjson); |
|
|
|
await transaction.RollbackAsync(); |
|
|
|
} |
|
|
@ -455,58 +353,8 @@ namespace TaskManager.Controllers |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
string inputjson = string.Empty; |
|
|
|
if (TaskName == "日物料需求计划风险确认")//格式特殊处理
|
|
|
|
{ |
|
|
|
inputjson = JsonSerializer.Serialize(pagedRequest, |
|
|
|
new JsonSerializerOptions |
|
|
|
{ |
|
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, |
|
|
|
Converters = |
|
|
|
{ |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
}, |
|
|
|
WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All) |
|
|
|
} |
|
|
|
); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
|
|
|
|
inputjson = JsonSerializer.Serialize(pagedRequest, |
|
|
|
new JsonSerializerOptions |
|
|
|
{ |
|
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, |
|
|
|
Converters = |
|
|
|
{ |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
}, |
|
|
|
WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping |
|
|
|
} |
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
//else
|
|
|
|
//{
|
|
|
|
// inputjson = JsonSerializer.Serialize(pagedRequest,
|
|
|
|
// new JsonSerializerOptions
|
|
|
|
// {
|
|
|
|
// PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
|
|
// Converters =
|
|
|
|
// {
|
|
|
|
// new DecimalTrimConverter(),
|
|
|
|
// },
|
|
|
|
// WriteIndented = false,// 可选,用于格式化输出
|
|
|
|
// Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All)
|
|
|
|
// }
|
|
|
|
// );
|
|
|
|
//}
|
|
|
|
string inputjson = GetSerializedInputJson(pagedRequest,TaskName); |
|
|
|
|
|
|
|
if (errorList != null) |
|
|
|
{ |
|
|
|
errorList.Add($"第 {1} 页数据保存失败,请检查数据:{result.message}。"); |
|
|
@ -639,9 +487,9 @@ namespace TaskManager.Controllers |
|
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, |
|
|
|
Converters = |
|
|
|
{ |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
}, |
|
|
|
WriteIndented = false, |
|
|
|
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All) |
|
|
@ -651,10 +499,12 @@ namespace TaskManager.Controllers |
|
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, |
|
|
|
Converters = |
|
|
|
{ |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new DecimalTrimConverter(), |
|
|
|
new InputCustomDateTimeConverter(), |
|
|
|
new InputCustomNullableDateTimeConverter() |
|
|
|
}, |
|
|
|
WriteIndented = false, |
|
|
|
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All) |
|
|
|
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
@ -706,29 +556,7 @@ namespace TaskManager.Controllers |
|
|
|
await _repository.DeleteAsync(id); |
|
|
|
return new JsonResult(new { Code = 200, Message = "删除成功!" }); ; |
|
|
|
} |
|
|
|
//[HttpGet]
|
|
|
|
//public async Task<ActionResult> GetPaged(
|
|
|
|
//[FromQuery] int pageNumber = 1,
|
|
|
|
//[FromQuery] int pageSize = 10,
|
|
|
|
//[FromQuery] string sortBy = "",
|
|
|
|
//[FromQuery] bool isAscending = true,
|
|
|
|
//[FromQuery] Dictionary<string, string> filters = null)
|
|
|
|
//{
|
|
|
|
// var pagingParams = new PagingParams
|
|
|
|
// {
|
|
|
|
// PageNumber = pageNumber,
|
|
|
|
// PageSize = pageSize,
|
|
|
|
// SortBy = sortBy,
|
|
|
|
// IsAscending = isAscending,
|
|
|
|
// Filters = filters
|
|
|
|
// };
|
|
|
|
|
|
|
|
// // 可以在这里构建表达式树过滤条件
|
|
|
|
// Expression<Func<T, bool>> filter = null;
|
|
|
|
|
|
|
|
// var pagedResult = await _repository.GetPagedAsync(filter, pagingParams);
|
|
|
|
// return Ok(pagedResult);
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 分页New
|
|
|
@ -846,10 +674,7 @@ namespace TaskManager.Controllers |
|
|
|
// 生成导入模板流(这里假设使用 YourModel 作为导入模型)
|
|
|
|
var bytes = await importer.GenerateTemplateBytes<T>(); |
|
|
|
|
|
|
|
|
|
|
|
//using var stream = new MemoryStream(bytes);
|
|
|
|
//stream.Seek(0, SeekOrigin.Begin);
|
|
|
|
|
|
|
|
|
|
|
|
// 设置友好的文件名,例如:"导入模板_20250530.xlsx"
|
|
|
|
var fileName = $"导入模板_{DateTime.Now:yyyyMMdd}.xlsx"; |
|
|
|
|
|
|
@ -859,10 +684,7 @@ namespace TaskManager.Controllers |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//return File(
|
|
|
|
// fileStream: stream,
|
|
|
|
// contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
|
|
|
// fileDownloadName: fileName);
|
|
|
|
|
|
|
|
} |
|
|
|
catch (Exception ex) |
|
|
|
{ |
|
|
|