Browse Source

更新版本

branch_ccpg_220107
Administrator 3 years ago
parent
commit
8c5d9abe13
  1. 4
      src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
  2. 20
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs

4
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 = "BegingTime", Value = input.Begin.ToString() });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End.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; 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 = "BegingTime", Value = input.Begin.ToString() });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = input.End.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; return _taskid;

20
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; } public string InPut { set; get; }
[ImporterHeader(Name = "状态")] [ImporterHeader(Name = "状态")]
public int State { get; set; } public int State { get; set; }
[ImporterHeader(Name = "扩展字段1", IsIgnore = true)] [ImporterHeader(Name = "客户物料")]
/// <summary> /// <summary>
/// 扩展字段1 /// 扩展字段1
/// </summary> /// </summary>
@ -294,7 +294,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public string InPut { set; get; } public string InPut { set; get; }
[ImporterHeader(Name = "状态")] [ImporterHeader(Name = "状态")]
public int State { get; set; } public int State { get; set; }
[ImporterHeader(Name = "扩展字段1", IsIgnore = true)] [ImporterHeader(Name = "客户物料")]
/// <summary> /// <summary>
/// 扩展字段1 /// 扩展字段1
/// </summary> /// </summary>
@ -400,7 +400,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
//KENN号 //KENN号
public string OrderBillNum { set; get; } public string OrderBillNum { set; get; }
[ImporterHeader(Name = "物料号")] [ImporterHeader(Name = "SAP编码")]
//物料号 //物料号
public string MaterialCode { set; get; } public string MaterialCode { set; get; }
[ImporterHeader(Name = "物料描述")] [ImporterHeader(Name = "物料描述")]
@ -409,15 +409,15 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[ImporterHeader(Name = "物料组(车型)")] [ImporterHeader(Name = "物料组(车型)")]
//物料组(车型) //物料组(车型)
public string MaterialGroup { set; get; } public string MaterialGroup { set; get; }
[ImporterHeader(Name = "出库库位")] [ImporterHeader(Name = "出库库位",IsIgnore =true)]
//出库库位 //出库库位
public string OutPut { set; get; } public string OutPut { set; get; }
[ImporterHeader(Name = "入库库位")] [ImporterHeader(Name = "入库库位",IsIgnore =true)]
//入库库位 //入库库位
public string InPut { set; get; } public string InPut { set; get; }
[ImporterHeader(Name = "状态")] [ImporterHeader(Name = "状态",IsIgnore =true)]
public int State { get; set; } public int State { get; set; }
[ImporterHeader(Name = "扩展字段1")] [ImporterHeader(Name = "物料代码")]
/// <summary> /// <summary>
/// 扩展字段1 /// 扩展字段1
/// </summary> /// </summary>
@ -425,14 +425,14 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
/// <summary> /// <summary>
/// 扩展字段2 /// 扩展字段2
/// </summary> /// </summary>
[ImporterHeader(Name = "扩展字段2")] [ImporterHeader(Name = "扩展字段2",IsIgnore =true)]
public string Extend2 { set; get; } public string Extend2 { set; get; }
/// <summary> /// <summary>
/// 扩展字段3 /// 扩展字段3
/// </summary> /// </summary>
[ImporterHeader(Name = "版本号")] [ImporterHeader(Name = "版本号",IsIgnore =true)]
public string Version { set; get; } public string Version { set; get; }
[ImporterHeader(Name = "数量")] [ImporterHeader(Name = "开票数量")]
public decimal? Qty { set; get; } public decimal? Qty { set; get; }
[ImporterHeader(Name = "数量", IsIgnore = true)] [ImporterHeader(Name = "数量", IsIgnore = true)]

Loading…
Cancel
Save