zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新

master
赵新宇 2 weeks ago
parent
a5dcadb310
commit
6675ac9510
6 changed files with 1377 additions and 1391 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 116
      API/TaskManager.Entity/Entity.cs
  2. 2
      API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
  3. BIN
      API/Wood.Admin.WebApi/wwwroot/logo_op.zip
  4. 2610
      API/Wood.Admin.WebApi/日物料需求计划.json
  5. 6
      API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
  6. 30
      API/Wood.Service/Controllers/RecurringJobBaseController.cs

116
API/TaskManager.Entity/Entity.cs
View File

@ -860,91 +860,91 @@ namespace TaskManager.Entity
/// 起始日期+2天的需求数量（以此类推）
/// </summary>
[ExporterHeader(DisplayName = "第3天需求数量")]
public decimal QuantityDemand3 { get; set; } = 0;
public decimal? QuantityDemand3 { get; set; } = 0;
[ExporterHeader(DisplayName = "第4天需求数量")]
public decimal QuantityDemand4 { get; set; } = 0;
public decimal? QuantityDemand4 { get; set; } = 0;
[ExporterHeader(DisplayName = "第5天需求数量")]
public decimal QuantityDemand5 { get; set; } = 0;
public decimal? QuantityDemand5 { get; set; } = 0;
[ExporterHeader(DisplayName = "第6天需求数量")]
public decimal QuantityDemand6 { get; set; } = 0;
public decimal? QuantityDemand6 { get; set; } = 0;
[ExporterHeader(DisplayName = "第7天需求数量")]
public decimal QuantityDemand7 { get; set; } = 0;
public decimal? QuantityDemand7 { get; set; } = 0;
[ExporterHeader(DisplayName = "第8天需求数量")]
public decimal QuantityDemand8 { get; set; } = 0;
public decimal? QuantityDemand8 { get; set; } = 0;
[ExporterHeader(DisplayName = "第9天需求数量")]
public decimal QuantityDemand9 { get; set; } = 0;
public decimal? QuantityDemand9 { get; set; } = 0;
[ExporterHeader(DisplayName = "第10天需求数量")]
public decimal QuantityDemand10 { get; set; } = 0;
public decimal? QuantityDemand10 { get; set; } = 0;
[ExporterHeader(DisplayName = "第11天需求数量")]
public decimal QuantityDemand11 { get; set; } = 0;
public decimal? QuantityDemand11 { get; set; } = 0;
[ExporterHeader(DisplayName = "第12天需求数量")]
public decimal QuantityDemand12 { get; set; } = 0;
public decimal? QuantityDemand12 { get; set; } = 0;
[ExporterHeader(DisplayName = "第13天需求数量")]
public decimal QuantityDemand13 { get; set; } = 0;
public decimal? QuantityDemand13 { get; set; } = 0;
[ExporterHeader(DisplayName = "第14天需求数量")]
public decimal QuantityDemand14 { get; set; } = 0;
public decimal? QuantityDemand14 { get; set; } = 0;
[ExporterHeader(DisplayName = "第15天需求数量")]
public decimal QuantityDemand15 { get; set; } = 0;
public decimal? QuantityDemand15 { get; set; } = 0;
[ExporterHeader(DisplayName = "第16天需求数量")]
public decimal QuantityDemand16 { get; set; } = 0;
public decimal? QuantityDemand16 { get; set; } = 0;
[ExporterHeader(DisplayName = "第17天需求数量")]
public decimal QuantityDemand17 { get; set; } = 0;
public decimal? QuantityDemand17 { get; set; } = 0;
[ExporterHeader(DisplayName = "第18天需求数量")]
public decimal QuantityDemand18 { get; set; } = 0;
public decimal? QuantityDemand18 { get; set; } = 0;
[ExporterHeader(DisplayName = "第19天需求数量")]
public decimal QuantityDemand19 { get; set; } = 0;
public decimal? QuantityDemand19 { get; set; } = 0;
[ExporterHeader(DisplayName = "第20天需求数量")]
public decimal QuantityDemand20 { get; set; } = 0;
public decimal? QuantityDemand20 { get; set; } = 0;
[ExporterHeader(DisplayName = "第21天需求数量")]
public decimal QuantityDemand21 { get; set; } = 0;
public decimal? QuantityDemand21 { get; set; } = 0;
[ExporterHeader(DisplayName = "第22天需求数量")]
public decimal QuantityDemand22 { get; set; } = 0;
public decimal? QuantityDemand22 { get; set; } = 0;
[ExporterHeader(DisplayName = "第23天需求数量")]
public decimal QuantityDemand23 { get; set; } = 0;
public decimal? QuantityDemand23 { get; set; } = 0;
[ExporterHeader(DisplayName = "第24天需求数量")]
public decimal QuantityDemand24 { get; set; } = 0;
public decimal? QuantityDemand24 { get; set; } = 0;
[ExporterHeader(DisplayName = "第25天需求数量")]
public decimal QuantityDemand25 { get; set; } = 0;
public decimal? QuantityDemand25 { get; set; } = 0;
[ExporterHeader(DisplayName = "第26天需求数量")]
public decimal QuantityDemand26 { get; set; } = 0;
public decimal? QuantityDemand26 { get; set; } = 0;
[ExporterHeader(DisplayName = "第27天需求数量")]
public decimal QuantityDemand27 { get; set; } = 0;
public decimal? QuantityDemand27 { get; set; } = 0;
[ExporterHeader(DisplayName = "第28天需求数量")]
public decimal QuantityDemand28 { get; set; } = 0;
public decimal? QuantityDemand28 { get; set; } = 0;
[ExporterHeader(DisplayName = "第29天需求数量")]
public decimal QuantityDemand29 { get; set; } = 0;
public decimal? QuantityDemand29 { get; set; } = 0;
[ExporterHeader(DisplayName = "第30天需求数量")]
public decimal QuantityDemand30 { get; set; } = 0;
public decimal? QuantityDemand30 { get; set; } = 0;
[ExporterHeader(DisplayName = "第31天需求数量")]
public decimal QuantityDemand31 { get; set; } = 0;
public decimal? QuantityDemand31 { get; set; } = 0;
/// <summary>
/// 数据变更标识（1=更新需求，0=未变更）
@ -2749,91 +2749,91 @@ namespace TaskManager.Entity
/// 起始日期+2天的需求数量（以此类推）
/// </summary>
[ExporterHeader(DisplayName = "第3天需求数量")]
public decimal QuantityDemand3 { get; set; } = 0;
public decimal? QuantityDemand3 { get; set; } = 0;
[ExporterHeader(DisplayName = "第4天需求数量")]
public decimal QuantityDemand4 { get; set; } = 0;
public decimal? QuantityDemand4 { get; set; } = 0;
[ExporterHeader(DisplayName = "第5天需求数量")]
public decimal QuantityDemand5 { get; set; } = 0;
public decimal? QuantityDemand5 { get; set; } = 0;
[ExporterHeader(DisplayName = "第6天需求数量")]
public decimal QuantityDemand6 { get; set; } = 0;
public decimal? QuantityDemand6 { get; set; } = 0;
[ExporterHeader(DisplayName = "第7天需求数量")]
public decimal QuantityDemand7 { get; set; } = 0;
public decimal? QuantityDemand7 { get; set; } = 0;
[ExporterHeader(DisplayName = "第8天需求数量")]
public decimal QuantityDemand8 { get; set; } = 0;
public decimal? QuantityDemand8 { get; set; } = 0;
[ExporterHeader(DisplayName = "第9天需求数量")]
public decimal QuantityDemand9 { get; set; } = 0;
public decimal? QuantityDemand9 { get; set; } = 0;
[ExporterHeader(DisplayName = "第10天需求数量")]
public decimal QuantityDemand10 { get; set; } = 0;
public decimal? QuantityDemand10 { get; set; } = 0;
[ExporterHeader(DisplayName = "第11天需求数量")]
public decimal QuantityDemand11 { get; set; } = 0;
public decimal? QuantityDemand11 { get; set; } = 0;
[ExporterHeader(DisplayName = "第12天需求数量")]
public decimal QuantityDemand12 { get; set; } = 0;
public decimal? QuantityDemand12 { get; set; } = 0;
[ExporterHeader(DisplayName = "第13天需求数量")]
public decimal QuantityDemand13 { get; set; } = 0;
public decimal? QuantityDemand13 { get; set; } = 0;
[ExporterHeader(DisplayName = "第14天需求数量")]
public decimal QuantityDemand14 { get; set; } = 0;
public decimal? QuantityDemand14 { get; set; } = 0;
[ExporterHeader(DisplayName = "第15天需求数量")]
public decimal QuantityDemand15 { get; set; } = 0;
public decimal? QuantityDemand15 { get; set; } = 0;
[ExporterHeader(DisplayName = "第16天需求数量")]
public decimal QuantityDemand16 { get; set; } = 0;
public decimal? QuantityDemand16 { get; set; } = 0;
[ExporterHeader(DisplayName = "第17天需求数量")]
public decimal QuantityDemand17 { get; set; } = 0;
public decimal? QuantityDemand17 { get; set; } = 0;
[ExporterHeader(DisplayName = "第18天需求数量")]
public decimal QuantityDemand18 { get; set; } = 0;
public decimal? QuantityDemand18 { get; set; } = 0;
[ExporterHeader(DisplayName = "第19天需求数量")]
public decimal QuantityDemand19 { get; set; } = 0;
public decimal? QuantityDemand19 { get; set; } = 0;
[ExporterHeader(DisplayName = "第20天需求数量")]
public decimal QuantityDemand20 { get; set; } = 0;
public decimal? QuantityDemand20 { get; set; } = 0;
[ExporterHeader(DisplayName = "第21天需求数量")]
public decimal QuantityDemand21 { get; set; } = 0;
public decimal? QuantityDemand21 { get; set; } = 0;
[ExporterHeader(DisplayName = "第22天需求数量")]
public decimal QuantityDemand22 { get; set; } = 0;
public decimal? QuantityDemand22 { get; set; } = 0;
[ExporterHeader(DisplayName = "第23天需求数量")]
public decimal QuantityDemand23 { get; set; } = 0;
public decimal? QuantityDemand23 { get; set; } = 0;
[ExporterHeader(DisplayName = "第24天需求数量")]
public decimal QuantityDemand24 { get; set; } = 0;
public decimal? QuantityDemand24 { get; set; } = 0;
[ExporterHeader(DisplayName = "第25天需求数量")]
public decimal QuantityDemand25 { get; set; } = 0;
public decimal? QuantityDemand25 { get; set; } = 0;
[ExporterHeader(DisplayName = "第26天需求数量")]
public decimal QuantityDemand26 { get; set; } = 0;
public decimal? QuantityDemand26 { get; set; } = 0;
[ExporterHeader(DisplayName = "第27天需求数量")]
public decimal QuantityDemand27 { get; set; } = 0;
public decimal? QuantityDemand27 { get; set; } = 0;
[ExporterHeader(DisplayName = "第28天需求数量")]
public decimal QuantityDemand28 { get; set; } = 0;
public decimal? QuantityDemand28 { get; set; } = 0;
[ExporterHeader(DisplayName = "第29天需求数量")]
public decimal QuantityDemand29 { get; set; } = 0;
public decimal? QuantityDemand29 { get; set; } = 0;
[ExporterHeader(DisplayName = "第30天需求数量")]
public decimal QuantityDemand30 { get; set; } = 0;
public decimal? QuantityDemand30 { get; set; } = 0;
[ExporterHeader(DisplayName = "第31天需求数量")]
public decimal QuantityDemand31 { get; set; } = 0;
public decimal? QuantityDemand31 { get; set; } = 0;
/// <summary>
/// 数据变更标识（1=更新需求，0=未变更）

