diff --git a/backend/BPA.MES.Base.Application/Services/BucketInfoService/Dtos/BucketMaterialsRecordDto.cs b/backend/BPA.MES.Base.Application/Services/BucketInfoService/Dtos/BucketMaterialsRecordDto.cs index 06c4565..24e13d6 100644 --- a/backend/BPA.MES.Base.Application/Services/BucketInfoService/Dtos/BucketMaterialsRecordDto.cs +++ b/backend/BPA.MES.Base.Application/Services/BucketInfoService/Dtos/BucketMaterialsRecordDto.cs @@ -58,6 +58,10 @@ /// 桶Id /// public string BucketId { get; set; } + /// + /// 桶编号 + /// + public string BucketCode { get; set; } } /// /// 分页 @@ -111,6 +115,10 @@ /// 工单名称 /// public string WorkName { get; set; } + /// + /// 桶编码 + /// + public string BucketCode { get; set; } } } diff --git a/backend/BPA.MES.Base.Application/Services/BucketInfoService/Services/BucketMaterialsRecordServcie.cs b/backend/BPA.MES.Base.Application/Services/BucketInfoService/Services/BucketMaterialsRecordServcie.cs index 197e11e..ac0b4aa 100644 --- a/backend/BPA.MES.Base.Application/Services/BucketInfoService/Services/BucketMaterialsRecordServcie.cs +++ b/backend/BPA.MES.Base.Application/Services/BucketInfoService/Services/BucketMaterialsRecordServcie.cs @@ -65,6 +65,7 @@ .LeftJoin((a,b,c,d)=>b.WorkId==d.Id) .WhereIF(!string.IsNullOrEmpty(input.BucketId), (a, b, c) => a.BucketId == input.BucketId) .WhereIF(!string.IsNullOrEmpty(input.WorkId), (a, b, c) => b.WorkId == b.WorkId) + .WhereIF(!string.IsNullOrEmpty(input.BucketCode),(a,b,c)=>c.Code==input.BucketCode) .Select((a, b, c, d) => new BucketMaterialsRecordOutput { Id = a.Id.SelectAll(), @@ -72,6 +73,7 @@ MaterialName = b.MaterialName, BucketName = c.Name, WorkName = b.RecipeName, + BucketCode = c.Code }) .ToListAsync(); return output;