diff --git a/DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs b/DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs index 018e827..a7be75f 100644 --- a/DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs +++ b/DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs @@ -42,6 +42,9 @@ namespace DOAN.Model.MES.recipe.Dto public string ProductName { get; set; } + //配方下达状态 + public int IssueStatus { get; set; } + public List RecipeParametersList { get; set; } } } \ No newline at end of file diff --git a/DOAN.Service/MES/recipe/PfRecipeVersionService.cs b/DOAN.Service/MES/recipe/PfRecipeVersionService.cs index f27c312..875c9b3 100644 --- a/DOAN.Service/MES/recipe/PfRecipeVersionService.cs +++ b/DOAN.Service/MES/recipe/PfRecipeVersionService.cs @@ -35,7 +35,10 @@ namespace DOAN.Service.MES.recipe Version = t.Version, Status = t.Status, ProductCode = p.Productcode, - ProductName = p.ProductName + ProductName = p.ProductName, + IssueStatus = SqlFunc.Subqueryable() + .Where(h => h.RecipeCode == t.RecipeCode && h.Version == t.Version) + .Any() ? 1 : 0 }); var response = query.ToPage(parm); return response;