调整出库任务单结构

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

@@ -168,10 +168,13 @@ namespace WMS.Web.Domain.Entitys
                 if (detail_new != null)
                 {
                     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);
+                    foreach (var erpd in d.ErpDetails)
+                    {
+                        var cd = erpd.Clone();
+                        cd.Id = 0;cd.DetailId = 0;
+                        detail_new.ErpDetails.Add(cd);
+                    }
+                   
                 }
                 else
                     details_new.Add(d);

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

@@ -28,22 +28,6 @@ namespace WMS.Web.Domain.Entitys
         [Column("Fid")]
         public int Fid { get; set; }
         /// <summary>
-        /// 对应金蝶单据明细id(销售出库同步金蝶下推使用)
-        /// </summary>
-        [Column("Erp_DetailId")]
-        public int Erp_DetailId { get; set; }
-        /// <summary>
-        /// 来源单号(合并后有多个)
-        ///</summary> 
-        [Column("SourceBillNo")]
-        public List<string> SourceBillNos { get; set; }
-       
-        /// <summary>
-        /// 销售订单号
-        ///</summary> 
-        [Column("SaleBillNo")]
-        public List<string> SaleBillNos { get; set; }
-        /// <summary>
         /// 物料Id
         ///</summary> 
         [Column("MaterialId")]
@@ -69,16 +53,6 @@ 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")]
@@ -93,7 +67,10 @@ namespace WMS.Web.Domain.Entitys
         ///</summary> 
         [Column("OutStockEndTime")]
         public DateTime? OutStockEndTime { get; set; }
-
+        /// <summary>
+        /// 对应erp明细 同一个物料 存在于不同的来源单中(合并后出现多条)
+        /// </summary>
+        public List<OutStockTaskErpDetails> ErpDetails { get; set; } = new List<OutStockTaskErpDetails>();
 
     }
 }

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

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+using WMS.Web.Core;
+
+namespace WMS.Web.Domain.Entitys
+{
+    /// <summary>
+    /// 对应金蝶的明细
+    /// </summary>
+    [Serializable]
+    [Table("t_erp_outstock_task_erp_details")]
+    public class OutStockTaskErpDetails : EntityBase
+    {
+        public OutStockTaskErpDetails() { }
+        /// <summary>
+        /// 主键 订单编号
+        /// </summary>
+        [Column("Id")]
+        public override int Id { get; set; }
+        /// <summary>
+        /// 任务单明细Id
+        /// </summary>
+        [Column("DetailId")]
+        public int DetailId { get; set; }
+        /// <summary>
+        /// 对应金蝶单据明细id(销售出库同步金蝶下推使用)
+        /// </summary>
+        [Column("Erp_DetailId")]
+        public int Erp_DetailId { get; set; }
+        /// <summary>
+        /// 来源单号
+        ///</summary> 
+        [Column("SourceBillNo")]
+        public string SourceBillNo { get; set; }
+        /// <summary>
+        /// 销售订单号
+        ///</summary> 
+        [Column("SaleBillNo")]
+        public string SaleBillNo { get; set; }
+        /// <summary>
+        /// 应出库数量
+        ///</summary> 
+        [Column("AccruedQty")]
+        public decimal AccruedQty { get; set; }
+        /// <summary>
+        /// 已出库数量
+        ///</summary> 
+        [Column("RealityQty")]
+        public decimal RealityQty { get; set; }
+    }
+}