me 4 weeks ago
parent
commit
f1a287e089
  1. 67
      API/TaskManager.Entity/Entity.cs
  2. 4
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs
  3. 8
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs
  4. 4
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs
  5. 0
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_ATTACHMENT_DATA.cs
  6. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs
  7. 10
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs
  8. 0
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_ENVIRONMENT.cs
  9. 6
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs
  10. 0
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FLAW.cs
  11. 0
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_DATA.cs
  12. 6
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs
  13. 0
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE.cs
  14. 0
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_OEE_TIME_DETAILS.cs
  15. 0
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_PROCESS.cs
  16. 0
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_PROCESS_EQUIPMENT.cs
  17. 10
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs
  18. 6
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs
  19. 111
      API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs
  20. 4
      API/TaskManager.Entity/TaskManager.Entity.csproj
  21. 1
      API/TaskManager.EntityFramework/JobDbContext.cs
  22. 3
      API/Wood.Admin.WebApi/Startup.cs
  23. 2
      API/Wood.Admin.WebApi/appsettings.json
  24. 2
      API/Wood.Service/Controllers/RecurringJobBaseController.cs
  25. 43
      API/Wood.Service/Controllers/RecurringJobOutPageController.cs
  26. 43
      API/Wood.Service/Controllers/TaskConifgureController.cs

67
API/TaskManager.Entity/Entity.cs

@ -74,72 +74,7 @@ namespace TaskManager.Entity
}
/// <summary>
/// 来料检验数据
/// </summary>
public class SUPPLIER_PRO_MATERIAL_STOCK:BaseEntity
{
}
/// <summary>
/// 排产数据
/// </summary>
public class SUPPLIER_PRO_SCHEDULING : BaseEntity
{
}
/// <summary>
/// 供应商基础信息
/// </summary>
public class SUPPLIER_INFO : BaseEntity
{
}
/// <summary>
/// 人员资质信息
/// </summary>
public class SUPPLIER_EMPLOYEE : BaseEntity
{
}
/// <summary>
/// BOM主数据
/// </summary>
public class SUPPLIER_BOM : BaseEntity
{
}
/// <summary>
/// 过程控制项质量数据
/// </summary>
public class SUPPLIER_PRO_CPS : BaseEntity
{
}
/// <summary>
/// 生产过程数据
/// </summary>
public class SUPPLIER_PRO_DATA : BaseEntity
{
}
/// <summary>
/// 产品一次合格率
/// </summary>
public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity
{
}
/// <summary>
/// 工位一次合格率
/// </summary>
//public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity
//{
//}
/// <summary>
/// 缺陷业务数据

4
API/TaskManager.Entity/Entitys/01_09/SupplierBom.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// BOM主数据
/// </summary>
public class SupplierBom
public class SUPPLIER_BOM : BaseEntity
{
/// <summary>
/// 供应商代码
@ -94,6 +94,6 @@ namespace TaskManager.Entity
/// <summary>
/// BOM变更时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime DataUpdateTime { get; set; }
public string DataUpdateTime { get; set; }
}
}

8
API/TaskManager.Entity/Entitys/01_09/SupplierEmployee.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// 人员资质信息
/// </summary>
public class SupplierEmployee
public class SUPPLIER_EMPLOYEE : BaseEntity
{
/// <summary>
/// 供应商代码
@ -79,7 +79,7 @@ namespace TaskManager.Entity
/// <summary>
/// 供应商修改时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime DataUpdateTime { get; set; }
public string DataUpdateTime { get; set; }
/// <summary>
/// 岗位代码
@ -99,11 +99,11 @@ namespace TaskManager.Entity
/// <summary>
/// 资质获取时间
/// </summary>
public DateTime CheckInTime { get; set; }
public string CheckInTime { get; set; }
/// <summary>
/// 资质失去时间
/// </summary>
public DateTime CheckOutTime { get; set; }
public string CheckOutTime { get; set; }
}
}

