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

Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/QRAPI

master
me 1 week ago
parent
c0f4da14e9 eccb6bbc2d
commit
d13d10a7ed
5 changed files with 54 additions and 51 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. 4
      API/Wood.Service/Controllers/CheryRecurringJobBaseController.cs
  2. 2
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  3. 5
      API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
  4. 3
      API/Wood.Service/Controllers/CherySupplierConMmrpService.cs
  5. 91
      API/Wood.Service/Controllers/TaskSubService.cs

4
API/Wood.Service/Controllers/CheryRecurringJobBaseController.cs
View File

@ -30,6 +30,10 @@ namespace TaskManager.Controllers
protected string appSecret = "48edc4425647425d87f806a1ba492580";
protected readonly HttpClient _httpClient;
protected readonly JobDbContext _jobDbContext;
public virtual int PageSizeOut { set; get; } = 50;
public virtual int PageSizeIn { set; get; } = 50;
protected string Client { set; get; } = "Chery";
protected string Path { set; get; } = "/v2/get/supplierProPlaning";
protected string Url { set; get; } = "/v2/get/supplierProPlaning";

2
API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
View File

@ -151,7 +151,7 @@ namespace TaskManager.Controllers
return;
}
var sublist = _jobDbContext.TaskSub.Where(p => taskName.Contains(p.TaskName) && p.WriteState == false && p.Subscriber == client ).ToList();
int pageSize = 1000;
int pageSize = ;
if (!sublist.Any())
{
foreach (var sub in sublist)

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

@ -139,6 +139,9 @@ namespace TaskManager.Controllers
for (currentPage = 2; currentPage <= totalPages; currentPage++)
{
PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, IsForce = false };
Console.WriteLine($"正在请求第 {currentPage} 页...");
PagedResponse<ToutputDetial> pageResponse = await GetPageAsync(pageinput);
if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0)
@ -241,7 +244,7 @@ namespace TaskManager.Controllers
for (currentPage = 2; currentPage <= totalPages; currentPage++)
{
PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, IsForce = true };
Console.WriteLine($"正在请求第 {currentPage} 页...");
//Console.WriteLine($"正在请求第 {currentPage} 页...");
PagedResponse<ToutputDetial> pageResponse = await GetPageAsync(pageinput);
if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0)
{

3
API/Wood.Service/Controllers/CherySupplierConMmrpService.cs
View File

@ -50,8 +50,9 @@ namespace TaskManager.Controllers
});
using (var transaction = await _jobDbContext.Database.BeginTransactionAsync())
using (var transaction = await _jobDbContext.Database.BeginTransactionAsync(System.Data.IsolationLevel.ReadUncommitted))
{
var tran = transaction.GetDbTransaction();
try
{

91
API/Wood.Service/Controllers/TaskSubService.cs
View File

@ -39,25 +39,20 @@ namespace Wood.Service.Controllers
// return result.Value;
//}
[HttpGet]
[HttpPost]
public async Task<ActionResult> GetDetail([FromBody] RequestInputBase requestInputBase)
{
var taskid = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TaskId").Value;
var tablename = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName").Value;
switch (tablename)
{
case "SUPPLIER_PRO_MATERIAL_STOCK":
var stockservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(stocktask);
var stockresult = await stockservice.GetDataPaged(requestInputBase);
return Ok(stockresult.Value);
case "SUPPLIER_PRO_SCHEDULING":
var schedservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
@ -127,49 +122,49 @@ namespace Wood.Service.Controllers
requestInputBase.Condition.Filters.Remove(flawtask);
var flawresult = await flawservice.GetDataPaged(requestInputBase);
return Ok(flawresult.Value);
case "SUPPLIER_PRO_ENVIRONMENT":
var envservice = _builder.GetRequiredService<CherySupplierProEnvironmentService>();
var envtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(envtask);
var envresult = await envservice.GetDataPaged(requestInputBase);
return Ok(envresult.Value);
case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
var rateservice = _builder.GetRequiredService<CherySupplierProOeeAchievementRateService>();
var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(ratetask);
var rateresult = await rateservice.GetDataPaged(requestInputBase);
return Ok(rateresult.Value);
case "SUPPLIER_PRO_OEE_TIME_DETAILS":
var detailservice = _builder.GetRequiredService<CherySupplierProOeeTimeDetailsService>();
var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(detailtask);
var detailresult = await detailservice.GetDataPaged(requestInputBase);
return Ok(detailresult.Value);
case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
var materialservice = _builder.GetRequiredService<CherySupplierProMaterialDataService>();
var materialtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(materialtask);
var materialresult = await materialservice.GetDataPaged(requestInputBase);
return Ok(materialresult.Value);
case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
var eqservice = _builder.GetRequiredService<CherySupplierProProcessEquipmentService>();
var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(eqtask);
var eqresult = await eqservice.GetDataPaged(requestInputBase);
return Ok(eqresult.Value);
//case "SUPPLIER_PRO_ENVIRONMENT":
// var dataservice = _builder.GetRequiredService<envir>();
// var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
// requestInputBase.Condition.Filters.Remove(datatask);
// var dataresult = await dataservice.GetDataPaged(requestInputBase);
// return Ok(dataresult.Value);
//case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
// var rateservice = _builder.GetRequiredService<>();
// var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
// requestInputBase.Condition.Filters.Remove(datatask);
// var tateresult = await dataservice.GetDataPaged(requestInputBase);
// return Ok(dataresult.Value);
// break;
//case "SUPPLIER_PRO_OEE_TIME_DETAILS":
// var detailservice = _builder.GetRequiredService<>();
// var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
// requestInputBase.Condition.Filters.Remove(datatask);
// var detailresult = await dataservice.GetDataPaged(requestInputBase);
// return Ok(dataresult.Value);
// break;
//case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
// var dataservice = _builder.GetRequiredService<>();
// var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
// requestInputBase.Condition.Filters.Remove(datatask);
// var dataresult = await dataservice.GetDataPaged(requestInputBase);
// return Ok(dataresult.Value);
// break;
//case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
// var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
// var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
// requestInputBase.Condition.Filters.Remove(datatask);
// var dataresult = await dataservice.GetDataPaged(requestInputBase);
// return Ok(dataresult.Value);
// break;
//case "SUPPLIER_PRO_PROCESS"://工艺
// var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>();
// var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
// requestInputBase.Condition.Filters.Remove(datatask);
// var dataresult = await dataservice.GetDataPaged(requestInputBase);
// return Ok(dataresult.Value);
// break;
case "SUPPLIER_PRO_PROCESS"://工艺
var processservice = _builder.GetRequiredService<CherySupplierProProcessService>();
var processtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(processtask);
var processresult = await processservice.GetDataPaged(requestInputBase);
return Ok(processresult.Value);

Write Preview
Loading…
Cancel
Save