This commit is contained in:
quowingwang 2025-12-07 17:04:15 +08:00
parent b8bb7b318e
commit c8b7c06918
3 changed files with 10 additions and 10 deletions

View File

@ -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<PfRecipeParametersDto> RecipeParametersList { get; set; }
}

View File

@ -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; }
}
}

View File

@ -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<PfRecipeIssueLog>()
.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<PfRecipeVersionDto>(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);