Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(材料管理): 添加原材料工单号字段并优化工单查询

Browse Source 
在入库、出库记录及相关DTO中添加WorkorderRaw字段用于记录原材料工单号
修改ProWorkorderService查询逻辑，增加PlanNum>0的条件过滤
This commit is contained in:
git_rabbit
2026-01-26 19:10:02 +08:00
parent 722ef40fd2
commit 69da20ba42
5 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
View File

@@ -18,6 +18,8 @@ namespace DOAN.Model.BZFM.Dto
public string TransactionType { get; set; }
public string StoveCode { get; set; }
public string WorkorderRaw { get; set; }
}
/// <summary>
@@ -74,6 +76,11 @@ namespace DOAN.Model.BZFM.Dto
/// </summary>
public string Workorder { get; set; }
/// <summary>
/// 原材料工单号
/// </summary>
public string WorkorderRaw { get; set; }
[ExcelColumn(Name = "入库类型")]
public string TransactionTypeLabel { get; set; }
}
@@ -120,6 +127,11 @@ namespace DOAN.Model.BZFM.Dto
/// </summary>
public string Workorder { get; set; }
/// <summary>
/// 原材料工单号
/// </summary>
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; }
}
}

19
DOAN.Model/MES/Material/Dto/MmRecordOutboundDto.cs
View File

@@ -19,6 +19,11 @@ namespace DOAN.Model.BZFM.Dto
/// </summary>
public string Workorder { get; set; }
/// <summary>
/// 原材料工单号
/// </summary>
public string WorkorderRaw { get; set; }
public string Operator { get; set; }
}
@@ -67,6 +72,11 @@ namespace DOAN.Model.BZFM.Dto
/// </summary>
public string Workorder { get; set; }
/// <summary>
/// 原材料工单号
/// </summary>
public string WorkorderRaw { get; set; }
[ExcelColumn(Name = "出库类型")]
public string TransactionTypeLabel { get; set; }
}
@@ -117,6 +127,11 @@ namespace DOAN.Model.BZFM.Dto
/// </summary>
public string Workorder { get; set; }
/// <summary>
/// 原材料工单号
/// </summary>
public string WorkorderRaw { get; set; }
/// <summary>
/// 1-蓝单正向 2-红单逆向
/// </summary>
@@ -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; }
}
}

6
DOAN.Model/MES/Material/MmRecordInbound.cs
View File

@@ -127,5 +127,11 @@ namespace DOAN.Model.BZFM
/// 工单号（一旦确定，不可更改）
/// </summary>
public string Workorder { get; set; }
/// <summary>
/// 原材料工单号
/// </summary>
[SugarColumn(ColumnName = "workorder_raw")]
public string WorkorderRaw { get; set; }
}
}

6
DOAN.Model/MES/Material/MmRecordOutbound.cs
View File

@@ -104,5 +104,11 @@ namespace DOAN.Model.BZFM
/// </summary>
public string Workorder { get; set; }
/// <summary>
/// 原材料工单号
/// </summary>
[SugarColumn(ColumnName = "workorder_raw")]
public string WorkorderRaw { get; set; }
}
}

3
DOAN.Service/MES/Product/ProWorkorderService.cs
View File

@@ -58,6 +58,7 @@ namespace DOAN.Service.MES.product
var predicate = Expressionable
.Create<ProWorkorder>()
.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<ProWorkorder>()
.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<ProWorkorder, ProWorkorderDto>(parm);
return query;