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

更新版本

master
赵新宇 6 days ago
parent
4402953bfe
commit
41caa71d3b
10 changed files with 253 additions and 127 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. 21
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  2. 20
      API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs
  3. 4
      API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
  4. 1
      API/Wood.Service/Controllers/CherySupplierConDateService.cs
  5. 267
      API/Wood.Service/Controllers/CustomLogService.cs
  6. 19
      API/Wood.Service/Controllers/LogServices/CherySupplierSaWeekService.cs
  7. 17
      API/Wood.Service/Controllers/LogServices/CherySupplierSinvDataService.cs
  8. 23
      API/Wood.Service/Controllers/NormalBaseController.cs
  9. 6
      API/Wood.Service/Controllers/RecurringJobBaseController.cs
  10. 2
      API/Wood.Service/Controllers/TaskConifgureController.cs

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

@ -81,7 +81,28 @@ namespace TaskManager.Controllers
//await SyncTaskSubTable(TaskName, Client);
}
[HttpPost]
public async Task<PagedResult<T>> GetLogDataPaged(RequestInputBase input)
{
var pagingParams = new PagingParams
{
PageNumber = input.pageNumber,
PageSize = input.pageSize,
SortBy = input.sortBy,
IsAscending = input.isAscending,
};
//var json = JsonSerializer.Serialize(input);
// 可以在这里构建表达式树过滤条件
Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetDataPagedAsync(filter, pagingParams, input.Condition);
return pagedResult;
}
protected override async Task DoExecutingAsync(string url, string path, string takName, string client, int pagesize)
{

20
API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs
View File

@ -88,8 +88,28 @@ namespace TaskManager.Controllers
public async Task SyncTaskSubTable()
{
}
[HttpPost]
public async Task<PagedResult<T>> GetLogDataPaged(RequestInputBase input)
{
var pagingParams = new PagingParams
{
PageNumber = input.pageNumber,
PageSize = input.pageSize,
SortBy = input.sortBy,
IsAscending = input.isAscending,
};
//var json = JsonSerializer.Serialize(input);
// 可以在这里构建表达式树过滤条件
Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetDataPagedAsync(filter, pagingParams, input.Condition);
return pagedResult;
}

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

@ -491,7 +491,7 @@ namespace TaskManager.Controllers
return Ok(pagedResult);
}
[HttpPost]
public async Task<PagedResult<T>> GetLogDataPaged(RequestInputBase input)
{
@ -504,7 +504,7 @@ namespace TaskManager.Controllers
};
var json = JsonSerializer.Serialize(input);
//var json = JsonSerializer.Serialize(input);

1
API/Wood.Service/Controllers/CherySupplierConDateService.cs
View File

