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
赵新宇 1 week ago
parent
723aadf2b5 8d6d2e31b9
commit
c54deaff5e
3 changed files with 88 additions and 47 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. 32
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  2. 10
      API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
  3. 91
      API/Wood.Service/Controllers/TaskSubService.cs

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

@ -19,6 +19,7 @@ using TaskManager.Contracts.Dtos;
using TaskManager.Entity;
using TaskManager.EntityFramework;
using TaskManager.EntityFramework.Repository;
using Wood.Util;
using Wood.Util.Filters;
using static Dapper.SqlMapper;
@ -242,14 +243,19 @@ namespace TaskManager.Controllers
[HttpPut("{id}")]
public async Task<IActionResult> Update(T entity)
{
if (entity.UId == 0)
{
throw new Exception("更新时，实体主键UId不能为空或0");
}
var _first = await _repository.GetByIdAsync(entity.UId);
if (_first == null)
{
throw new Exception($"CheryRecurringJobInputPageController.Update报错：根据UId{entity.UId}没有找到记录");
return new JsonResult(new { Code = 400, Message = "修改失败!" });
}
EntityMapper.Trans(_first, entity, "UId");
await _repository.UpdateAsync(entity);
await _repository.UpdateAsync(_first);
return new JsonResult(new { Code = 200, Message = "修改成功!" });
}
@ -311,6 +317,28 @@ namespace TaskManager.Controllers
return Ok(pagedResult);
}
public async Task<PagedResult<T>> GetTaskDataPaged(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>
/// 导出New
/// </summary>

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

@ -21,6 +21,7 @@ using TaskManager.Controllers;
using TaskManager.Entity;
using TaskManager.EntityFramework;
using TaskManager.EntityFramework.Repository;
using Wood.Util;
using Wood.Util.Filters;
namespace TaskManager.Controllers
@ -403,14 +404,19 @@ namespace TaskManager.Controllers
[HttpPut("{id}")]
public async Task<IActionResult> Update(T entity)
{
if (entity.UId == 0)
{
throw new Exception("更新时，实体主键UId不能为空或0");
}
var _first = await _repository.GetByIdAsync(entity.UId);
if (_first == null)
{
throw new Exception($"CheryRecurringJobOutPageController.Update报错：根据UId{entity.UId}没有找到记录");
return new JsonResult(new { Code = 400, Message = "修改失败!" });
}
EntityMapper.Trans(_first, entity, "UId");
await _repository.UpdateAsync(entity);
await _repository.UpdateAsync(_first);
return new JsonResult(new { Code = 200, Message = "修改成功!" });
}
/// <summary>

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

@ -54,34 +54,34 @@ namespace Wood.Service.Controllers
var tablename = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName").Value;
switch (tablename)
{
case "SUPPLIER_PRO_MATERIAL_STOCK":
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 stockresult = await stockservice.GetTaskDataPaged(requestInputBase);
return Ok(stockresult);
case "SUPPLIER_PRO_SCHEDULING"://排产数据
var schedservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
var schedtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(schedtask);
var schedresult = await schedservice.GetDataPaged(requestInputBase);
return Ok(schedresult.Value);
var schedresult = await schedservice.GetTaskDataPaged(requestInputBase);
return Ok(schedresult);
case "SUPPLIER_INFO":
case "SUPPLIER_INFO"://供应商基础信息
var infoservice = _builder.GetRequiredService<CherySupplierInfoService>();
var infotask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(infotask);
var inforesult = await infoservice.GetDataPaged(requestInputBase);
return Ok(inforesult.Value);
var inforesult = await infoservice.GetTaskDataPaged(requestInputBase);
return Ok(inforesult);
case "SUPPLIER_EMPLOYEE"://人员资质信息
var emplyeeservice = _builder.GetRequiredService<CherySupplierEmployeeService>();
var emplyeetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(emplyeetask);
var emplyeeresult = await emplyeeservice.GetDataPaged(requestInputBase);
return Ok(emplyeeresult.Value);
var emplyeeresult = await emplyeeservice.GetTaskDataPaged(requestInputBase);
return Ok(emplyeeresult);
case "SUPPLIER_BOM"://BOM主数据
@ -89,88 +89,95 @@ namespace Wood.Service.Controllers
var bomservice = _builder.GetRequiredService<CherySupplierBomService>();
var bomtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(bomtask);
var bomresult = await bomservice.GetDataPaged(requestInputBase);
return Ok(bomresult.Value);
var bomresult = await bomservice.GetTaskDataPaged(requestInputBase);
return Ok(bomresult);
case "SUPPLIER_PRO_CPS"://过程控制项质量数据
var cpsservice = _builder.GetRequiredService<CherySupplierProCpsService>();
var cpstask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(cpstask);
var result = await cpsservice.GetDataPaged(requestInputBase);
return Ok(result.Value);
var cpsresult = await cpsservice.GetTaskDataPaged(requestInputBase);
return Ok(cpsresult);
case "SUPPLIER_PRO_DATA":
case "SUPPLIER_PRO_DATA"://生产过程数据
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);
var dataresult = await dataservice.GetTaskDataPaged(requestInputBase);
return Ok(dataresult);
case "SUPPLIER_PRO_FIRST_PASSYIELD":
case "SUPPLIER_PRO_FIRST_PASSYIELD"://产品一次合格率
var passyieldservice = _builder.GetRequiredService<CherySupplierProFirstPassyieldService>();
var passyieldtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(passyieldtask);
var passyieldresult = await passyieldservice.GetDataPaged(requestInputBase);
return Ok(passyieldresult.Value);
var passyieldresult = await passyieldservice.GetTaskDataPaged(requestInputBase);
return Ok(passyieldresult);
case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD":
case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD"://工位一次合格率
var pasyservice = _builder.GetRequiredService<CherySupplierProStationFirstPassyieldService>();
var pasytask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(pasytask);
var pasyresult = await pasyservice.GetDataPaged(requestInputBase);
return Ok(pasyresult.Value);
var pasyresult = await pasyservice.GetTaskDataPaged(requestInputBase);
return Ok(pasyresult);
case "SUPPLIER_PRO_FLAW":
case "SUPPLIER_PRO_FLAW"://缺陷业务数据
var flawservice = _builder.GetRequiredService<CherySupplierProFlawService>();
var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(flawtask);
var flawresult = await flawservice.GetDataPaged(requestInputBase);
return Ok(flawresult.Value);
var flawresult = await flawservice.GetTaskDataPaged(requestInputBase);
return Ok(flawresult);
case "SUPPLIER_PRO_ENVIRONMENT":
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);
var envresult = await envservice.GetTaskDataPaged(requestInputBase);
return Ok(envresult);
case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE"://设备OEE达成率
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);
var rateresult = await rateservice.GetTaskDataPaged(requestInputBase);
return Ok(rateresult);
case "SUPPLIER_PRO_OEE_TIME_DETAILS":
case "SUPPLIER_PRO_OEE_TIME_DETAILS"://OEE时间明细
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);
var detailresult = await detailservice.GetTaskDataPaged(requestInputBase);
return Ok(detailresult);
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);
var materialresult = await materialservice.GetTaskDataPaged(requestInputBase);
return Ok(materialresult);
case "SUPPLIER_PRO_ATTACHMENT_DATA":// 附件类数据
var attachment_dataservice = _builder.GetRequiredService<CherySupplierProAttachmentDataService>();
var attachment_datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(attachment_datatask);
var attachment_dataresult = await attachment_dataservice.GetTaskDataPaged(requestInputBase);
return Ok(attachment_dataresult);
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);
var eqresult = await eqservice.GetTaskDataPaged(requestInputBase);
return Ok(eqresult);
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);
var processresult = await processservice.GetTaskDataPaged(requestInputBase);
return Ok(processresult);

Write Preview
Loading…
Cancel
Save