RIZO/Valeo_Line_MES_backend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG修改

Browse Source
This commit is contained in:
quowingwang 2026-01-23 21:14:11 +08:00
parent 79d4c95be1
commit 5d847999b7
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
MDM/Services/Material/MaterialBomService.cs
View File

@ -52,34 +52,43 @@ namespace MDM.Services.Material
{ {
var predicate = Expressionable.Create<MaterialBom>() var predicate = Expressionable.Create<MaterialBom>()
.AndIF(!string.IsNullOrEmpty(parm.InvCode), it => it.InvCode.Contains(parm.InvCode)) .AndIF(!string.IsNullOrEmpty(parm.InvCode), it => it.InvCode.Contains(parm.InvCode))
.AndIF(!string.IsNullOrEmpty(parm.SubInvCode), it => it.SubInvCode.Contains(parm.SubInvCode)) .AndIF(!string.IsNullOrEmpty(parm.SubInvCode), it => it.SubInvCode.Contains(parm.SubInvCode));
;
var query = Context.Queryable<MaterialBom>() var query = Context.Queryable<MaterialBom>()
.Where(predicate.ToExpression()) .Where(predicate.ToExpression())
.GroupBy(it => it.InvCode) .GroupBy(it => it.InvCode)
.Select(it => new MaterialBomDto() .Select(it => new MaterialBomDto()
{ {
Id = SqlFunc.AggregateMax(it.Id),
InvCode = SqlFunc.AggregateMax(it.InvCode),
InvName = SqlFunc.AggregateMax(it.InvName),
SubInvName = SqlFunc.AggregateMax(it.SubInvName),
Iusequantity = SqlFunc.AggregateMax(it.Iusequantity),
BOMVersion = SqlFunc.AggregateMax(it.BOMVersion),
CreatedBy = SqlFunc.AggregateMax(it.CreatedBy),
// 改动1：注释掉CreatedTime聚合（临时避开）
// CreatedTime = SqlFunc.AggregateMax(it.CreatedTime),
UpdatedBy = SqlFunc.AggregateMax(it.UpdatedBy),
UpdatedTime = SqlFunc.AggregateMax(it.UpdatedTime)
})
// 改动2：手动指定用UpdatedTime（数据库列updated_time）排序，避开CreatedTime
.OrderBy("MAX(updated_time) DESC");
//Id = SqlFunc.AggregateMax(it.Id), // 匹配你的PagedInfo类的分页逻辑
InvCode = it.InvCode, int pageIndex = 1;
InvName = SqlFunc.AggregateMax(it.InvName), int pageSize = 10;
SubInvName = SqlFunc.AggregateMax(it.SubInvName), int totalNum = query.Count();
Iusequantity = SqlFunc.AggregateMax(it.Iusequantity),
BOMVersion = SqlFunc.AggregateMax(it.BOMVersion),
CreatedBy = SqlFunc.AggregateMax(it.CreatedBy),
//CreatedTime = SqlFunc.AggregateMax(it.CreatedTime),
UpdatedBy = SqlFunc.AggregateMax(it.UpdatedBy),
UpdatedTime = SqlFunc.AggregateMax(it.UpdatedTime)
}).OrderBy(it => SqlFunc.AggregateMax(it.CreatedTime), OrderByType.Desc);
var response = query.ToPage<MaterialBomDto, MaterialBomDto>(parm);
var response = new PagedInfo<MaterialBomDto>()
{
PageIndex = pageIndex,
PageSize = pageSize,
TotalNum = totalNum,
Result = query.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList(),
Extra = new Dictionary<string, object>()
};
return response; return response;
} }
/// <summary> /// <summary>