4
API/TaskManager.Entity/Entitys/01_09/SupplierInfo.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// 供应商基础信息
/// </summary>
public class SupplierInfo
public class SUPPLIER_INFO : BaseEntity
{
/// <summary>
/// 供应商代码
@ -69,7 +69,7 @@ namespace TaskManager.Entity
/// <summary>
/// 供应商修改时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime DataUpdateTime { get; set; }
public string DataUpdateTime { get; set; }
/// <summary>
/// 产线顺序

0
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_ATTACHMENT_DATA.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_ATTACHMENT_DATA.cs

2
API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// 过程控制项质量数据
/// </summary>
public class SupplierProCps
public class SUPPLIER_PRO_CPS : BaseEntity
{
/// <summary>
/// 供应商代码

10
API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// 生产过程数据
/// </summary>
public class SupplierProData
public class SUPPLIER_PRO_DATA : BaseEntity
{
/// <summary>
/// 供应商代码
@ -169,12 +169,12 @@ namespace TaskManager.Entity
/// <summary>
/// 进工位的时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime MaterialInputTime { get; set; }
public string MaterialInputTime { get; set; }
/// <summary>
/// 出工位的时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime MaterialOutputTime { get; set; }
public string MaterialOutputTime { get; set; }
/// <summary>
/// 装配设备编号(原注释“vendorFieldNum”可能为“设备编号”,此处按业务逻辑命名)
@ -204,12 +204,12 @@ namespace TaskManager.Entity
/// <summary>
/// 采集时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime CollectTime { get; set; }
public string CollectTime { get; set; }
/// <summary>
/// 子件绑定扫码时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime DateTime { get; set; }
public string DateTime { get; set; }
/// <summary>
/// 父件硬件版本号

0
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_ENVIRONMENT.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_ENVIRONMENT.cs

6
API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// 产品一次合格率
/// </summary>
public class SupplierProFirstPassyield
public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity
{
/// <summary>
/// 供应商代码
@ -114,11 +114,11 @@ namespace TaskManager.Entity
/// <summary>
/// 生产日期,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime StatisticalTime { get; set; }
public string StatisticalTime { get; set; }
/// <summary>
/// 值统计时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime DateTime { get; set; }
public string DateTime { get; set; }
}
}

0
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_FLAW.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FLAW.cs

0
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_MATERIAL_DATA.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_DATA.cs

6
API/TaskManager.Entity/Entitys/01_09/SupplierProMaterialStock.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// 来料检验数据
/// </summary>
public class SupplierProMaterialStock
public class SUPPLIER_PRO_MATERIAL_STOCK : BaseEntity
{
/// <summary>
/// 供应商代码
@ -134,7 +134,7 @@ namespace TaskManager.Entity
/// <summary>
/// 检验时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime CheckTime { get; set; }
public string CheckTime { get; set; }
/// <summary>
/// 控制项要求频率
@ -159,6 +159,6 @@ namespace TaskManager.Entity
/// <summary>
/// 库存有效日期,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime DeadLine { get; set; }
public string DeadLine { get; set; }
}
}

0
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE.cs

0
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_OEE_TIME_DETAILS.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_OEE_TIME_DETAILS.cs

0
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_PROCESS.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_PROCESS.cs

0
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_PROCESS_EQUIPMENT.cs

10
API/TaskManager.Entity/Entitys/01_09/SupplierProScheduling.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// 排产数据
/// </summary>
public class SupplierProScheduling
public class SUPPLIER_PRO_SCHEDULING : BaseEntity
{
/// <summary>
/// 供应商代码
@ -89,21 +89,21 @@ namespace TaskManager.Entity
/// <summary>
/// 计划开始时间(格式:yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime PlanBeginTime { get; set; }
public string PlanBeginTime { get; set; }
/// <summary>
/// 计划结束时间(格式:yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime PlanEndTime { get; set; }
public string PlanEndTime { get; set; }
/// <summary>
/// 实际开始时间(格式:yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime ActualBeginTime { get; set; }
public string ActualBeginTime { get; set; }
/// <summary>
/// 实际结束时间(格式:yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime ActualEndTime { get; set; }
public string ActualEndTime { get; set; }
}
}

6
API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs → API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs

@ -9,7 +9,7 @@ namespace TaskManager.Entity
/// <summary>
/// 工位一次合格率
/// </summary>
public class SupplierProStationFirstPassyield
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity
{
/// <summary>
/// 供应商代码
@ -124,11 +124,11 @@ namespace TaskManager.Entity
/// <summary>
/// 生产日期,格式:yyyy-MM-dd HH:mm:ss
/// </summary>
public DateTime StatisticalTime { get; set; }
public string StatisticalTime { get; set; }
/// <summary>
/// 值统计时间,格式:yyyy-MM-dd HH:mm:ss
/// </summary>
public DateTime DateTime { get; set; }
public string DateTime { get; set; }
}
}

111
API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs

