桶编号

backend/BPA.MES.Base.Application/Services/BucketInfoService/Dtos/BucketMaterialsRecordDto.cs

@@ -58,6 +58,10 @@
         /// 桶Id
         /// </summary>
         public string BucketId { get; set; }
+        /// <summary>
+        /// 桶编号
+        /// </summary>
+        public string BucketCode { get; set; }
     }
     /// <summary>
     /// 分页
@@ -111,6 +115,10 @@
         /// 工单名称
         /// </summary>
         public string WorkName { get; set; }
+        /// <summary>
+        /// 桶编码
+        /// </summary>
+        public string BucketCode { get; set; }
         
     }
 }

backend/BPA.MES.Base.Application/Services/BucketInfoService/Services/BucketMaterialsRecordServcie.cs

@@ -65,6 +65,7 @@
                 .LeftJoin<Pztj_WorkInfoEntity>((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;