feat(报工): 添加报工数据导出功能
- 在IProReportworkService接口中添加导出方法定义 - 实现报工数据导出服务逻辑 - 添加导出API接口 - 为ProReportworkDto添加ExcelColumn属性用于导出映射 - 调整查询参数类型为可空类型以支持更灵活的查询
This commit is contained in:
@@ -1,17 +1,16 @@
|
||||
|
||||
namespace DOAN.Model.BZFM.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 报工查询对象
|
||||
/// </summary>
|
||||
public class ProReportworkQueryDto : PagerInfo
|
||||
public class ProReportworkQueryDto : PagerInfo
|
||||
{
|
||||
public string Workorder { get; set; }
|
||||
|
||||
public int RouteId { get; set; }
|
||||
public int? RouteId { get; set; }
|
||||
|
||||
public int? ProcessId { get; set; }
|
||||
|
||||
public int ProcessId { get; set; }
|
||||
|
||||
public string Worker { get; set; }
|
||||
|
||||
public DateTime[] JobDateTime { get; set; } = new DateTime[2];
|
||||
@@ -23,47 +22,70 @@ namespace DOAN.Model.BZFM.Dto
|
||||
public class ProReportworkDto
|
||||
{
|
||||
[Required(ErrorMessage = "雪花不能为空")]
|
||||
[ExcelColumn(Name = "系统编号")]
|
||||
public string Id { get; set; }
|
||||
[ExcelColumn(Name = "工单编号")]
|
||||
public string Workorder { get; set; }
|
||||
|
||||
// 产成品号
|
||||
[ExcelColumn(Name = "主体品名")]
|
||||
public string ProductionName { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "主体型号")]
|
||||
public string ProductionCode { get; set; }
|
||||
|
||||
// 原材料号
|
||||
[ExcelColumn(Name = "原材料编码")]
|
||||
public string MaterialCode { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "原材料型号")]
|
||||
public string MaterialName { get; set; }
|
||||
|
||||
// 炉号
|
||||
[ExcelColumn(Name = "炉号")]
|
||||
public string StoveCode { get; set; }
|
||||
|
||||
public string Workorder { get; set; }
|
||||
// 产成品号
|
||||
public string ProductionName { get; set; }
|
||||
public string ProductionCode { get; set; }
|
||||
// 原材料号
|
||||
public string MaterialCode { get; set; }
|
||||
public string MaterialName { get; set; }
|
||||
// 领料批次号
|
||||
[ExcelColumn(Name = "领料批次号")]
|
||||
public string FeedOrder { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "产线编号")]
|
||||
public string RouteId { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "系统工序编号")]
|
||||
public int ProcessId { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "工序名称")]
|
||||
public string ProcessName { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "计划数量")]
|
||||
public int? PlanNum { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "完成数量")]
|
||||
public int? FinishNum { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "不良品数量")]
|
||||
public int? BadNum { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "作业员")]
|
||||
public string Worker { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "作业日期")]
|
||||
public DateTime? JobDateTime { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "备注")]
|
||||
public string Remark { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "创建人")]
|
||||
public string CreatedBy { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "创建时间")]
|
||||
public DateTime? CreatedTime { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "更新人")]
|
||||
public string UpdatedBy { get; set; }
|
||||
|
||||
[ExcelColumn(Name = "更新时间")]
|
||||
public DateTime? UpdatedTime { get; set; }
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user