diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs index 24047cb6..16951a2e 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs @@ -143,7 +143,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin.ToString() }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End.ToString() }); - var _taskid = await _service.ExportEnqueueAsync("大众看板结算与交货核对明细表", ExportExtentsion.Excel,input.Version ,string.Empty,CurrentUser, typeof(SettleKBWithCodeExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("看板结算输出", ExportExtentsion.Excel,input.Version ,string.Empty,CurrentUser, typeof(SettleKBWithCodeExportService), customConditionList, (rs) => { }); return _taskid; @@ -167,7 +167,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = input.Begin.ToString() }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End.ToString() }); - var _taskid = await _service.ExportEnqueueAsync("大众无看板号库存核对明细表", ExportExtentsion.Excel, input.Version, string.Empty, CurrentUser, typeof(SettleKBWithOutCodeExportService), customConditionList, (rs) => + var _taskid = await _service.ExportEnqueueAsync("备件结算输出", ExportExtentsion.Excel, input.Version, string.Empty, CurrentUser, typeof(SettleKBWithOutCodeExportService), customConditionList, (rs) => { }); return _taskid; 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 5a288fba..caec5273 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs @@ -137,7 +137,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string InPut { set; get; } [ImporterHeader(Name = "状态")] public int State { get; set; } - [ImporterHeader(Name = "扩展字段1", IsIgnore = true)] + [ImporterHeader(Name = "客户物料")] /// /// 扩展字段1 /// @@ -294,7 +294,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS public string InPut { set; get; } [ImporterHeader(Name = "状态")] public int State { get; set; } - [ImporterHeader(Name = "扩展字段1", IsIgnore = true)] + [ImporterHeader(Name = "客户物料")] /// /// 扩展字段1 /// @@ -400,7 +400,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS //KENN号 public string OrderBillNum { set; get; } - [ImporterHeader(Name = "物料号")] + [ImporterHeader(Name = "SAP编码")] //物料号 public string MaterialCode { set; get; } [ImporterHeader(Name = "物料描述")] @@ -409,15 +409,15 @@ namespace Win.Sfs.SettleAccount.Entities.WMS [ImporterHeader(Name = "物料组(车型)")] //物料组(车型) public string MaterialGroup { set; get; } - [ImporterHeader(Name = "出库库位")] + [ImporterHeader(Name = "出库库位",IsIgnore =true)] //出库库位 public string OutPut { set; get; } - [ImporterHeader(Name = "入库库位")] + [ImporterHeader(Name = "入库库位",IsIgnore =true)] //入库库位 public string InPut { set; get; } - [ImporterHeader(Name = "状态")] + [ImporterHeader(Name = "状态",IsIgnore =true)] public int State { get; set; } - [ImporterHeader(Name = "扩展字段1")] + [ImporterHeader(Name = "物料代码")] /// /// 扩展字段1 /// @@ -425,14 +425,14 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// /// 扩展字段2 /// - [ImporterHeader(Name = "扩展字段2")] + [ImporterHeader(Name = "扩展字段2",IsIgnore =true)] public string Extend2 { set; get; } /// /// 扩展字段3 /// - [ImporterHeader(Name = "版本号")] + [ImporterHeader(Name = "版本号",IsIgnore =true)] public string Version { set; get; } - [ImporterHeader(Name = "数量")] + [ImporterHeader(Name = "开票数量")] public decimal? Qty { set; get; } [ImporterHeader(Name = "数量", IsIgnore = true)]