From d8c2526e504b525330a4b2131e51bad751792cc3 Mon Sep 17 00:00:00 2001
From: yanko <747575620@qq.com>
Date: Fri, 24 Nov 2023 15:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=B6=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BucketInfoService/Dtos/BucketMaterialsRecordDto.cs    | 8 ++++++++
 .../Services/BucketMaterialsRecordServcie.cs              | 2 ++
 2 files changed, 10 insertions(+)

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