Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs

@@ -165,12 +165,12 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 itm.SapMaterialCode,
                 itm.MaterialDesc,
                 itm.Version,
-                string.Empty,
+                itm.IsBack,
                 string.Empty,
                 itm.Qty,
                 tm1 == null ? 0 : tm1.Qty,
                 itm.Qty,
-                string.Empty,
+                itm.Extend,
                 itm.BillNum,
                 itm.State,
                 itm.RealityNumber,

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs

@@ -627,8 +627,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         [ImporterHeader(Name = "版本号")]
         [ExporterHeader(DisplayName = "版本号")]
         public string Version { set; get; }
-        [ImporterHeader(Name = "是否备件", IsIgnore = true)]
+        [ImporterHeader(Name = "是否备件")]
-        [ExporterHeader(DisplayName = "是否备件", IsIgnore = true)]
+        [ExporterHeader(DisplayName = "是否备件")]
         public string IsBack { set; get; }
         [ImporterHeader(Name = "结算数量")]
         [ExporterHeader(DisplayName = "结算数量")]
@@ -644,8 +644,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         [ImporterHeader(Name = "出库数量", IsIgnore = true)]
         [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
         public decimal OutputQty { set; get; }
-        [ImporterHeader(Name = "Extend", IsIgnore = true)]
+        [ImporterHeader(Name = "客户")]
-        [ExporterHeader(DisplayName = "Extend", IsIgnore = true)]
+        [ExporterHeader(DisplayName = "客户")]
         public string Extend { set; get; }
         [ImporterHeader(Name = "BillNum", IsIgnore = true)]
         [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)]