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

添加报废审批DTO和供应商字段
实现创建报废单/转用单功能
新增审批和撤销报废记录接口
优化查询条件并生成唯一报废单号

DOAN.Model/MES/Quality/IPQC/Dto/QcScrapRecordsDto.cs

@@ -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 = "状态:草稿,待审批,已批准,已拒绝")]

DOAN.Model/MES/Quality/IPQC/Dto/ScrapApproveDto.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.BZFM.Dto
+{
+    /// <summary>
+    /// 报废审批DTO
+    /// </summary>
+    public class ScrapApproveDto
+    {
+        /// <summary>
+        /// 是否批准
+        /// </summary>
+        public bool IsApproved { get; set; }
+
+        /// <summary>
+        /// 审批人
+        /// </summary>
+        public string Approver { get; set; }
+    }
+}

DOAN.Model/MES/Quality/IPQC/QcScrapRecords.cs

@@ -186,6 +186,18 @@ namespace DOAN.Model.BZFM
         /// </summary>
         [SugarColumn(ColumnName = "scrap_order_no")]
         public string ScrapOrderNo { get; set; }
+        
+        /// <summary>
+        /// 供应商编码 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_code")]
+        public string SupplierCode { get; set; }
+        
+        /// <summary>
+        /// 供应商名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "supplier_name")]
+        public string SupplierName { get; set; }
 
     }
 }