From c8b7c06918207194c8d242a8cc62d46bc5f14e5a Mon Sep 17 00:00:00 2001 From: quowingwang Date: Sun, 7 Dec 2025 17:04:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs | 2 +- DOAN.Model/MES/recipe/PfRecipeVersion.cs | 2 +- .../MES/recipe/PfRecipeVersionService.cs | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs b/DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs index 2e58e2c..c893669 100644 --- a/DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs +++ b/DOAN.Model/MES/recipe/Dto/PfRecipeVersionDto.cs @@ -45,7 +45,7 @@ namespace DOAN.Model.MES.recipe.Dto //配方下达状态 public int IssueStatus { get; set; } - public int Sequcence { get; set; } + public int Sequence { get; set; } public List RecipeParametersList { get; set; } } diff --git a/DOAN.Model/MES/recipe/PfRecipeVersion.cs b/DOAN.Model/MES/recipe/PfRecipeVersion.cs index ed38c7d..5fa9a74 100644 --- a/DOAN.Model/MES/recipe/PfRecipeVersion.cs +++ b/DOAN.Model/MES/recipe/PfRecipeVersion.cs @@ -54,6 +54,6 @@ namespace DOAN.Model.MES.recipe public DateTime? UpdatedTime { get; set; } [SugarColumn(ColumnName = "sequence")] - public int Sequcence { get; set; } + public int Sequence { 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 db0bb4f..d4c6a0e 100644 --- a/DOAN.Service/MES/recipe/PfRecipeVersionService.cs +++ b/DOAN.Service/MES/recipe/PfRecipeVersionService.cs @@ -35,13 +35,13 @@ namespace DOAN.Service.MES.recipe RecipeCode = t.RecipeCode, Version = t.Version, Status = t.Status, - Sequcence = t.Sequcence, + Sequence = t.Sequence, ProductCode = p.Productcode, ProductName = p.ProductName, IssueStatus = SqlFunc.Subqueryable() .Where(h => h.RecipeCode == t.RecipeCode && h.Version == t.Version) .Any() ? 1 : 0 - }).OrderByDescending(t => t.Sequcence); + }).OrderByDescending(t => t.Sequence); var response = query.ToPage(parm); return response; } @@ -111,13 +111,13 @@ namespace DOAN.Service.MES.recipe try { - int Sequcence = 1; + int Sequence = 1; var pfVersionMax = Queryable() - .Where(x => x.RecipeCode == parm.RecipeCode).OrderByDescending(x => x.Sequcence).First(); + .Where(x => x.RecipeCode == parm.RecipeCode).OrderByDescending(x => x.Sequence).First(); if (pfVersionMax != null) { - Sequcence = pfVersionMax.Sequcence; - Sequcence += 1; + Sequence = pfVersionMax.Sequence; + Sequence += 1; } var pfVersion = Queryable().Where(x => x.RecipeCode == parm.RecipeCode && x.Version == parm.Version).First(); if (pfVersion != null) @@ -129,7 +129,7 @@ namespace DOAN.Service.MES.recipe pfRecipeVersion.RecipeCode = parm.RecipeCode; pfRecipeVersion.Version = parm.Version; pfRecipeVersion.Status = parm.Status; - pfRecipeVersion.Sequcence = Sequcence; + pfRecipeVersion.Sequence = Sequence; pfRecipeVersion.CreatedBy = parm.CreatedBy; pfRecipeVersion.CreatedTime = parm.CreatedTime; pfRecipeVersion.UpdatedBy = parm.UpdatedBy; @@ -172,7 +172,7 @@ namespace DOAN.Service.MES.recipe public ApiResult QuerylatestVersion(PfRecipeVersionQueryDto parm) { var pfVersionMax = Queryable() - .Where(x => x.RecipeCode == parm.RecipeCode).OrderByDescending(x => x.Sequcence).First(); + .Where(x => x.RecipeCode == parm.RecipeCode).OrderByDescending(x => x.Sequence).First(); if (pfVersionMax == null) { return ApiResult.Success("操作成功!", null);