2
API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -3,7 +3,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl>
<History>True|2025-07-04T05:12:49.8129504Z||;True|2025-07-04T11:57:19.4307706+08:00||;True|2025-07-03T09:24:39.8368797+08:00||;True|2025-07-02T17:18:03.6042427+08:00||;True|2025-07-02T10:15:44.3531626+08:00||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History>
<History>True|2025-07-08T03:09:12.4661351Z||;True|2025-07-08T10:48:35.1871554+08:00||;False|2025-07-08T10:47:14.6770264+08:00||;True|2025-07-04T13:12:49.8129504+08:00||;True|2025-07-04T11:57:19.4307706+08:00||;True|2025-07-03T09:24:39.8368797+08:00||;True|2025-07-02T17:18:03.6042427+08:00||;True|2025-07-02T10:15:44.3531626+08:00||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

BIN
API/Wood.Admin.WebApi/wwwroot/logo_op.zip
View File

Binary file not shown.

2610
API/Wood.Admin.WebApi/日物料需求计划.json
View File

File diff suppressed because it is too large

6
API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
View File

@ -110,11 +110,13 @@ namespace TaskManager.Controllers
{
foreach (var itm in existList)
{
var uid = itm.UId;
var first = list.FirstOrDefault(p => p.Id == itm.Id);
if (first != null)
{
itm.InjectFrom(first);
}
itm.UId = uid;
}
}
else
@ -353,7 +355,7 @@ namespace TaskManager.Controllers
{
T entity = new T();
entity.InjectFrom(itm);
entity.CreationTime = DateTime.Now;
entity.CreationTime = DateTime.Parse(date);
pagefirstList.Add(entity);
entity.RequestDate = date;
allData.Add(itm);
@ -380,7 +382,7 @@ namespace TaskManager.Controllers
{
T entity = new T();
entity.InjectFrom(itm);
entity.CreationTime = DateTime.Now;
entity.CreationTime = DateTime.Parse(date);
entity.RequestDate = date;
pageList.Add(entity);
allData.Add(itm);

30
API/Wood.Service/Controllers/RecurringJobBaseController.cs
View File

@ -32,18 +32,10 @@ namespace TaskManager.Controllers
protected string appKey = "8EG566b9bedd2bf46d";
protected string appSecret = "48edc4425647425d87f806a1ba492580";
#else
protected string appKey = "8EG72d84c872668401";
protected string appSecret = "d092b9df0d504726a3790d7ad6172cc3";
#endif
protected readonly HttpClient _httpClient;
protected readonly JobDbContext _jobDbContext;
protected string Client { set; get; } = "Chery";
@ -51,12 +43,8 @@ namespace TaskManager.Controllers
protected string Url { set; get; } = "/v2/get/supplierProPlaning";
protected int CPageSize { set; get; } = 1000;
protected virtual string TaskName { set; get; } = "SupplierProPlaning";
protected readonly LogController _logger;
public RecurringJobBaseController(
HttpClient httpClient,
JobDbContext jobDbContext,
@ -96,8 +84,6 @@ namespace TaskManager.Controllers
await _logger.AddError($"请求数据不一致body:{jsonData},singed:{requestContent}", TaskName, taskid, version, jsonData);
}
request.Headers.Add("appKey", appKey);
request.Headers.Add("appSecret", appSecret);
request.Headers.Add("timestamp", timeStamp);
@ -122,15 +108,13 @@ namespace TaskManager.Controllers
//string jsonContent = System.IO.File.ReadAllText("日物料需求计划.json");
////string jsonContent = System.IO.File.ReadAllText("M+6月物料需求计划1.json");
//////string jsonContent = System.IO.File.ReadAllText("采购订单.json");
//////// string jsonContent = System.IO.File.ReadAllText("过焊装未过总装.json");
//////// string jsonContent = System.IO.File.ReadAllText("计划协议.json");
////////string jsonContent = System.IO.File.ReadAllText("奇瑞RDC共享库存.json");
////////string jsonContent4 = System.IO.File.ReadAllText("日MRP状态监控.json");
////////string jsonContent = System.IO.File.ReadAllText("整车月度生产计划1.json");
//////string jsonContent = System.IO.File.ReadAllText("过涂装未过总装.json");
////string jsonContent = System.IO.File.ReadAllText("采购订单.json");
////string jsonContent = System.IO.File.ReadAllText("过焊装未过总装.json");
////string jsonContent = System.IO.File.ReadAllText("计划协议.json");
////string jsonContent = System.IO.File.ReadAllText("奇瑞RDC共享库存.json");
////string jsonContent4 = System.IO.File.ReadAllText("日MRP状态监控.json");
////string jsonContent = System.IO.File.ReadAllText("整车月度生产计划1.json");
////string jsonContent = System.IO.File.ReadAllText("过涂装未过总装.json");
//return jsonContent;

Write Preview
Loading…
Cancel
Save