diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProjectManagement/ProjectManagementService.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProjectManagement/ProjectManagementService.cs index 992861e..8b7de68 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProjectManagement/ProjectManagementService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProjectManagement/ProjectManagementService.cs @@ -526,7 +526,7 @@ public class ProjectManagementService : IDynamicApiController, ITransient var configid = await _configurationsRep.AsQueryable().Where(x => x.ObjectId == 109 && x.ConfigSystemName == "mBOM").FirstAsync(); var materialData = await _obj109Rep.AsQueryable() - .Where(x => (x.CheckedStatus == 0 || x.CheckedStatus == 1) && x.deleted == false && x.IsLatestVersion == true && x.fld005040 == "发布" &&x.fld004510=="N" && x.fld004511 == "成功" && (x.fld004514 == "A" || x.fld004514 == "M")) + .Where(x => (x.CheckedStatus == 0 || x.CheckedStatus == 1) && x.deleted == false && x.IsLatestVersion == true && x.fld005040 == "发布" &&x.fld004510=="N" && x.fld004509 == "成功" && (x.fld004514 == "A" || x.fld004514 == "M")) .ToListAsync(); var groupedData = materialData.GroupBy(item => item.RecordGuid) .Select(group => group.OrderByDescending(item => item.VersionIndex).First()) @@ -756,7 +756,7 @@ public class ProjectManagementService : IDynamicApiController, ITransient //查询需要同步的产品 var materialData = await _obj109Rep.AsQueryable() - .Where(x => (x.CheckedStatus == 0 || x.CheckedStatus == 1) && x.deleted == false && x.IsLatestVersion == true && x.fld005040 == "发布" &&x.fld004510=="N" && x.fld004511 == "成功" && (x.fld004514 == "A" || x.fld004514 == "M")) + .Where(x => (x.CheckedStatus == 0 || x.CheckedStatus == 1) && x.deleted == false && x.IsLatestVersion == true && x.fld005040 == "发布" &&x.fld004510=="N" && x.fld004509 == "成功" && (x.fld004514 == "A" || x.fld004514 == "M")) .ToListAsync(); //分组查询最大版本的物料 var groupedData = materialData.GroupBy(item => item.RecordGuid)