@ -68,6 +68,7 @@ namespace TaskManager.Controllers
task.CreateUser = "admin";
task.CreationTime = DateTime.Now;
task.SyncedPageCount = 0;
task.ReadState = true;
entites.ForEach(p =>
{
p.ReadState = true;

267
API/Wood.Service/Controllers/CustomLogService.cs
View File

@ -2,9 +2,12 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Numeric;
using System;
using System.Collections.Generic;
using System.Drawing.Printing;
using System.Linq;
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
using TaskManager.Controllers;
@ -45,7 +48,7 @@ namespace Wood.Service.Controllers
}
return new JsonResult(new { Code = 400, Message = "没找到文件!" });
}
[HttpGet]
[HttpPost]
public async Task<IActionResult> GetLogReponseList([FromBody] RequestInputBase requestInputBase)
{
var uid = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "Uid").Value;
@ -53,178 +56,198 @@ namespace Wood.Service.Controllers
var first = _context.TaskLogs.FirstOrDefault(x => x.UId == long.Parse(uid));
switch (first.TaskName)
{
//case "来料检验数据":
// var stockservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
// requestInputBase.Condition.Filters.Add(new Filter());
// var stockresult = await stockservice.GetTaskDataPaged(requestInputBase);
//
// break;
//case "排产数据":
//
// break;
//case "供应商基础信息":
//
// break;
//case "人员资质信息":
//
// break;
//case "BOM主数据":
//
// break;
//case "过程控制项质量数据":
//
// break;
//case "生产过程数据":
//
// break;
//case "产品一次合格率":
//
// break;
//case "工位一次合格率":
//
// break;
//case "缺陷业务数据":
//
// break;
//case "环境业务数据":
//
// break;
//case "设备OEE达成率":
//
// break;
//case "OEE时间明细":
//
// break;
//case "物料主数据":
//
// break;
//case "工艺装备":
//
// break;
//case "工艺":
//
//break;
//case "M+6月物料需求计划风险确认":
// break;
//case "日物料需求计划风险确认":
// break;
//case "采购订单风险确认":
// break;
//case "供应商共享库存-上午":
// break;
//case "供应商共享库存-晚上":
// break;
case "来料检验数据":
var stockService = _builder.GetRequiredService<SupplierProMaterialStockService>();
requestInputBase.Condition.Filters.Add(new Filter());
var stockResult = await stockService.GetTaskDataPaged(requestInputBase);
return Ok(stockResult);
case "排产数据":
var schedulingService = _builder.GetRequiredService<CherySupplierProSchedulingService>();
var schedulingResult = await schedulingService.GetLogDataPaged(requestInputBase);
return Ok(schedulingResult);
case "供应商基础信息":
var supplierInfoService = _builder.GetRequiredService<CherySupplierInfoService>();
var supplierInfoResult = await supplierInfoService.GetLogDataPaged(requestInputBase);
return Ok(supplierInfoResult);
case "人员资质信息":
var employeeService = _builder.GetRequiredService<CherySupplierEmployeeService>();
var employeeResult = await employeeService.GetLogDataPaged(requestInputBase);
return Ok(employeeResult);
case "BOM主数据":
var bomService = _builder.GetRequiredService<CherySupplierBomService>();
var bomResult = await bomService.GetLogDataPaged(requestInputBase);
return Ok(bomResult);
case "过程控制项质量数据":
var cpsService = _builder.GetRequiredService<CherySupplierProCpsService>();
var cpsResult = await cpsService.GetLogDataPaged(requestInputBase);
return Ok(cpsResult);
case "生产过程数据":
var proDataService = _builder.GetRequiredService<CherySupplierProDataService>();
var proDataResult = await proDataService.GetLogDataPaged(requestInputBase);
return Ok(proDataResult);
case "产品一次合格率":
var firstPassYieldService = _builder.GetRequiredService<CherySupplierProFirstPassyieldService>();
var firstPassYieldResult = await firstPassYieldService.GetLogDataPaged(requestInputBase);
return Ok(firstPassYieldResult);
case "工位一次合格率":
var stationFirstPassYieldService = _builder.GetRequiredService<CherySupplierProStationFirstPassyieldService>();
var stationFirstPassYieldResult = await stationFirstPassYieldService.GetLogDataPaged(requestInputBase);
return Ok(stationFirstPassYieldResult);
case "缺陷业务数据":
var flawService = _builder.GetRequiredService<CherySupplierProFlawService>();
var flawResult = await flawService.GetLogDataPaged(requestInputBase);
return Ok(flawResult);
case "环境业务数据":
var environmentService = _builder.GetRequiredService<CherySupplierProEnvironmentService>();
var environmentResult = await environmentService.GetLogDataPaged(requestInputBase);
return Ok(environmentResult);
case "设备OEE达成率":
var oeeAchievementRateService = _builder.GetRequiredService<CherySupplierProOeeAchievementRateService>();
var oeeAchievementRateResult = await oeeAchievementRateService.GetLogDataPaged(requestInputBase);
return Ok(oeeAchievementRateResult);
case "OEE时间明细":
var oeeTimeDetailsService = _builder.GetRequiredService<CherySupplierProOeeTimeDetailsService>();
var oeeTimeDetailsResult = await oeeTimeDetailsService.GetLogDataPaged(requestInputBase);
return Ok(oeeTimeDetailsResult);
case "物料主数据":
var materialDataService = _builder.GetRequiredService<CherySupplierProMaterialDataService>();
var materialDataResult = await materialDataService.GetLogDataPaged(requestInputBase);
return Ok(materialDataResult);
case "附件类数据":
var attachmentDataService = _builder.GetRequiredService<CherySupplierProAttachmentDataService>();
var attachmentDataResult = await attachmentDataService.GetLogDataPaged(requestInputBase);
return Ok(attachmentDataResult);
case "工艺装备":
var processEquipmentService = _builder.GetRequiredService<CherySupplierProProcessEquipmentService>();
var processEquipmentResult = await processEquipmentService.GetLogDataPaged(requestInputBase);
return Ok(processEquipmentResult);
case "工艺":
var processService = _builder.GetRequiredService<CherySupplierProProcessService>();
var processResult = await processService.GetLogDataPaged(requestInputBase);
return Ok(processResult);
case "M+6月物料需求计划风险确认":
var m6RiskService = _builder.GetRequiredService<CherySupplierProSchedulingService>(); // 假设此业务仍使用排产服务
var m6RiskResult = await m6RiskService.GetLogDataPaged(requestInputBase);
return Ok(m6RiskResult);
case "日物料需求计划风险确认":
var dailyRiskService = _builder.GetRequiredService<CherySupplierProSchedulingService>(); // 假设此业务仍使用排产服务
var dailyRiskResult = await dailyRiskService.GetLogDataPaged(requestInputBase);
return Ok(dailyRiskResult);
case "采购订单风险确认":
var purchaseOrderRiskService = _builder.GetRequiredService<CherySupplierProSchedulingService>(); // 假设此业务仍使用排产服务
var purchaseOrderRiskResult = await purchaseOrderRiskService.GetLogDataPaged(requestInputBase);
return Ok(purchaseOrderRiskResult);
case "供应商共享库存-上午":
var morningStockService = _builder.GetRequiredService<CherySupplierProSchedulingService>(); // 假设此业务仍使用排产服务
var morningStockResult = await morningStockService.GetLogDataPaged(requestInputBase);
return Ok(morningStockResult);
case "供应商共享库存-晚上":
var eveningStockService = _builder.GetRequiredService<CherySupplierProSchedulingService>(); // 假设此业务仍使用排产服务
var eveningStockResult = await eveningStockService.GetLogDataPaged(requestInputBase);
return Ok(eveningStockResult);
case "整车月度生产计划1":
var service1 = _builder.GetRequiredService<SupplierProPlaningService>();
var service1 = _builder.GetRequiredService<SupplierProPlaningLogService>();
var result1 = await service1.GetLogDataPaged(requestInputBase);
return Ok(result1);
break;
case "M+6月物料需求计划1":
var service2 = _builder.GetRequiredService<CherySupplierMrpMonthService>();
var service2 = _builder.GetRequiredService<CherySupplierMrpMonthLogService>();
var result2 = await service2.GetLogDataPaged(requestInputBase);
return Ok(result2);
break;
case "整车月度生产计划2":
var service3 = _builder.GetRequiredService<SupplierProPlaningService>();
var service3 = _builder.GetRequiredService<SupplierProPlaningLogService>();
var result3= await service3.GetLogDataPaged(requestInputBase);
return Ok(result3);
break;
case "M+6月物料需求计划2":
var service4 = _builder.GetRequiredService<CherySupplierMrpMonthService>();
var service4 = _builder.GetRequiredService<CherySupplierMrpMonthLogService>();
var result4= await service4.GetLogDataPaged(requestInputBase);
return Ok(result4);
break;
case "日物料需求计划":
var service5 = _builder.GetRequiredService<CherySupplierMrpDataService>();
var service5 = _builder.GetRequiredService<CherySupplierMrpDatalogService>();
var result5 = await service5.GetLogDataPaged(requestInputBase);
return Ok(result5);
break;
case "计划协议":
var service6 = _builder.GetRequiredService<CherySupplierSaWeekService>();
var service6 = _builder.GetRequiredService<CherySupplierSaWeekLogService>();
var result6 = await service6.GetLogDataPaged(requestInputBase);
return Ok(result6);
break;
case "采购订单":
var service7 = _builder.GetRequiredService<CherySupplierPoService>();
var service7 = _builder.GetRequiredService<CherySupplierPoLogService>();
var result7 = await service7.GetLogDataPaged(requestInputBase);
return Ok(result7);
break;
case "过焊装未过总装":
var service8 = _builder.GetRequiredService<CherySupplierPorHSCHEDULService>();
var service8 = _builder.GetRequiredService<CherySupplierPorHSCHEDULLogService>();
var result8 = await service8.GetLogDataPaged(requestInputBase);
return Ok(result8);
break;
case "过涂装未过总装":
var service9 = _builder.GetRequiredService<CherySupplierProTSCHEDULService>();
var service9 = _builder.GetRequiredService<CherySupplierProTSCHEDULLogService>();
var result9 = await service9.GetLogDataPaged(requestInputBase);
return Ok(result9);
break;
case "排序供货":
var service10 = _builder.GetRequiredService<CherySupplierProCSCHEDULService>();
var service10 = _builder.GetRequiredService<CherySupplierProCSCHEDULLogService>();
var result10 = await service10.GetLogDataPaged(requestInputBase);
return Ok(result10);
break;
case "看板配送单":
var service11 = _builder.GetRequiredService<CherySupplierDelStateService>();
var service11 = _builder.GetRequiredService<CherySupplierDelStateLogService>();
var result11 = await service11.GetLogDataPaged(requestInputBase);
return Ok(result11);
break;
case "退货单":
var service12 = _builder.GetRequiredService<CherySupplierReturnService>();
var service12 = _builder.GetRequiredService<CherySupplierReturnLogService>();
var result12 = await service12.GetLogDataPaged(requestInputBase);
return Ok(result12);
break;
case "奇瑞RDC共享库存":
var service13 = _builder.GetRequiredService<SupplierInvDataService>();
var service13 = _builder.GetRequiredService<SupplierInvDataLogService>();
var result13 = await service13.GetLogDataPaged(requestInputBase);
return Ok(result13);
break;
case "日MRP状态监控":
var service14 = _builder.GetRequiredService<CherySupplierMrpService>();
var service14 = _builder.GetRequiredService<CherySupplierMrpLogService>();
var result14 = await service14.GetLogDataPaged(requestInputBase);
return Ok(result14);
break;
case "日MRP预警推移":
var service15 = _builder.GetRequiredService<CherySupplierMrpWarningService>();
var service15 = _builder.GetRequiredService<CherySupplierMrpWarningLogService>();
var result15 = await service15.GetLogDataPaged(requestInputBase);
return Ok(result15);
break;
}

