diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
index 53d962d9..eb845b1c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
@@ -602,7 +602,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
IExporter _excel = new ExcelExporter();
byte[] result = null;
- var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
+ var _fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString());
result = await _excel.ExportAsByteArray(entities);
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
index fba12e6d..d87b5a7b 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
@@ -276,7 +276,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
itm.Version,
string.Empty,
string.Empty,
- itm.InvoiceQty+itm.ClaimQty+itm.CP7ScrapQty,
+ itm.InvoiceQty-itm.ClaimQty,
tm1==null?0:tm1.Qty,
itm.InvoiceQty,
string.Empty,
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index e281402b..84a683ce 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -2371,13 +2371,6 @@
-
-
- 导出
-
-
-
-
结算包与散件对应关系服务
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
index 4bbecff0..ba6acaff 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
@@ -136,22 +136,27 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
TaskId=taskid;
}
-
+ [ExporterHeader(DisplayName = "出库库位")]
[ImporterHeader(Name = "出库库位", IsIgnore = true)]
//出库库位
public string OutPut { set; get; }
[ImporterHeader(Name = "入库库位", IsIgnore = true)]
+ [ExporterHeader(DisplayName = "入库库位")]
//入库库位
public string InPut { set; get; }
[ImporterHeader(Name = "状态")]
+ [ExporterHeader(DisplayName = "状态")]
public int State { get; set; }
[ImporterHeader(Name = "开票单价")]
+ [ExporterHeader(DisplayName = "开票单价")]
public decimal Price { set; get; }
[ImporterHeader(Name = "开票金额")]
+ [ExporterHeader(DisplayName = "开票金额")]
public decimal Amt { set; get; }
[ImporterHeader(Name = "开票单价",IsIgnore =true)]
+ [ExporterHeader(DisplayName = "开票单价")]
///
/// 扩展字段1
///
@@ -159,47 +164,51 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
///
/// 扩展字段2
///
+ [ExporterHeader(DisplayName = "开票金额")]
[ImporterHeader(Name = "开票金额", IsIgnore = true)]
public string Extend2 { set; get; }
///
/// 扩展字段3
///
+ [ExporterHeader(DisplayName = "版本号")]
[ImporterHeader(Name = "版本号", IsIgnore = true)]
public string Version { set; get; }
-
+ [ExporterHeader(DisplayName = "单号")]
[ImporterHeader(Name = "单号",IsIgnore =true)]
public string BillNum { set; get; }
-
+ [ExporterHeader(DisplayName = "任务号", IsIgnore = true)]
[ImporterHeader(Name = "任务号", IsIgnore = true)]
public Guid TaskId { set; get; }
-
+ [ExporterHeader(DisplayName = "交货单号")]
[ImporterHeader(Name = "交货单号", AutoTrim = true)]
public string WmsBillNum { set; get; }
-
+ [ExporterHeader(DisplayName = "KENN号")]
[ImporterHeader(Name = "KENN号")]
//KENN号
public string KennCode { set; get; }
+ [ExporterHeader(DisplayName = "底盘号")]
[ImporterHeader(Name = "底盘号", AutoTrim = true)]
//底盘号
public string ChassisNumber { set; get; }
+ [ExporterHeader(DisplayName = "物料号")]
[ImporterHeader(Name = "物料号", AutoTrim = true)]
//物料号
public string MaterialCode { set; get; }
-
+ [ExporterHeader(DisplayName = "组件组物料")]
[ImporterHeader(Name = "组件组物料",AutoTrim =true)]
//物料号
public string ParentMaterialCode { set; get; }
-
+ [ExporterHeader(DisplayName = "物料描述")]
[ImporterHeader(Name = "物料描述", AutoTrim = true)]
//物料描述
public string MaterialDesc { set; get; }
-
+ [ExporterHeader(DisplayName = "物料组(车型)")]
[ImporterHeader(Name = "物料组(车型)", AutoTrim = true)]
//物料组(车型)
public string MaterialGroup { set; get; }
-
+ [ExporterHeader(DisplayName = "结算数量")]
[ImporterHeader(Name = "结算数量")]
public decimal Qty { set; get; }