diff --git a/DOAN.Admin.WebApi/Controllers/MES/recipe/PfRecipeTemplateController.cs b/DOAN.Admin.WebApi/Controllers/MES/recipe/PfRecipeTemplateController.cs index 23a6dc1..2bf35a9 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/recipe/PfRecipeTemplateController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/recipe/PfRecipeTemplateController.cs @@ -91,7 +91,7 @@ namespace DOAN.WebApi.Controllers.MES.recipe [Log(Title = "配方模板表", BusinessType = BusinessType.DELETE)] public IActionResult DeletePfRecipeTemplate([FromRoute]string ids) { - var idArr = Tools.SplitAndConvert(ids); + var idArr = int.Parse(ids); return ToResponse(_PfRecipeTemplateService.Delete(idArr)); } diff --git a/DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs b/DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs index a9dcb87..5c4648c 100644 --- a/DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs +++ b/DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs @@ -43,7 +43,7 @@ namespace DOAN.Model.MES.recipe.Dto public DateTime? UpdatedTime { get; set; } - + public int Ifcheck { get; set; } } } \ No newline at end of file diff --git a/DOAN.Model/MES/recipe/Dto/PfRecipeTemplateDto.cs b/DOAN.Model/MES/recipe/Dto/PfRecipeTemplateDto.cs index 46fadad..d5cbbbc 100644 --- a/DOAN.Model/MES/recipe/Dto/PfRecipeTemplateDto.cs +++ b/DOAN.Model/MES/recipe/Dto/PfRecipeTemplateDto.cs @@ -39,5 +39,7 @@ namespace DOAN.Model.MES.recipe.Dto public int sequence { get; set; } + public int Ifcheck { get; set; } + } } \ No newline at end of file diff --git a/DOAN.Model/MES/recipe/PfRecipeParameters.cs b/DOAN.Model/MES/recipe/PfRecipeParameters.cs index 52c3fbd..a6ee266 100644 --- a/DOAN.Model/MES/recipe/PfRecipeParameters.cs +++ b/DOAN.Model/MES/recipe/PfRecipeParameters.cs @@ -82,5 +82,8 @@ namespace DOAN.Model.MES.recipe [SugarColumn(ColumnName = "updated_time")] public DateTime? UpdatedTime { get; set; } + [SugarColumn(ColumnName = "ifcheck")] + public int Ifcheck { get; set; } + } } \ No newline at end of file diff --git a/DOAN.Model/MES/recipe/PfRecipeTemplate.cs b/DOAN.Model/MES/recipe/PfRecipeTemplate.cs index 2c23a1e..3dd5ac1 100644 --- a/DOAN.Model/MES/recipe/PfRecipeTemplate.cs +++ b/DOAN.Model/MES/recipe/PfRecipeTemplate.cs @@ -73,5 +73,8 @@ namespace DOAN.Model.MES.recipe [SugarColumn(ColumnName = "sequence")] public int Sequence { get; set; } + + [SugarColumn(ColumnName = "ifcheck")] + public int Ifcheck { get; set; } } } \ No newline at end of file diff --git a/DOAN.Service/MES/recipe/PfRecipeParametersService.cs b/DOAN.Service/MES/recipe/PfRecipeParametersService.cs index 40b871a..ad61b10 100644 --- a/DOAN.Service/MES/recipe/PfRecipeParametersService.cs +++ b/DOAN.Service/MES/recipe/PfRecipeParametersService.cs @@ -39,7 +39,7 @@ namespace DOAN.Service.MES.recipe public PfRecipeParameters GetInfo(int ParamId) { var response = Queryable() - .Where(x => x.ParamId == ParamId) + .Where(x => x.Id == ParamId) .First(); return response; diff --git a/DOAN.Service/MES/recipe/PfRecipeTemplateService.cs b/DOAN.Service/MES/recipe/PfRecipeTemplateService.cs index 76c925b..b6b0d0f 100644 --- a/DOAN.Service/MES/recipe/PfRecipeTemplateService.cs +++ b/DOAN.Service/MES/recipe/PfRecipeTemplateService.cs @@ -25,6 +25,7 @@ namespace DOAN.Service.MES.recipe var response = Queryable() .Where(predicate.ToExpression()) + .OrderBy(x => x.Sequence) .ToPage(parm); return response;