收货接口优化

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -995,6 +995,26 @@
             明细备注
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest">
+            <summary>
+            箱信息和任务单绑定
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest.Id">
+            <summary>
+            ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest.TaskId">
+            <summary>
+            入库任务单ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest.BoxId">
+            <summary>
+            箱信息ID
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest">
             <summary>
             修改-入库任务单-明细对象
@@ -1030,6 +1050,11 @@
             单据ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest.Boxs">
+            <summary>
+            箱集合
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest.Details">
             <summary>
             明细

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -410,6 +410,11 @@
             入库时间(上架时间)
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Entitys.InStockTask.Boxs">
+            <summary>
+            箱信息集合
+            </summary>
+        </member>
         <member name="F:WMS.Web.Domain.Entitys.InStockTask.Details">
             <summary>
             明细
@@ -439,6 +444,27 @@
             </summary>
             <param name="creatorId"></param>
         </member>
+        <member name="T:WMS.Web.Domain.Entitys.InStockTaskBox">
+            <summary>
+            erp入库任务单的对应box箱信息表
+             比例是：1:N  ，一个任务单对应多个box箱号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockTaskBox.Id">
+            <summary>
+            Id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockTaskBox.TaskId">
+            <summary>
+            入库任务单ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockTaskBox.BoxId">
+            <summary>
+            箱号ID
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.InStockTaskDetails">
             <summary>
             erp入库任务明细表

src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.InStockTask
+{
+    /// <summary>
+    /// 箱信息和任务单绑定
+    /// </summary>
+    public class UpdateInStockTaskBoxRequest : EntityBase
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public override int Id { get; set; } = 0;
+        /// <summary>
+        /// 入库任务单ID
+        /// </summary>
+        public int TaskId { get; set; }
+
+        /// <summary>
+        /// 箱信息ID
+        /// </summary>
+        public int BoxId { get; set; }
+    }
+}

src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskRequest.cs

@@ -16,6 +16,12 @@ namespace WMS.Web.Core.Dto.InStockTask
         [Required(ErrorMessage = "唯一编号不能未空")]
         public int Id { get; set; }
 
+        /// <summary>
+        /// 箱集合
+        /// </summary>
+        public List<UpdateInStockTaskBoxRequest> Boxs { get; set; } = new List<UpdateInStockTaskBoxRequest>();
+
+
         /// <summary>
         /// 明细
         /// </summary>

src/WMS.Web.Domain/Entitys/InStockTaskBox.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+using WMS.Web.Core;
+
+namespace WMS.Web.Domain.Entitys
+{
+    /// <summary>
+    /// erp入库任务单的对应box箱信息表
+    ///  比例是：1:N  ，一个任务单对应多个box箱号
+    /// </summary>
+    [Serializable]
+    [Table("t_erp_instock_task_box")]
+    public class InStockTaskBox:EntityBase
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public override int Id { get; set; }
+
+        /// <summary>
+        /// 入库任务单ID
+        /// </summary>
+        public int TaskId { get; set; }
+
+        /// <summary>
+        /// 箱号ID
+        /// </summary>
+        public int BoxId { get; set; }
+    }
+}

src/WMS.Web.Domain/Entitys/InstockTask.cs

@@ -50,6 +50,11 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public DateTime? ShelfTime { get; set; }
 
+        /// <summary>
+        /// 箱信息集合
+        /// </summary>
+        public List<InStockTaskBox> Boxs = new List<InStockTaskBox>();
+
         /// <summary>
         /// 明细
         /// </summary>

src/WMS.Web.Domain/Mappers/InStockMapper.cs

@@ -20,6 +20,7 @@ namespace WMS.Web.Domain.Mappers
              .ForMember(x => x.Details, opt => opt.Ignore())
              .ReverseMap();
             CreateMap<UpdateInStockTaskDetailsRequest, InStockTaskDetails>().ReverseMap();
+            CreateMap<UpdateInStockTaskBoxRequest, InStockTaskBox>().ReverseMap();
 
             CreateMap<SaveInStockDetailsRequest, InStockDetails>().ReverseMap();
 

src/WMS.Web.Domain/Services/InStockService.cs

@@ -150,6 +150,8 @@ namespace WMS.Web.Domain.Services
 
             entity = _mapper.Map(dto, entity);
             //子集单独映射
+            entity.Boxs = _mapper.ToMapList(dto.Boxs, entity.Boxs);
+            //子集单独映射
             entity.Details = _mapper.ToMapList(dto.Details, entity.Details);
             if (isReceive)
                 entity.Receive(staffId);

src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs

@@ -126,11 +126,19 @@ namespace WMS.Web.Repositories.Configuration
             {
                 ent.ToTable("t_erp_instock_task");
                 ent.HasKey(x => x.Id);
-
                 ent.HasMany(p => p.Details)
                  .WithOne()
                  .HasForeignKey(p => p.Fid)
                  .OnDelete(DeleteBehavior.Cascade);
+                ent.HasMany(p => p.Boxs)
+                 .WithOne()
+                 .HasForeignKey(p => p.TaskId)
+                 .OnDelete(DeleteBehavior.Cascade);
+            });
+            builder.Entity<InStockTaskBox>(ent =>
+            {
+                ent.ToTable("t_erp_instock_task_box");
+                ent.HasKey(x => x.Id);
             });
             builder.Entity<InStockTaskDetails>(ent =>
             {
@@ -226,6 +234,7 @@ namespace WMS.Web.Repositories.Configuration
         public DbSet<InStock> Instock { get; set; }
         public DbSet<InStockDetails> InStockDetails { get; set; }
         public DbSet<InStockTask> InStockTask { get; set; }
+        public DbSet<InStockTaskBox> InstockTaskBox { get; set; }
         public DbSet<InStockTaskDetails> InStockTaskDetails { get; set; }
         public DbSet<BackRecord> BackRecord { get; set; }
         public DbSet<BackRecordDetails> BackRecordDetails { get; set; }