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

@@ -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;