配料重量

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

@@ -280,6 +280,16 @@
             添加时间
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Entitys.Pztj_BucketMaterialsRecordEntity.Weight">
+            <summary>
+            重量
+            </summary>
+        </member>
+        <member name="P:BPA.MES.Base.Application.Entitys.Pztj_BucketMaterialsRecordEntity.WorkId">
+            <summary>
+            工单Id
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Entitys.Pztj_CraftsInfoEntity">
             <summary>
             名    称 ：胖子天骄工艺基础信息  
@@ -2400,6 +2410,16 @@
             添加时间
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordDto.Weight">
+            <summary>
+            物料重量
+            </summary>
+        </member>
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordDto.WorkId">
+            <summary>
+            工单Id
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Services.BucketMaterialsRecordUpdateInput">
             <summary>
             更新
@@ -2435,6 +2455,11 @@
             桶Id
             </summary>
         </member>
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordQueryInput.BucketCode">
+            <summary>
+            桶编号
+            </summary>
+        </member>
         <member name="T:BPA.MES.Base.Application.Services.BucketMaterialsRecordQueryPageInput">
             <summary>
             分页
@@ -2480,14 +2505,19 @@
             桶名称
             </summary>
         </member>
-        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordOutput.WorkId">
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordOutput.WorkName">
             <summary>
-            工单Id
+            工单名称
             </summary>
         </member>
-        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordOutput.WorkName">
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordOutput.BucketCode">
             <summary>
-            工单名称
+            桶编码
+            </summary>
+        </member>
+        <member name="P:BPA.MES.Base.Application.Services.BucketMaterialsRecordOutput.SchemeWeight">
+            <summary>
+            计划重量
             </summary>
         </member>
         <member name="T:BPA.MES.Base.Application.Services.BucketInfoService">

backend/BPA.MES.Base.Application/Entitys/App/Pztj_BucketMaterialsRecordEntity.cs

@@ -21,5 +21,13 @@
         /// 添加时间
         /// </summary>
         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 重量
+        /// </summary>
+        public string Weight { get; set; }
+        /// <summary>
+        /// 工单Id
+        /// </summary>
+        public string WorkId { get; set; }
     }
 }

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

@@ -20,6 +20,14 @@
         /// 添加时间
         /// </summary>
         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 物料重量
+        /// </summary>
+        public string Weight { get; set; }
+        /// <summary>
+        /// 工单Id
+        /// </summary>
+        public string WorkId { get; set; }
     }
     public class BucketMaterialsRecordAddInput : BucketMaterialsRecordDto
     {
@@ -108,10 +116,6 @@
         /// </summary>
         public string BucketName { get; set; }
         /// <summary>
-        /// 工单Id
-        /// </summary>
-        public string WorkId { get; set; }
-        /// <summary>
         /// 工单名称
         /// </summary>
         public string WorkName { get; set; }
@@ -119,6 +123,9 @@
         /// 桶编码
         /// </summary>
         public string BucketCode { get; set; }
-        
+        /// <summary>
+        /// 计划重量
+        /// </summary>
+        public string SchemeWeight { get; set; }
     }
 }

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

@@ -22,8 +22,13 @@
         [HttpPost]
         public async Task<bool> Add(BucketMaterialsRecordAddInput input)
         {
-            
             Pztj_BucketMaterialsRecordEntity entity = input.Adapt<Pztj_BucketMaterialsRecordEntity>();
+            var work_entity =await _dbContext.Queryable<WorkInfoMaterialsRecordEntity>().FirstAsync(x => x.Id == input.MaterialId);
+            if (work_entity==null)
+            {
+                throw Oops.Bah("没有找到此物料信息!");
+            }
+            entity.WorkId = work_entity.WorkId;
             return await _dbContext.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandIdentityIntoEntityAsync();
         }
         /// <summary>
@@ -68,8 +73,13 @@
                 .WhereIF(!string.IsNullOrEmpty(input.BucketCode),(a,b,c)=>c.Code==input.BucketCode)
                 .Select((a, b, c, d) => new BucketMaterialsRecordOutput
                 {
-                    Id = a.Id.SelectAll(),
-                    WorkId = b.WorkId,
+                    Id = a.Id,
+                    MaterialId = a.MaterialId,
+                    BucketId = a.BucketId,
+                    Weight = a.Weight,
+                    CreateTime = a.CreateTime,
+                    SchemeWeight = b.Weight,
+                    WorkId = c.Id,
                     MaterialName = b.MaterialName,
                     BucketName = c.Name,
                     WorkName = b.RecipeName,