diff --git a/MDM/Models/Process/Dto/ProcessParameterDto.cs b/MDM/Models/Process/Dto/ProcessParameterDto.cs index 62145ac..598489d 100644 --- a/MDM/Models/Process/Dto/ProcessParameterDto.cs +++ b/MDM/Models/Process/Dto/ProcessParameterDto.cs @@ -18,6 +18,7 @@ namespace MDM.Model.Process.Dto public string? ParameterCode { get; set; } public string? ParameterName { get; set; } + public string? WorkOrderCode { get; set; } public DateTime? StartTime { get; set; } public DateTime? EndTime { get; set; } @@ -31,7 +32,8 @@ namespace MDM.Model.Process.Dto public ProcessParameterDto() { } //工艺参数ID,主键不能为空 public int Id { get; set; } - + [ExcelColumn(Name = "工单编码")] + public string WorkOrderCode { get; set; } //所属工艺路线code不能为空 [ExcelColumn(Name = "工艺编码")] public string FkRoutingCode { get; set; } diff --git a/MDM/Models/Process/ProcessParameter.cs b/MDM/Models/Process/ProcessParameter.cs index 163fcde..41358a7 100644 --- a/MDM/Models/Process/ProcessParameter.cs +++ b/MDM/Models/Process/ProcessParameter.cs @@ -130,5 +130,10 @@ namespace MDM.Model.Process [SugarColumn(ColumnName = "updated_by")] public string UpdatedBy { get; set; } + /// + /// 关联主表工单编码 + /// + [SugarColumn(ColumnName = "work_order_code")] + public string WorkOrderCode { get; set; } } } \ No newline at end of file diff --git a/MDM/Services/Process/ProcessParameterService.cs b/MDM/Services/Process/ProcessParameterService.cs index 922e95b..36a6bb9 100644 --- a/MDM/Services/Process/ProcessParameterService.cs +++ b/MDM/Services/Process/ProcessParameterService.cs @@ -26,8 +26,7 @@ namespace MDM.Services.Process .AndIF(!string.IsNullOrEmpty(parm.FkOperationCode), it => it.FkOperationCode.Contains(parm.FkOperationCode)) .AndIF(!string.IsNullOrEmpty(parm.ParameterCode), it => it.ParameterCode.Contains(parm.ParameterCode)) .AndIF(!string.IsNullOrEmpty(parm.ParameterName), it => it.ParameterName.Contains(parm.ParameterName)) - - + .AndIF(!string.IsNullOrEmpty(parm.WorkOrderCode), it => it.WorkOrderCode.Contains(parm.WorkOrderCode)) ; var response = Queryable()