19
API/Wood.Service/Controllers/LogServices/CherySupplierSaWeekService.cs
View File

@ -0,0 +1,19 @@
using Microsoft.Extensions.Configuration;
using TaskManager.Contracts.Dtos;
using TaskManager.Controllers;
using TaskManager.Entity;
using TaskManager.EntityFramework;
using Wood.Service.Controllers;
namespace TaskManager.Controllers
{
/// <summary>
/// 计划协议
/// </summary>
public class CherySupplierSaWeekLogService : NormalBaseController<SUPPLIER_SA_WEEK_LOGS>
{
public CherySupplierSaWeekLogService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_SA_WEEK_LOGS> repository) : base(context, builder, configuration, repository)
{
}
}
}

17
API/Wood.Service/Controllers/LogServices/CherySupplierSinvDataService.cs
View File

@ -0,0 +1,17 @@
using Microsoft.Extensions.Configuration;
using TaskManager.Contracts.Dtos;
using TaskManager.Controllers;
using TaskManager.Entity;
using TaskManager.Entity.Entitys;
using TaskManager.EntityFramework;
using Wood.Service.Controllers;
namespace TaskManager.Controllers
{
public class CherySupplierSinvDataLogService : NormalBaseController<SUPPLIER_SINV_DATA_LOGS>
{
public CherySupplierSinvDataLogService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<SUPPLIER_SINV_DATA_LOGS> repository) : base(context, builder, configuration, repository)
{
}
}
}

