Browse Source

同上

master
me 3 weeks ago
parent
commit
d5c1afec32
  1. 165
      API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs
  2. 110
      API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs
  3. 135
      API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs
  4. 181
      API/TaskManager.Entity/Entity.cs
  5. 1
      API/TaskManager.Entity/TaskManager.Entity.csproj
  6. 5
      API/TaskManager.EntityFramework/Repository/Repository.cs
  7. 40
      API/Wood.Service/Controllers/TaskConifgureController.cs

165
API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs

@ -0,0 +1,165 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TaskManager.Contracts.Dtos;
namespace TaskManager.Contracts.Dtos
{
/// <summary>
/// 来料检验数据
/// </summary>
public class SUPPLIER_PRO_MATERIAL_STOCK_DTO : BaseEntityDto
{
/// <summary>
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 供应商子零件编号
/// </summary>
public string SupplierSubCode { get; set; }
/// <summary>
/// 供应商子零件名称
/// </summary>
public string SupplierSubName { get; set; }
/// <summary>
/// 分供方代码
/// </summary>
public string SubSupplierCode { get; set; }
/// <summary>
/// 分供方名称
/// </summary>
public string SubSupplierName { get; set; }
/// <summary>
/// 分供方地址,分供方发货地址:省市区(县),不用于详细地址
/// </summary>
public string SubSupplierAddress { get; set; }
/// <summary>
/// 分供方子件编码
/// </summary>
public string ComponentCode { get; set; }
/// <summary>
/// 分供方子件名称
/// </summary>
public string ComponentName { get; set; }
/// <summary>
/// 子件批次号
/// </summary>
public string SubBatchNo { get; set; }
/// <summary>
/// 子件批次数量
/// </summary>
public decimal SubBatchNum { get; set; }
/// <summary>
/// 子件SN码
/// </summary>
public string SubBatchSn { get; set; }
/// <summary>
/// 检验人员编号
/// </summary>
public string EmpCode { get; set; }
/// <summary>
/// 检验人员姓名
/// </summary>
public string EmpName { get; set; }
/// <summary>
/// 检测设备编号
/// </summary>
public string DeviceCode { get; set; }
/// <summary>
/// 检测设备名称
/// </summary>
public string DeviceName { get; set; }
/// <summary>
/// 参数名称/特性名称
/// </summary>
public string FeatureName { get; set; }
/// <summary>
/// 参数单位/特性单位
/// </summary>
public string FeatureUnit { get; set; }
/// <summary>
/// 参数/特性标准值
/// </summary>
public string StandardValue { get; set; }
/// <summary>
/// 参数/特性上限值
/// </summary>
public string FeatureUpper { get; set; }
/// <summary>
/// 参数/特性下限值
/// </summary>
public string FeatureLower { get; set; }
/// <summary>
/// 参数/特性实测值
/// </summary>
public string FeatureValue { get; set; }
/// <summary>
/// 来料检验单号
/// </summary>
public string CheckNo { get; set; }
/// <summary>
/// 批次的最终判定结果,OK合格/NG不合格
/// </summary>
public string CheckResult { get; set; }
/// <summary>
/// 检验时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public string CheckTime { get; set; }
/// <summary>
/// 控制项要求频率
/// </summary>
public decimal SamplingRate { get; set; }
/// <summary>
/// 上下限更新时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public string LimitUpdateTime { get; set; }
/// <summary>
/// 控制项描述
/// </summary>
public string VendorFieldDesc { get; set; }
/// <summary>
/// 控制项代码
/// </summary>
public string VendorFieldCode { get; set; }
/// <summary>
/// 库存有效日期,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public string DeadLine { get; set; }
}
}

110
API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs

@ -0,0 +1,110 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TaskManager.Contracts.Dtos;
namespace TaskManager.Contracts.Dtos
{
/// <summary>
/// 排产数据
/// </summary>
public class SUPPLIER_PRO_SCHEDULING_DTO : BaseEntityDto
{
/// <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 VendorProductNo { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 计划单号
/// </summary>
public string PlanNo { get; set; }
/// <summary>
/// 生产工单号
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 批次计划数量
/// </summary>
public decimal ManufactureNum { get; set; }
/// <summary>
/// 批次投入数量
/// </summary>
public decimal ManufactureInputNum { get; set; }
/// <summary>
/// 批次产出数量
/// </summary>
public decimal ManufactureOutputNum { get; set; }
/// <summary>
/// 排产状态(0:未生产,1:生产中,2:已完工,3:已取消,4:已终止)
/// </summary>
public int PlanStatus { get; set; }
/// <summary>
/// 计划开始时间(格式:yyyy-MM-dd HH:mm:ss)
/// </summary>
public string PlanBeginTime { get; set; }
/// <summary>
/// 计划结束时间(格式:yyyy-MM-dd HH:mm:ss)
/// </summary>
public string PlanEndTime { get; set; }
/// <summary>
/// 实际开始时间(格式:yyyy-MM-dd HH:mm:ss)
/// </summary>
public string ActualBeginTime { get; set; }
/// <summary>
/// 实际结束时间(格式:yyyy-MM-dd HH:mm:ss)
/// </summary>
public string ActualEndTime { get; set; }
}
}