@ -1,111 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace TaskManager.Entity.Entitys
{
/// <summary>
/// 工位一次合格率
/// </summary>
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity
{
/// <summary>
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 车间代码
/// </summary>
public string WorkshopId { get; set; }
/// <summary>
/// 车间名称
/// </summary>
public string WorkshopName { get; set; }
/// <summary>
/// 产线代码
/// </summary>
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string ProductionLineName { get; set; }
/// <summary>
/// 工位代码
/// </summary>
public string StationId { get; set; }
/// <summary>
/// 工位名称
/// </summary>
public string StationName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 生产工单号,(跟排产工单号关联)
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 批次计划数量
/// </summary>
public decimal WorkOrderNumber { get; set; }
/// <summary>
/// 不合格数
/// </summary>
public decimal DefectiveNumber { get; set; }
/// <summary>
/// 合格数
/// </summary>
public decimal AcceptableNumber { get; set; }
/// <summary>
/// 一次合格率实际值,使用小数表示,如0.9601表示合格率为96.01%整数位最多10位,小数位最多3位
/// </summary>
public decimal OncePassRateRealValue { get; set; }
/// <summary>
/// 一次合格率目标值,使用小数表示,如0.96表示合格率目标为96.00%。整数位最多10位,小数位最多3位
/// </summary>
public decimal OncePassRateTagValue { get; set; }
/// <summary>
/// 班次,班次如何区分需备注(白班,晚班,中班)
/// </summary>
public string WorkShift { get; set; }
/// <summary>
/// 生产日期,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string StatisticalTime { get; set; }
/// <summary>
/// 值统计时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string DateTime { get; set; }
}
}

4
API/TaskManager.Entity/TaskManager.Entity.csproj

@ -10,4 +10,8 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<Folder Include="Entitys\10_17\" />
</ItemGroup>
</Project>

1
API/TaskManager.EntityFramework/JobDbContext.cs

@ -11,7 +11,6 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TaskManager.Entity;
using TaskManager.Entity.Entitys;
using Wood.Util;

3
API/Wood.Admin.WebApi/Startup.cs

@ -70,9 +70,6 @@ namespace Wood.Admin.WebApi
//初始化数据库
services.AddSqlSugar(Configuration);
services.AddHttpClient();
services.AddScoped<LogController>();
services.AddScoped<SupplierProPlaningService>();

2
API/Wood.Admin.WebApi/appsettings.json

@ -20,7 +20,7 @@
"DBEnableDiffLog": true, //
"LogDays": 90, //
"RunAutoJob": true, //job
"CustomerDb": "Server=192.168.1.228; Database=TaskManager1; User ID = sa; Password=ChangkeTec@2021; TrustServerCertificate = True"
"CustomerDb": "Server=192.168.1.228; Database=TaskManager2; User ID = sa; Password=ChangkeTec@2021; TrustServerCertificate = True"
},
"JwtConfig": {
"SecretKey": "3c1cac3f546eda35168c3aa3cn91780fbe703f0996c6d123ea96dc85c70bbc0a", // string 16

2
API/Wood.Service/Controllers/RecurringJobBaseController.cs

@ -1,4 +1,5 @@

using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
@ -22,6 +23,7 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
[AllowAnonymous]
public class RecurringJobBaseController :ControllerBase, IDoExecute
{
protected string appKey = "8EG566b9bedd2bf46d";

43
API/Wood.Service/Controllers/RecurringJobOutPageController.cs

@ -1,5 +1,8 @@
using Microsoft.AspNetCore.Mvc;
using Magicodes.ExporterAndImporter.Excel;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Omu.ValueInjecter;
using System.Linq.Expressions;
using System.Text.Json;
@ -24,6 +27,44 @@ namespace TaskManager.Controllers
{
_repository = repository;
}
protected async Task<FileStreamResult> ExportFile<T>(ICollection<T> dtos, string fileName) where T : class, new()
{
var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>();
var res = await excelExporter.ExportAsByteArray(dtos);
return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName };
}
public async Task<FileStreamResult> Export([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 await ExportFile<T>(pagedResult.Data, Guid.NewGuid().ToString() + ".xlsx");
}
[NonAction]
public async Task<List<ToutputDetial>> FetchAllDataAsync(string inputdate)
{

43
API/Wood.Service/Controllers/TaskConifgureController.cs

@ -1,4 +1,6 @@
using Hangfire;
using Magicodes.ExporterAndImporter.Excel;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@ -7,7 +9,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System;
using System.IO;
using System.Linq.Expressions;
@ -21,6 +23,8 @@ namespace TaskManager.Controllers
{
//[ApiController]
//[Route("[controller]")]
[AllowAnonymous]
public class TaskConifgureController : ControllerBase
{
private readonly JobDbContext _context;
@ -34,6 +38,15 @@ namespace TaskManager.Controllers
_configuration = configuration;
_repository = repository;
}
protected async Task<FileStreamResult> ExportFile<T>(ICollection<T> dtos, string fileName) where T : class, new()
{
var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>();
var res = await excelExporter.ExportAsByteArray(dtos);
return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName };
}
/// <summary>
/// 请除所有任务
/// </summary>
@ -72,6 +85,34 @@ namespace TaskManager.Controllers
}
public async Task<FileStreamResult> Export([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<TaskConifgure, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(null, pagingParams);
return await ExportFile<TaskConifgure>(pagedResult.Data, Guid.NewGuid().ToString() + ".xlsx");
}
/// <summary>
/// 执行铁定任务
/// </summary>

Loading…
Cancel
Save