23
API/Wood.Service/Controllers/NormalBaseController.cs
View File

@ -350,6 +350,29 @@ namespace Wood.Service.Controllers
{
}
[HttpPost]
public async Task<PagedResult<T>> GetLogDataPaged(RequestInputBase input)
{
var pagingParams = new PagingParams
{
PageNumber = input.pageNumber,
PageSize = input.pageSize,
SortBy = input.sortBy,
IsAscending = input.isAscending,
};
//var json = JsonSerializer.Serialize(input);
// 可以在这里构建表达式树过滤条件
Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetDataPagedAsync(filter, pagingParams, input.Condition);
return pagedResult;
}
/// <summary>
/// 高级查询字段

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

@ -101,14 +101,16 @@ namespace TaskManager.Controllers
return string.Empty;
}
////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("日物料需求计划.json");
//////string jsonContent = System.IO.File.ReadAllText("整车月度生产计划1.json");
//string jsonContent = System.IO.File.ReadAllText("M+6月物料需求计划1.json");
////string jsonContent = System.IO.File.ReadAllText("过涂装未过总装.json");
// return jsonContent;

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

@ -173,7 +173,7 @@ namespace TaskManager.Controllers
switch (task.TaskName)
{
case "来料检验数据":
RecurringJob.AddOrUpdate<SupplierProMaterialStockLogService>(
RecurringJob.AddOrUpdate<SupplierProMaterialStockService>(
task.TaskName,
x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client,pagesize),
task.Corn,

Write Preview
Loading…
Cancel
Save