diff --git a/DOAN.Model/MES/Base/BaseWorkRoute.cs b/DOAN.Model/MES/Base/BaseWorkRoute.cs index 328d069..33fab2e 100644 --- a/DOAN.Model/MES/Base/BaseWorkRoute.cs +++ b/DOAN.Model/MES/Base/BaseWorkRoute.cs @@ -18,11 +18,14 @@ namespace DOAN.Model.MES.base_ /// 名称 /// public string Name { get; set; } + + public string Code { get; set; } /// - /// 编号 + /// 产成品编号 /// - public string Code { get; set; } + [SugarColumn(ColumnName = "production_code")] + public string ProductionCode{ get; set; } [SugarColumn(IsIgnore =true)] public List BaseWorkProcessesList { get; set; } diff --git a/DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs b/DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs index 1b4f2c8..2ea5c8c 100644 --- a/DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs +++ b/DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs @@ -12,6 +12,8 @@ namespace DOAN.Model.MES.base_.Dto public string Code { get; set; } public int? Status { get; set; } + + public string ProductionCode{ get; set; } } /// @@ -25,6 +27,8 @@ namespace DOAN.Model.MES.base_.Dto public string Name { get; set; } public string Code { get; set; } + + public string ProductionCode{ get; set; } public string LogicFlowData { get; set; } diff --git a/DOAN.Service/MES/Base/BaseWorkRouteService.cs b/DOAN.Service/MES/Base/BaseWorkRouteService.cs index 8eca54c..9907a80 100644 --- a/DOAN.Service/MES/Base/BaseWorkRouteService.cs +++ b/DOAN.Service/MES/Base/BaseWorkRouteService.cs @@ -38,6 +38,7 @@ namespace DOAN.Service.MES.base_ .Create() .AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name)) .AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code)) + .AndIF(!string.IsNullOrEmpty(parm.ProductionCode), it => it.Code.Contains(parm.ProductionCode)) .AndIF(parm.Status > -1, it => it.Status == parm.Status); var response = Queryable() .Where(predicate.ToExpression())