135
API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs

@ -0,0 +1,135 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TaskManager.Contracts.Dtos;
namespace TaskManager.Contracts.Dtos
{
/// <summary>
/// 工位一次合格率
/// </summary>
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO : BaseEntityDto
{
/// <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-dd HH:mm:ss
/// </summary>
public string StatisticalTime { get; set; }
/// <summary>
/// 值统计时间,格式:yyyy-MM-dd HH:mm:ss
/// </summary>
public string DateTime { get; set; }
}
}

181
API/TaskManager.Entity/Entity.cs

@ -1,4 +1,5 @@
using Newtonsoft.Json;
using Magicodes.ExporterAndImporter.Core;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@ -19,20 +20,48 @@ namespace TaskManager.Entity
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[ExporterHeader(IsIgnore = true)]
public long UId { get; set; }
/// <summary>
/// 加密用API路径
/// API路径
/// </summary>
[ExporterHeader(DisplayName = "API路径")]
public string Api { get; set; }
/// <summary>
/// 任务周期设置
/// </summary>
[ExporterHeader(DisplayName = "任务周期设置")]
public string Corn { get; set; }
/// <summary>
/// 模块
/// </summary>
[ExporterHeader(IsIgnore = true)]
public string Module { get; set; }
/// <summary>
/// 备注
/// </summary>
[ExporterHeader(DisplayName = "备注")]
public string Remark { get; set; }
/// <summary>
/// 表名
/// </summary>
[ExporterHeader(IsIgnore =true)]
public string TableName { get; set; }
/// <summary>
/// 任务名称
/// </summary>
[ExporterHeader(DisplayName = "任务名称")]
public string TaskName { get; set; }
/// <summary>
/// 调用全路径
/// 全路径
/// </summary>
[ExporterHeader(DisplayName = "全路径")]
public string Url { get; set; }
/// <summary>
/// 是否自动执行
/// </summary>
[ExporterHeader(DisplayName = "是否自动执行")]
public bool IsAuto { get; set; }
}
@ -42,10 +71,25 @@ namespace TaskManager.Entity
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long UId { get; set; }
/// <summary>
/// 详细描述
/// </summary>
public string Info { get; set; }
/// <summary>
/// 日志类型
/// </summary>
public string Type { get; set; }
/// <summary>
/// 任务名称
/// </summary>
public string TaskName { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreationTime { set; get; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
@ -53,14 +97,19 @@ namespace TaskManager.Entity
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[ExporterHeader(IsIgnore=true)]
public long UId { get; set; }
/// <summary>
/// 写状态
/// </summary>
public bool WriteState { get; set; }
[ExporterHeader(IsIgnore = true)]
public bool ReadState { get; set; }
[ExporterHeader(IsIgnore = true)]
public DateTime CreationTime { get; set; }
public string? Remark { get; set; }
[ExporterHeader(IsIgnore = true)]
public string Remark { get; set; }
[ExporterHeader(IsIgnore = true)]
public Guid TaskId { get; set; }
}
@ -74,64 +123,86 @@ namespace TaskManager.Entity
}
/// <summary>
/// 缺陷业务数据
/// 任务订阅实体类(对应数据库表 TEA_TASK_SUB)
/// </summary>
//public class SUPPLIER_PRO_FLAW : BaseEntity
//{
//}
public class TaskSub:BaseEntity
{
[ExporterHeader(DisplayName = "用户名")]
/// <summary>
/// 关联的数据表名称(如:订单表、用户表等,可为空)
/// </summary>
public string? TableName { get; set; }
/// <summary>
/// 任务名称(用于业务层面标识任务,如:数据同步任务、报表生成任务)
/// </summary>
public string? TaskName { get; set; }
/// <summary>
/// 数据总量(任务处理的数据条目数)
/// </summary>
public int DataCount { get; set; }
/// <summary>
/// 发布给那个客户
/// </summary>
public string? Subscriber { get; set; }
/// <summary>
/// 失败次数(任务执行失败的累计次数)
/// </summary>
public int FailedCount { get; set; }
/// <summary>
/// 失败详情(记录失败原因、异常堆栈等信息,支持长文本)
/// </summary>
public string? FailedInfo { get; set; }
/// <summary>
/// 所属域(多租户场景下标识租户,如:租户A、租户B)
/// </summary>
public string? Domain { get; set; }
/// <summary>
/// 站点标识(多站点部署时标识所属站点,如:Site1、Site2)
/// </summary>
public string? Site { get; set; }
/// <summary>
/// 从那个内部系统创建系统
/// </summary>
public string? CreateUser { get; set; }
/// <summary>
/// 创建时间(任务创建的时间戳)
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 备注信息(任务相关的补充说明,支持长文本)
/// </summary>
public string? Remark { get; set; }
/// <summary>
/// 最后更新人(记录任务最后修改者)
/// </summary>
public string? UpdateUser { get; set; }
/// <summary>
/// 最后更新时间(任务最后修改的时间戳,可为空)
/// </summary>
public DateTime? UpdateTime { get; set; }
}
///// <summary>
///// 环境业务数据
///// </summary>
//public class SUPPLIER_PRO_ENVIRONMENT : BaseEntity
//{
//}
///// <summary>
///// 设备OEE达成率
///// </summary>
//public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE : BaseEntity
//{
//}
///// <summary>
///// OEE时间明细
///// </summary>
//public class SUPPLIER_PRO_OEE_TIME_DETAILS : BaseEntity
//{
//}
///// <summary>
///// 物料主数据
///// </summary>
//public class SUPPLIER_PRO_MATERIAL_DATA : BaseEntity
//{
//}
///// <summary>
///// 附件类数据
///// </summary>
//public class SUPPLIER_PRO_ATTACHMENT_DATA : BaseEntity
//{
//}
///// <summary>
///// 工艺装备
///// </summary>
//public class SUPPLIER_PRO_PROCESS_EQUIPMENT : BaseEntity
//{
//}
///// <summary>
///// 工艺
///// </summary>
//public class SUPPLIER_PRO_PROCESS : BaseEntity
//{
//}
/// <summary>
/// 整车月度生产计划-2
/// </summary>

