feat: 添加报废记录功能及相关字段扩展

- 新增报废记录表及相关服务、控制器
- 扩展工单报表DTO,增加炉号、领料批次等字段
- 修改报表查询服务,关联工单表获取更多信息
- 在物料入库DTO中添加工单号字段
- 新增IQC文件夹结构
This commit is contained in:
2026-01-22 17:25:17 +08:00
parent 908f2604e9
commit 3d5ad78fad
11 changed files with 630 additions and 73 deletions

View File

@@ -0,0 +1,96 @@
namespace DOAN.Model.BZFM.Dto
{
/// <summary>
/// 报废记录表查询对象
/// </summary>
public class QcScrapRecordsQueryDto : PagerInfo
{
public string MaterialCode { get; set; }
public string ProductCode { get; set; }
public string Workorder { get; set; }
public string BatchNo { get; set; }
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
}
/// <summary>
/// 报废记录表输入输出对象
/// </summary>
public class QcScrapRecordsDto
{
public string WorkStation { get; set; }
public int? Version { get; set; }
public long? TenantId { get; set; }
[Required(ErrorMessage = "更新时间不能为空")]
public DateTime? UpdatedTime { get; set; }
public long? UpdatedBy { get; set; }
[Required(ErrorMessage = "创建时间不能为空")]
public DateTime? CreatedTime { get; set; }
[Required(ErrorMessage = "创建人ID不能为空")]
public long CreatedBy { get; set; }
public string Remark { get; set; }
public string LocationCode { get; set; }
public decimal CostImpact { get; set; }
public string QualityInspector { get; set; }
public string Status { get; set; }
public DateTime? ApprovalDate { get; set; }
[Required(ErrorMessage = "报废日期不能为空")]
public DateTime? ScrapDate { get; set; }
public string SupervisorName { get; set; }
public string Operator { get; set; }
[Required(ErrorMessage = "主键ID不能为空")]
public long Id { get; set; }
public string DisposalMethod { get; set; }
public string ScrapType { get; set; }
public string ScrapReason { get; set; }
public string Unit { get; set; }
[Required(ErrorMessage = "报废数量不能为空")]
public decimal ScrapQuantity { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialCode { get; set; }
public string ProductName { get; set; }
public string ProductCode { get; set; }
public string StoveCode { get; set; }
public string LineCode { get; set; }
public string Workorder { get; set; }
[Required(ErrorMessage = "报废单号不能为空")]
public string ScrapOrderNo { get; set; }
[ExcelColumn(Name = "状态:草稿,待审批,已批准,已拒绝")]
public string StatusLabel { get; set; }
}
}