查询桶信息

backend/BPA.MES.Base.Application/BPA.MES.Base.Application.xml

@@ -2420,6 +2420,21 @@
             主键
             </summary>
         </member>
+        <member name="T:BPA.MES.Base.Application.Services.BucketMaterialsRecordQueryInput">
+            <summary>
+            不分页
+            </summary>
+        </member>
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordQueryInput.WorkId">
+            <summary>
+            工单Id
+            </summary>
+        </member>
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordQueryInput.BucketId">
+            <summary>
+            桶Id
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Services.BucketMaterialsRecordQueryPageInput">
             <summary>
             分页
@@ -2465,6 +2480,16 @@
             桶名称
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordOutput.WorkId">
+            <summary>
+            工单Id
+            </summary>
+        </member>
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordOutput.WorkName">
+            <summary>
+            工单名称
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Services.BucketInfoService">
             <summary>
             名    称 ：桶服务 
@@ -2563,7 +2588,7 @@
             <returns></returns>
             <exception cref="T:System.NotImplementedException"></exception>
         </member>
-        <member name="M:BPA.MES.Base.Application.Services.BucketMaterialsRecordServcie.List">
+        <member name="M:BPA.MES.Base.Application.Services.BucketMaterialsRecordServcie.List(BPA.MES.Base.Application.Services.BucketMaterialsRecordQueryInput)">
             <summary>
             列表
             </summary>
@@ -2675,7 +2700,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:BPA.MES.Base.Application.Services.IBucketMaterialsRecordService.List">
+        <member name="M:BPA.MES.Base.Application.Services.IBucketMaterialsRecordService.List(BPA.MES.Base.Application.Services.BucketMaterialsRecordQueryInput)">
             <summary>
             不分页列表
             </summary>

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

@@ -46,6 +46,20 @@
         public string Id { get; set; }
     }
     /// <summary>
+    /// 不分页
+    /// </summary>
+    public class BucketMaterialsRecordQueryInput
+    {
+        /// <summary>
+        /// 工单Id
+        /// </summary>
+        public string WorkId { get; set; }
+        /// <summary>
+        /// 桶Id
+        /// </summary>
+        public string BucketId { get; set; }
+    }
+    /// <summary>
     /// 分页
     /// </summary>
     public class BucketMaterialsRecordQueryPageInput : RequestPage
@@ -89,6 +103,14 @@
         /// 桶名称
         /// </summary>
         public string BucketName { get; set; }
+        /// <summary>
+        /// 工单Id
+        /// </summary>
+        public string WorkId { get; set; }
+        /// <summary>
+        /// 工单名称
+        /// </summary>
+        public string WorkName { get; set; }
         
     }
 }

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

@@ -56,11 +56,24 @@
         /// </summary>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        [HttpGet]
-        public async Task<List<BucketMaterialsRecordOutput>> List()
+        [HttpPost]
+        public async Task<List<BucketMaterialsRecordOutput>> List(BucketMaterialsRecordQueryInput input)
         {
-            var entity = await _dbContext.Queryable<Pztj_BucketMaterialsRecordEntity>().ToListAsync();
-            List<BucketMaterialsRecordOutput> output = entity.Adapt<List<BucketMaterialsRecordOutput>>();
+            var output = await _dbContext.Queryable<Pztj_BucketMaterialsRecordEntity>()
+                .LeftJoin<WorkInfoMaterialsRecordEntity>((a, b) => a.MaterialId == b.Id)
+                .LeftJoin<Pztj_BucketInfoEntity>((a, b, c) => a.BucketId == c.Id)
+                .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)
+                .Select((a, b, c, d) => new BucketMaterialsRecordOutput
+                {
+                    Id = a.Id.SelectAll(),
+                    WorkId = b.WorkId,
+                    MaterialName = b.MaterialName,
+                    BucketName = c.Name,
+                    WorkName = b.RecipeName,
+                })
+                .ToListAsync();
             return output;
         }
         /// <summary>

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

@@ -27,7 +27,7 @@
         /// 不分页列表
         /// </summary>
         /// <returns></returns>
-        Task<List<BucketMaterialsRecordOutput>> List();
+        Task<List<BucketMaterialsRecordOutput>> List(BucketMaterialsRecordQueryInput input);
         /// <summary>
         /// 分页列表
         /// </summary>