1
API/TaskManager.Entity/TaskManager.Entity.csproj

@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Magicodes.IE.Core" Version="2.7.5.2" />
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

5
API/TaskManager.EntityFramework/Repository/Repository.cs

@ -90,11 +90,6 @@ namespace TaskManager.EntityFramework.Repository
return await query.ToPagedListAsync(pagingParams);
}
}
public class PagedResult<T>
{

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

@ -84,6 +84,15 @@ namespace TaskManager.Controllers
}
/// <summary>
/// 导出
/// </summary>
/// <param name="pageNumber">第几页</param>
/// <param name="pageSize">每页条数</param>
/// <param name="sortBy">排序列</param>
/// <param name="isAscending">是否升序</param>
/// <param name="filters">查询条件</param>
/// <returns></returns>
public async Task<FileStreamResult> Export([FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10,
@ -138,7 +147,10 @@ namespace TaskManager.Controllers
/// <summary>
/// 刷新任务
/// </summary>
/// <returns></returns>
public async Task RefreshTaskConfig()
{
@ -611,12 +623,21 @@ namespace TaskManager.Controllers
}
/// <summary>
/// 获得所有揭露
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<ActionResult<IEnumerable<TaskConifgure>>> GetAll()
{
return await _repository.GetAllAsync() as List<TaskConifgure>;
}
/// <summary>
/// 通过UID获得实体
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet("{id}")]
public async Task<ActionResult<TaskConifgure>> GetById(int id)
{
@ -625,6 +646,11 @@ namespace TaskManager.Controllers
return entity;
}
/// <summary>
/// 创建实体
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
[HttpPost]
public async Task<ActionResult<TaskConifgure>> Create(TaskConifgure entity)
{
@ -632,7 +658,11 @@ namespace TaskManager.Controllers
var createdEntity = await _repository.AddAsync(entity);
return new JsonResult(new { Code = 200, Message = "创建成功!" });
}
/// <summary>
/// 更新实体UID
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
[HttpPut("{id}")]
public async Task<IActionResult> Update(TaskConifgure entity)
{
@ -646,7 +676,11 @@ namespace TaskManager.Controllers
await _repository.UpdateAsync(entity);
return new JsonResult(new { Code = 200, Message = "修改成功!" });
}
/// <summary>
/// 删除实体通过UID
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task<IActionResult> Delete(int id)
{

Loading…
Cancel
Save