feat(报废管理): 实现报废单和转用单的创建与审批流程

添加报废审批DTO和供应商字段
实现创建报废单/转用单功能
新增审批和撤销报废记录接口
优化查询条件并生成唯一报废单号
This commit is contained in:
2026-01-26 17:57:18 +08:00
parent 1e7d768489
commit 722ef40fd2
8 changed files with 355 additions and 17 deletions

View File

@@ -12,6 +12,13 @@ namespace DOAN.Model.BZFM.Dto
public string BatchNo { get; set; }
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
public string ScrapOrderNo { get; set; }
public string StoveCode { get; set; }
public string SupplierCode { get; set; }
public string ScrapType { get; set; }
public string LineCode { get; set; }
public string Status { get; set; }
}
/// <summary>
@@ -25,15 +32,12 @@ namespace DOAN.Model.BZFM.Dto
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; }
@@ -55,7 +59,6 @@ namespace DOAN.Model.BZFM.Dto
public string Operator { get; set; }
[Required(ErrorMessage = "主键ID不能为空")]
public long Id { get; set; }
public string DisposalMethod { get; set; }
@@ -73,6 +76,7 @@ namespace DOAN.Model.BZFM.Dto
public string MaterialName { get; set; }
[Required(ErrorMessage = "物料编码不能为空")]
public string MaterialCode { get; set; }
public string ProductName { get; set; }
@@ -85,9 +89,11 @@ namespace DOAN.Model.BZFM.Dto
public string Workorder { get; set; }
[Required(ErrorMessage = "报废单号不能为空")]
public string ScrapOrderNo { get; set; }
public string SupplierCode { get; set; }
public string SupplierName { get; set; }
[ExcelColumn(Name = "状态:草稿,待审批,已批准,已拒绝")]