调整出库任务单结构

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

@@ -1182,6 +1182,16 @@
              已出库数量
             </summary> 
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.RealityQty_Dic">
+             <summary>
+             已出库数量(合并后不同物料 分别出库多少)
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.AccruedQty_Dic">
+             <summary>
+             应出库数量(合并后不同物料 分别应出多少)
+            </summary> 
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.Remark">
              <summary>
              订单明细备注

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

@@ -170,6 +170,8 @@ namespace WMS.Web.Domain.Entitys
                     detail_new.AccruedQty += d.AccruedQty;//应出数量累加
                     detail_new.SaleBillNos.AddRange(d.SaleBillNos);
                     detail_new.SourceBillNos.AddRange(d.SourceBillNos);
+                    foreach (var dic in d.AccruedQty_Dic)
+                        detail_new.AccruedQty_Dic.Add(dic.Key, dic.Value);
                 }
                 else
                     details_new.Add(d);

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

@@ -69,6 +69,16 @@ namespace WMS.Web.Domain.Entitys
         [Column("RealityQty")]
         public decimal RealityQty { get; set; }
         /// <summary>
+        /// 已出库数量(合并后不同物料 分别出库多少)
+        ///</summary> 
+        [Column("RealityQty_Dic")]
+        public Dictionary<string, decimal> RealityQty_Dic { get; set; } = new Dictionary<string, decimal>();
+        /// <summary>
+        /// 应出库数量(合并后不同物料 分别应出多少)
+        ///</summary> 
+        [Column("AccruedQty_Dic")]
+        public Dictionary<string, decimal> AccruedQty_Dic { get; set; } = new Dictionary<string, decimal>();
+        /// <summary>
         /// 订单明细备注
         ///</summary> 
         [Column("Remark")]

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

@@ -25,7 +25,7 @@ namespace WMS.Web.Domain.Mappers
             CreateMap<OutStockTaskDetails, GetOutStockTaskByNoDetailsResponse>();
 
             CreateMap<ErpDeliveryNoticeOutStockResultDto, OutStockTaskDetails>()
-                .ForPath(x => x.SourceBillNos, ops => ops.MapFrom(x =>new List<string>() { x.SourceBillNo }))
+                .ForPath(x => x.SourceBillNos, ops => ops.MapFrom(x => new List<string>() { x.SourceBillNo }))
                  .ForPath(x => x.SaleBillNos, ops => ops.MapFrom(x => new List<string>() { x.SaleBillNo }));
         }
     }

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

@@ -110,9 +110,20 @@ namespace WMS.Web.Domain.Services
                     var detail = data.Details.FirstOrDefault(w => w.MaterialId == e.MaterialId);
                     //存在就修改,没有就添加
                     if (detail != null)
-                        detail.AccruedQty = e.AccruedQty;
+                    {
+                        if (detail.AccruedQty_Dic.ContainsKey(e.SourceBillNo))
+                            detail.AccruedQty_Dic[e.SourceBillNo] = e.AccruedQty;
+                        else
+                            detail.AccruedQty_Dic.Add(e.SourceBillNo, e.AccruedQty);
+                        //对集合里的应发做出累加
+                        detail.AccruedQty = detail.AccruedQty_Dic.Sum(s => s.Value);
+                    }
                     else
-                        data.Details.Add(_mapper.Map<OutStockTaskDetails>(e));
+                    {
+                        var de = _mapper.Map<OutStockTaskDetails>(e);
+                        de.AccruedQty_Dic.Add(de.SourceBillNos.First(), de.AccruedQty);
+                        data.Details.Add(de);
+                    }
 
                     erp_removeList.Add(e);
                 }
@@ -140,6 +151,8 @@ namespace WMS.Web.Domain.Services
                         var current_erp_details = erp_list.Where(x => x.SourceBillNo == item).ToList();
                         //给到dto的实体明细中
                         entity.Details = _mapper.Map<List<OutStockTaskDetails>>(current_erp_details);
+                        foreach (var de in entity.Details)
+                            de.AccruedQty_Dic.Add(de.SourceBillNos.First(), de.AccruedQty);
                         add_entitys.Add(entity);
                     }
                     //3.1提交新增

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

@@ -128,6 +128,14 @@ namespace WMS.Web.Repositories.Configuration
                 ent.Property(f => f.SaleBillNos).HasConversion(
         v => JsonConvert.SerializeObject(v),
         v => JsonConvert.DeserializeObject<List<string>>(v));
+
+                ent.Property(f => f.AccruedQty_Dic).HasConversion(
+        v => JsonConvert.SerializeObject(v),
+        v => JsonConvert.DeserializeObject<Dictionary<string, decimal>>(v));
+
+                ent.Property(f => f.RealityQty_Dic).HasConversion(
+        v => JsonConvert.SerializeObject(v),
+        v => JsonConvert.DeserializeObject<Dictionary<string, decimal>>(v));
             });
 
             #endregion