From 69da20ba42c0b103c3f3e911695a924835093262 Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Mon, 26 Jan 2026 19:10:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=9D=90=E6=96=99=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=9F=E6=9D=90=E6=96=99=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在入库、出库记录及相关DTO中添加WorkorderRaw字段用于记录原材料工单号 修改ProWorkorderService查询逻辑，增加PlanNum>0的条件过滤 --- .../MES/Material/Dto/MmRecordInboundDto.cs | 16 ++++++++++++++ .../MES/Material/Dto/MmRecordOutboundDto.cs | 21 ++++++++++++++++++- DOAN.Model/MES/Material/MmRecordInbound.cs | 6 ++++++ DOAN.Model/MES/Material/MmRecordOutbound.cs | 6 ++++++ .../MES/Product/ProWorkorderService.cs | 3 +++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs index 1d22a56..c5c561f 100644 --- a/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs @@ -18,6 +18,8 @@ namespace DOAN.Model.BZFM.Dto public string TransactionType { get; set; } public string StoveCode { get; set; } + + public string WorkorderRaw { get; set; } } /// @@ -74,6 +76,11 @@ namespace DOAN.Model.BZFM.Dto /// public string Workorder { get; set; } + /// + /// 原材料工单号 + /// + public string WorkorderRaw { get; set; } + [ExcelColumn(Name = "入库类型")] public string TransactionTypeLabel { get; set; } } @@ -120,6 +127,11 @@ namespace DOAN.Model.BZFM.Dto /// public string Workorder { get; set; } + /// + /// 原材料工单号 + /// + public string WorkorderRaw { get; set; } + // 1-蓝单正向 2-红单逆向 public int ReceiptType { get; set; } = 1; } @@ -189,5 +201,9 @@ namespace DOAN.Model.BZFM.Dto [ExcelColumn(Name = "创建时间")] [SugarColumn(ColumnName = "created_time")] public DateTime? CreatedTime { get; set; } + + [ExcelColumn(Name = "原材料工单号")] + [SugarColumn(ColumnName = "workorder_raw")] + public string WorkorderRaw { get; set; } } } diff --git a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs index 82a3aa9..c659861 100644 --- a/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs +++ b/DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs @@ -4,7 +4,7 @@ namespace DOAN.Model.BZFM.Dto /// /// 出库记录表查询对象 /// - public class MmRecordOutboundQueryDto : PagerInfo + public class MmRecordOutboundQueryDto : PagerInfo { public string MaterialCode { get; set; } @@ -19,6 +19,11 @@ namespace DOAN.Model.BZFM.Dto /// public string Workorder { get; set; } + /// + /// 原材料工单号 + /// + public string WorkorderRaw { get; set; } + public string Operator { get; set; } } @@ -67,6 +72,11 @@ namespace DOAN.Model.BZFM.Dto /// public string Workorder { get; set; } + /// + /// 原材料工单号 + /// + public string WorkorderRaw { get; set; } + [ExcelColumn(Name = "出库类型")] public string TransactionTypeLabel { get; set; } } @@ -117,6 +127,11 @@ namespace DOAN.Model.BZFM.Dto /// public string Workorder { get; set; } + /// + /// 原材料工单号 + /// + public string WorkorderRaw { get; set; } + /// /// 1-蓝单正向 2-红单逆向 /// @@ -186,5 +201,9 @@ namespace DOAN.Model.BZFM.Dto [ExcelColumn(Name = "创建时间")] [SugarColumn(ColumnName = "created_time")] public DateTime? CreatedTime { get; set; } + + [ExcelColumn(Name = "原材料工单号")] + [SugarColumn(ColumnName = "workorder_raw")] + public string WorkorderRaw { get; set; } } } \ No newline at end of file diff --git a/DOAN.Model/MES/Material/MmRecordInbound.cs b/DOAN.Model/MES/Material/MmRecordInbound.cs index fcdb9f3..504e381 100644 --- a/DOAN.Model/MES/Material/MmRecordInbound.cs +++ b/DOAN.Model/MES/Material/MmRecordInbound.cs @@ -127,5 +127,11 @@ namespace DOAN.Model.BZFM /// 工单号（一旦确定，不可更改） /// public string Workorder { get; set; } + + /// + /// 原材料工单号 + /// + [SugarColumn(ColumnName = "workorder_raw")] + public string WorkorderRaw { get; set; } } } \ No newline at end of file diff --git a/DOAN.Model/MES/Material/MmRecordOutbound.cs b/DOAN.Model/MES/Material/MmRecordOutbound.cs index 5462f9d..e493def 100644 --- a/DOAN.Model/MES/Material/MmRecordOutbound.cs +++ b/DOAN.Model/MES/Material/MmRecordOutbound.cs @@ -104,5 +104,11 @@ namespace DOAN.Model.BZFM /// public string Workorder { get; set; } + /// + /// 原材料工单号 + /// + [SugarColumn(ColumnName = "workorder_raw")] + public string WorkorderRaw { get; set; } + } } \ No newline at end of file diff --git a/DOAN.Service/MES/Product/ProWorkorderService.cs b/DOAN.Service/MES/Product/ProWorkorderService.cs index 8fc2fe7..f487b3b 100644 --- a/DOAN.Service/MES/Product/ProWorkorderService.cs +++ b/DOAN.Service/MES/Product/ProWorkorderService.cs @@ -58,6 +58,7 @@ namespace DOAN.Service.MES.product var predicate = Expressionable .Create() + .And(it => it.PlanNum > 0) .AndIF( !string.IsNullOrEmpty(parm.productionName), it => it.productionName.Contains(parm.productionName) @@ -165,6 +166,7 @@ namespace DOAN.Service.MES.product } var predicate = Expressionable .Create() + .And(it => it.PlanNum > 0) .AndIF( !string.IsNullOrEmpty(parm.productionName), it => it.productionName.Contains(parm.productionName) @@ -198,6 +200,7 @@ namespace DOAN.Service.MES.product var query = Queryable() .Where(predicate.ToExpression()) + .ToPage(parm); return query;