diff --git a/DOAN.Admin.WebApi/Controllers/MES/Quality/IPQC/QcScrapRecordsController.cs b/DOAN.Admin.WebApi/Controllers/MES/Quality/IPQC/QcScrapRecordsController.cs
new file mode 100644
index 0000000..98606dc
--- /dev/null
+++ b/DOAN.Admin.WebApi/Controllers/MES/Quality/IPQC/QcScrapRecordsController.cs
@@ -0,0 +1,102 @@
+using Microsoft.AspNetCore.Mvc;
+using DOAN.Model.BZFM.Dto;
+using DOAN.Model.BZFM;
+using DOAN.Service.BZFM.IService;
+using DOAN.Admin.WebApi.Filters;
+
+//创建时间：2026-01-22
+namespace DOAN.Admin.WebApi.Controllers.BZFM
+{
+    /// <summary>
+    /// 报废记录表
+    /// </summary>
+    [Verify]
+    [Route("mes/qualityManagement/IPQC/QcScrapRecords")]
+    public class QcScrapRecordsController : BaseController
+    {
+        /// <summary>
+        /// 报废记录表接口
+        /// </summary>
+        private readonly IQcScrapRecordsService _QcScrapRecordsService;
+
+        public QcScrapRecordsController(IQcScrapRecordsService QcScrapRecordsService)
+        {
+            _QcScrapRecordsService = QcScrapRecordsService;
+        }
+
+        /// <summary>
+        /// 查询报废记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "qcscraprecords:list")]
+        public IActionResult QueryQcScrapRecords([FromQuery] QcScrapRecordsQueryDto parm)
+        {
+            var response = _QcScrapRecordsService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 查询报废记录表详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet("{Id}")]
+        [ActionPermissionFilter(Permission = "qcscraprecords:query")]
+        public IActionResult GetQcScrapRecords(long Id)
+        {
+            var response = _QcScrapRecordsService.GetInfo(Id);
+            
+            var info = response.Adapt<QcScrapRecordsDto>();
+            return SUCCESS(info);
+        }
+
+        /// <summary>
+        /// 添加报废记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "qcscraprecords:add")]
+        [Log(Title = "报废记录表", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddQcScrapRecords([FromBody] QcScrapRecordsDto parm)
+        {
+            var modal = parm.Adapt<QcScrapRecords>().ToCreate(HttpContext);
+
+            var response = _QcScrapRecordsService.AddQcScrapRecords(modal);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 更新报废记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "qcscraprecords:edit")]
+        [Log(Title = "报废记录表", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateQcScrapRecords([FromBody] QcScrapRecordsDto parm)
+        {
+            var modal = parm.Adapt<QcScrapRecords>().ToUpdate(HttpContext);
+            var response = _QcScrapRecordsService.UpdateQcScrapRecords(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除报废记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("delete/{ids}")]
+        [ActionPermissionFilter(Permission = "qcscraprecords:delete")]
+        [Log(Title = "报废记录表", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteQcScrapRecords([FromRoute]string ids)
+        {
+            var idArr = Tools.SplitAndConvert<long>(ids);
+
+            return ToResponse(_QcScrapRecordsService.Delete(idArr));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
index 1cece38..1d22a56 100644
--- a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
+++ b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
@@ -69,6 +69,11 @@ namespace DOAN.Model.BZFM.Dto
         public string MaterialCode { get; set; }
         public string InboundNo { get; set; }
 
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        public string Workorder { get; set; }
+
         [ExcelColumn(Name = "入库类型")]
         public string TransactionTypeLabel { get; set; }
     }
diff --git a/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs b/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
index 39605e5..e9a8009 100644
--- a/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
+++ b/DOAN.Model/MES/Product/Dto/ProReportworkDto.cs
@@ -25,7 +25,18 @@ namespace DOAN.Model.BZFM.Dto
         [Required(ErrorMessage = "雪花不能为空")]
         public string Id { get; set; }
 
+        // 炉号
+        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; }
+        // 领料批次号
+        public string FeedOrder { get; set; }
 
         public string RouteId { get; set; }
 
diff --git a/DOAN.Model/MES/Quality/IPQC/Dto/QcScrapRecordsDto.cs b/DOAN.Model/MES/Quality/IPQC/Dto/QcScrapRecordsDto.cs
new file mode 100644
index 0000000..d4458e5
--- /dev/null
+++ b/DOAN.Model/MES/Quality/IPQC/Dto/QcScrapRecordsDto.cs
@@ -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; }
+    }
+}
\ No newline at end of file
diff --git a/DOAN.Model/MES/Quality/IPQC/QcScrapRecords.cs b/DOAN.Model/MES/Quality/IPQC/QcScrapRecords.cs
new file mode 100644
index 0000000..eabffa4
--- /dev/null
+++ b/DOAN.Model/MES/Quality/IPQC/QcScrapRecords.cs
@@ -0,0 +1,191 @@
+
+namespace DOAN.Model.BZFM
+{
+    /// <summary>
+    /// 不良品记录表
+    /// </summary>
+    [SugarTable("qc_scrap_records")]
+    public class QcScrapRecords
+    {
+        /// <summary>
+        /// 工位 
+        /// </summary>
+        [SugarColumn(ColumnName = "work_station")]
+        public string WorkStation { get; set; }
+
+        /// <summary>
+        /// 版本号 
+        /// </summary>
+        public int? Version { get; set; }
+
+        /// <summary>
+        /// 租户ID 
+        /// </summary>
+        [SugarColumn(ColumnName = "tenant_id")]
+        public long? TenantId { get; set; }
+
+        /// <summary>
+        /// 更新时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "updated_time")]
+        public DateTime? UpdatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人ID 
+        /// </summary>
+        [SugarColumn(ColumnName = "updated_by")]
+        public long? UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "created_time")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 创建人ID 
+        /// </summary>
+        [SugarColumn(ColumnName = "created_by")]
+        public long CreatedBy { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 库存编号 
+        /// </summary>
+        [SugarColumn(ColumnName = "location_code")]
+        public string LocationCode { get; set; }
+
+        /// <summary>
+        /// 成本影响金额 
+        /// </summary>
+        [SugarColumn(ColumnName = "cost_impact")]
+        public decimal CostImpact { get; set; }
+
+        /// <summary>
+        /// 质检员 
+        /// </summary>
+        [SugarColumn(ColumnName = "quality_inspector")]
+        public string QualityInspector { get; set; }
+
+        /// <summary>
+        /// 状态:草稿,待审批,已批准,已拒绝 
+        /// </summary>
+        public string Status { get; set; }
+
+        /// <summary>
+        /// 审批日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "approval_date")]
+        public DateTime? ApprovalDate { get; set; }
+
+        /// <summary>
+        /// 报废日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "scrap_date")]
+        public DateTime? ScrapDate { get; set; }
+
+        /// <summary>
+        /// 审核人 
+        /// </summary>
+        [SugarColumn(ColumnName = "supervisor_name")]
+        public string SupervisorName { get; set; }
+
+        /// <summary>
+        /// 操作员 
+        /// </summary>
+        public string Operator { get; set; }
+
+        /// <summary>
+        /// 主键ID 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 处置方式 
+        /// </summary>
+        [SugarColumn(ColumnName = "disposal_method")]
+        public string DisposalMethod { get; set; }
+
+        /// <summary>
+        /// 报废类型:质量缺陷,过期,损坏,工艺错误,其他 
+        /// </summary>
+        [SugarColumn(ColumnName = "scrap_type")]
+        public string ScrapType { get; set; }
+
+        /// <summary>
+        /// 报废原因 
+        /// </summary>
+        [SugarColumn(ColumnName = "scrap_reason")]
+        public string ScrapReason { get; set; }
+
+        /// <summary>
+        /// 单位 
+        /// </summary>
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// 报废数量 
+        /// </summary>
+        [SugarColumn(ColumnName = "scrap_quantity")]
+        public decimal ScrapQuantity { get; set; }
+
+        /// <summary>
+        /// 批次号 
+        /// </summary>
+        [SugarColumn(ColumnName = "batch_no")]
+        public string BatchNo { get; set; }
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "material_name")]
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+        [SugarColumn(ColumnName = "material_code")]
+        public string MaterialCode { get; set; }
+
+        /// <summary>
+        /// 产品名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "product_name")]
+        public string ProductName { get; set; }
+
+        /// <summary>
+        /// 产品编号 
+        /// </summary>
+        [SugarColumn(ColumnName = "product_code")]
+        public string ProductCode { get; set; }
+
+        /// <summary>
+        /// 炉号 
+        /// </summary>
+        [SugarColumn(ColumnName = "stove_code")]
+        public string StoveCode { get; set; }
+
+        /// <summary>
+        /// 线别 
+        /// </summary>
+        [SugarColumn(ColumnName = "line_code")]
+        public string LineCode { get; set; }
+
+        /// <summary>
+        /// 工单号 
+        /// </summary>
+        public string Workorder { get; set; }
+
+        /// <summary>
+        /// 报废单号 
+        /// </summary>
+        [SugarColumn(ColumnName = "scrap_order_no")]
+        public string ScrapOrderNo { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs b/DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs
index 45f012a..2756ad0 100644
--- a/DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs
+++ b/DOAN.Model/Mobile/ReportFlow/Dto/ProReportWorkDetialDto.cs
@@ -2,81 +2,85 @@ namespace DOAN.Model.Mobile.ReportFlow.Dto;
 
 public class ProReportWorkDetialDto
 {
-   
-        public string Id { get; set; }
+    public string Id { get; set; }
 
-        /// <summary>
-        /// 工单code 
-        /// </summary>
-        public string Workorder { get; set; }
+    /// <summary>
+    /// 工单code
+    /// </summary>
+    public string Workorder { get; set; }
 
-        /// <summary>
-        /// 路线code 
-        /// </summary>
-        public string RouteCode { get; set; }
+    /// <summary>
+    /// 炉号
+    /// </summary>
+    public string StoveCode { get; set; }
 
-        /// <summary>
-        /// 工序id 
-        /// </summary>
-    
-        public int ProcessId { get; set; }
-        
-        /// <summary>
-        /// 工序名称
-        /// </summary>
-        public string ProcessName      { get; set; }
+    /// <summary>
+    /// 领料批次号
+    /// </summary>
+    public string FeedOrder { get; set; }
 
-        /// <summary>
-        /// 计划数量 
-        /// </summary>
+    /// <summary>
+    /// 路线code
+    /// </summary>
+    public string RouteCode { get; set; }
 
-        public int? PlanNum { get; set; }
+    /// <summary>
+    /// 工序id
+    /// </summary>
+    public int ProcessId { get; set; }
 
-        /// <summary>
-        /// 完成数量 
-        /// </summary>
-    
-        public int? FinishNum { get; set; }
+    /// <summary>
+    /// 工序名称
+    /// </summary>
+    public string ProcessName { get; set; }
 
-        /// <summary>
-        /// 不良数量 
-        /// </summary>
+    /// <summary>
+    /// 计划数量
+    /// </summary>
+    public int? PlanNum { get; set; }
 
-        public int? BadNum { get; set; }
+    /// <summary>
+    /// 完成数量
+    /// </summary>
+    public int? FinishNum { get; set; }
 
-        /// <summary>
-        /// 作业员 
-        /// </summary>
-        public string Worker { get; set; }
+    /// <summary>
+    /// 不良数量
+    /// </summary>
+    public int? BadNum { get; set; }
 
-        /// <summary>
-        /// 作业日期 
-        /// </summary>
+    /// <summary>
+    /// 作业员
+    /// </summary>
+    public string Worker { get; set; }
 
-        public DateTime? JobDateTime { get; set; }
+    /// <summary>
+    /// 作业日期
+    /// </summary>
+    public DateTime? JobDateTime { get; set; }
 
-        /// <summary>
-        /// 备注 
-        /// </summary>
-        public string Remark { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
 
-        /// <summary>
-        /// 创建人 
-        /// </summary>
-        public string CreatedBy { get; set; }
+    /// <summary>
+    /// 创建人
+    /// </summary>
+    public string CreatedBy { get; set; }
 
-        /// <summary>
-        /// 创建时间 
-        /// </summary>
-        public DateTime? CreatedTime { get; set; }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? CreatedTime { get; set; }
 
-        /// <summary>
-        /// 更新人 
-        /// </summary>
-        public string UpdatedBy { get; set; }
+    /// <summary>
+    /// 更新人
+    /// </summary>
+    public string UpdatedBy { get; set; }
 
-        /// <summary>
-        /// 更新时间 
-        /// </summary>
-        public DateTime? UpdatedTime { get; set; }
-}
\ No newline at end of file
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    public DateTime? UpdatedTime { get; set; }
+}
diff --git a/DOAN.Service/DOAN.Service.csproj b/DOAN.Service/DOAN.Service.csproj
index b29b6fc..0939a00 100644
--- a/DOAN.Service/DOAN.Service.csproj
+++ b/DOAN.Service/DOAN.Service.csproj
@@ -28,6 +28,7 @@
 	</ItemGroup>
 	<ItemGroup>
 	  <Folder Include="BZFM\IBZFMService\" />
+	  <Folder Include="MES\Quality\IQC\" />
 	</ItemGroup>
 
 </Project>
diff --git a/DOAN.Service/MES/Product/ProReportworkService.cs b/DOAN.Service/MES/Product/ProReportworkService.cs
index 11b0f0d..54cb49e 100644
--- a/DOAN.Service/MES/Product/ProReportworkService.cs
+++ b/DOAN.Service/MES/Product/ProReportworkService.cs
@@ -50,8 +50,22 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
         var response = Context
             .Queryable(query)
             .LeftJoin<BaseWorkProcesses>((q, w) => q.ProcessId == w.Id)
-            .OrderBy((q, w) => new { q.Workorder, w.Id })
-            .Select((q, w) => new ProReportworkDto { ProcessName = w.Name }, true)
+            .LeftJoin<ProWorkorder>((q, w, wo) => q.Workorder == wo.Workorder)
+            .OrderBy((q, w, wo) => new { q.Workorder, w.Id })
+            .Select(
+                (q, w, wo) =>
+                    new ProReportworkDto
+                    {
+                        ProcessName = w.Name,
+                        FeedOrder = wo.FeedOrder,
+                        ProductionName = wo.productionName,
+                        ProductionCode = wo.productionCode,
+                        MaterialCode = wo.MaterialCode,
+                        MaterialName = wo.MaterialName,
+                        StoveCode = wo.StoveCode,
+                    },
+                true
+            )
             .ToPage_NO_Convert(parm);
 
         return response;
diff --git a/DOAN.Service/MES/Quality/IPQC/IService/IQcScrapRecordsService.cs b/DOAN.Service/MES/Quality/IPQC/IService/IQcScrapRecordsService.cs
new file mode 100644
index 0000000..673f13f
--- /dev/null
+++ b/DOAN.Service/MES/Quality/IPQC/IService/IQcScrapRecordsService.cs
@@ -0,0 +1,21 @@
+using DOAN.Model.BZFM.Dto;
+using DOAN.Model.BZFM;
+
+namespace DOAN.Service.BZFM.IService
+{
+    /// <summary>
+    /// 报废记录表service接口
+    /// </summary>
+    public interface IQcScrapRecordsService : IBaseService<QcScrapRecords>
+    {
+        PagedInfo<QcScrapRecordsDto> GetList(QcScrapRecordsQueryDto parm);
+
+        QcScrapRecords GetInfo(long Id);
+
+
+        QcScrapRecords AddQcScrapRecords(QcScrapRecords parm);
+        int UpdateQcScrapRecords(QcScrapRecords parm);
+
+
+    }
+}
diff --git a/DOAN.Service/MES/Quality/IPQC/QcScrapRecordsService.cs b/DOAN.Service/MES/Quality/IPQC/QcScrapRecordsService.cs
new file mode 100644
index 0000000..3b952eb
--- /dev/null
+++ b/DOAN.Service/MES/Quality/IPQC/QcScrapRecordsService.cs
@@ -0,0 +1,79 @@
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using DOAN.Model.BZFM.Dto;
+using DOAN.Model.BZFM;
+using DOAN.Repository;
+using DOAN.Service.BZFM.IService;
+
+namespace DOAN.Service.BZFM
+{
+    /// <summary>
+    /// 报废记录表Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IQcScrapRecordsService), ServiceLifetime = LifeTime.Transient)]
+    public class QcScrapRecordsService : BaseService<QcScrapRecords>, IQcScrapRecordsService
+    {
+        /// <summary>
+        /// 查询报废记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<QcScrapRecordsDto> GetList(QcScrapRecordsQueryDto parm)
+        {
+            var predicate = QueryExp(parm);
+
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<QcScrapRecords, QcScrapRecordsDto>(parm);
+
+            return response;
+        }
+
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public QcScrapRecords GetInfo(long Id)
+        {
+            var response = Queryable()
+                .Where(x => x.Id == Id)
+                .First();
+
+            return response;
+        }
+
+        /// <summary>
+        /// 添加报废记录表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public QcScrapRecords AddQcScrapRecords(QcScrapRecords model)
+        {
+            return Insertable(model).ExecuteReturnEntity();
+        }
+
+        /// <summary>
+        /// 修改报废记录表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int UpdateQcScrapRecords(QcScrapRecords model)
+        {
+            return Update(model, true);
+        }
+
+        /// <summary>
+        /// 查询导出表达式
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        private static Expressionable<QcScrapRecords> QueryExp(QcScrapRecordsQueryDto parm)
+        {
+            var predicate = Expressionable.Create<QcScrapRecords>();
+
+            return predicate;
+        }
+    }
+}
\ No newline at end of file
diff --git a/DOAN.Service/Mobile/ReportFlowService.cs b/DOAN.Service/Mobile/ReportFlowService.cs
index 83f32fb..92e6160 100644
--- a/DOAN.Service/Mobile/ReportFlowService.cs
+++ b/DOAN.Service/Mobile/ReportFlowService.cs
@@ -30,6 +30,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
         return Context
             .Queryable<ProWorkorder>()
             .Where(it => it.WorkorderDate >= startDate && it.WorkorderDate <= endDate)
+            .Where(it => it.PlanNum > 0)
             .ToList();
     }
 
@@ -149,7 +150,9 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
                     Remarks = $"生产领料,工单号:{workorder}",
                 };
                 MmInventoryService mmInventoryService = new();
-                string createReceiptresult = mmInventoryService.CreateOutboundReceipt(revokeRecepitDto);
+                string createReceiptresult = mmInventoryService.CreateOutboundReceipt(
+                    revokeRecepitDto
+                );
                 if (createReceiptresult != "ok")
                 {
                     Context.Ado.RollbackTran();
@@ -177,7 +180,6 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             Context.Ado.RollbackTran();
             throw;
         }
-
     }
 
     /// <summary>
@@ -269,7 +271,9 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
                 if (mmMaterial == null)
                 {
                     Context.Ado.RollbackTran();
-                    throw new Exception($"物料档案不存在,无法成品入库:{proWorkorder.productionCode}");
+                    throw new Exception(
+                        $"物料档案不存在,无法成品入库:{proWorkorder.productionCode}"
+                    );
                 }
                 if (inboundRecord == null)
                 {
@@ -316,7 +320,6 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
             Context.Ado.RollbackTran();
             throw;
         }
-
     }
 
     /// <summary>
@@ -440,7 +443,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
                 string createReceiptresult = mmInventoryService.CreateOutboundReceipt(
                     revokeRecepitDto
                 );
-                if(createReceiptresult != "ok")
+                if (createReceiptresult != "ok")
                 {
                     Context.Ado.RollbackTran();
                     throw new Exception(createReceiptresult);
@@ -500,9 +503,19 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
         return Context
             .Queryable<ProReportwork01>()
             .LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
+            .LeftJoin<ProWorkorder>((rw, wp, wo) => rw.Workorder == wo.Workorder)
             .Where((rw, wp) => rw.Workorder == workorder)
             .OrderBy(rw => rw.ProcessId)
-            .Select((rw, wp) => new ProReportWorkDetialDto() { ProcessName = wp.Name }, true)
+            .Select(
+                (rw, wp, wo) =>
+                    new ProReportWorkDetialDto()
+                    {
+                        ProcessName = wp.Name,
+                        StoveCode = wo.StoveCode,
+                        FeedOrder = wo.FeedOrder,
+                    },
+                true
+            )
             .ToList();
     }
 
@@ -518,6 +531,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
         return Context
             .Queryable<ProReportwork01>()
             .LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
+            .LeftJoin<ProWorkorder>((rw, wp, wo) => rw.Workorder == wo.Workorder)
             .Where(
                 (rw, wp) =>
                     rw.Worker == query.name
@@ -525,7 +539,16 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
                     && rw.JobDateTime < DateTime.Today.AddDays(1)
             )
             .OrderBy(rw => rw.ProcessId)
-            .Select((rw, wp) => new ProReportWorkDetialDto() { ProcessName = wp.Name }, true)
+            .Select(
+                (rw, wp, wo) =>
+                    new ProReportWorkDetialDto()
+                    {
+                        ProcessName = wp.Name,
+                        StoveCode = wo.StoveCode,
+                        FeedOrder = wo.FeedOrder,
+                    },
+                true
+            )
             .ToPage_NO_Convert(query);
     }
 
@@ -545,14 +568,24 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
         return Context
             .Queryable<ProReportwork01>()
             .LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
+            .LeftJoin<ProWorkorder>((rw, wp, wo) => rw.Workorder == wo.Workorder)
             .Where(
-                (rw, wp) =>
+                (rw, wp, wo) =>
                     rw.ProcessId == query.processId
                     && rw.JobDateTime >= DateTime.Today
                     && rw.JobDateTime < DateTime.Today.AddDays(1)
             )
             .OrderBy(rw => rw.ProcessId)
-            .Select((rw, wp) => new ProReportWorkDetialDto() { ProcessName = wp.Name }, true)
+            .Select(
+                (rw, wp, wo) =>
+                    new ProReportWorkDetialDto()
+                    {
+                        ProcessName = wp.Name,
+                        StoveCode = wo.StoveCode,
+                        FeedOrder = wo.FeedOrder,
+                    },
+                true
+            )
             .ToPage_NO_Convert(query);
     }
 }