PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
a2d343b8eb
commit
cabfca3f2f
3 changed files with 25 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs
  2. 44
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
  3. 5
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs

6
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/TaskListDto.cs
View File

@ -202,7 +202,7 @@ namespace Win.Sfs.SettleAccount.Entities
[ExporterHeader(DisplayName = "BillNum", IsIgnore = true)]
public string BillNum { set; get; }
[ImporterHeader(Name = "状态", IsIgnore = true)]
[ExporterHeader(DisplayName = "状态", IsIgnore = true)]
[ExporterHeader(DisplayName = "状态")]
public int State { set; get; }
[ImporterHeader(Name = "开票单价")]
[ExporterHeader(DisplayName = "开票单价")]
@ -211,9 +211,7 @@ namespace Win.Sfs.SettleAccount.Entities
[ImporterHeader(Name = "开票金额")]
[ExporterHeader(DisplayName = "开票金额")]
public decimal Amt { set; get; }
}
/// <summary>

44
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsOutputSumDapperRepository.cs
View File

@ -375,7 +375,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsJitOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" GROUP BY\n" +
" BillNum,\n" +
" MaterialCode,\n" +
@ -395,7 +395,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsKanbanOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" GROUP BY\n" +
" BillNum,\n" +
" MaterialCode,\n" +
@ -415,7 +415,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" GROUP BY\n" +
" BillNum,\n" +
" SapMaterialCode,\n" +
@ -435,7 +435,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsSharePartOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" GROUP BY\n" +
" BillNum,\n" +
" MaterialCode,\n" +
@ -455,7 +455,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsSharePart90OutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" GROUP BY\n" +
" BillNum,\n" +
" MaterialCode,\n" +
@ -475,7 +475,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsHQHKanbanOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" GROUP BY\n" +
" BillNum,\n" +
" MaterialCode,\n" +
@ -496,7 +496,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsHQWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" IsBack = 0 \n" +
" AND VERSION = '{0} AND STATE<>4' \n" +
" AND VERSION = '{0}' AND STATE<>4 \n" +
" AND Extend = '100113' \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -519,7 +519,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsHQWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" IsBack = 1 \n" +
" AND VERSION = '{0} AND STATE<>4' \n" +
" AND VERSION = '{0}' AND STATE<>4 \n" +
" AND Extend = '100113' \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -542,7 +542,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsHQWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" IsBack = 0 \n" +
" AND VERSION = '{0} AND STATE<>4' \n" +
" AND VERSION = '{0}' AND STATE<>4 \n" +
" AND Extend = '100053' \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -565,7 +565,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsHQWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" IsBack = 1 \n" +
" AND VERSION = '{0} AND STATE<>4' \n" +
" AND VERSION = '{0}' AND STATE<>4 \n" +
" AND Extend = '100053' \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -589,7 +589,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsOneTimeSaleOutPutDetial\n" +
" WHERE\n" +
" \n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" GROUP BY\n" +
" BillNum,\n" +
" SapMaterialCode,\n" +
@ -635,7 +635,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsJitOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -656,7 +656,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsKanbanOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -677,7 +677,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -698,7 +698,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsSharePartOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -719,7 +719,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsSharePart90OutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -740,7 +740,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" +
" Set_WmsHQHKanbanOutPutDetial \n" +
" WHERE\n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" GROUP BY\n" +
" BillNum,\n" +
@ -762,7 +762,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsHQWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" IsBack = 0 \n" +
" AND VERSION = '{0} AND STATE<>4' \n" +
" AND VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" AND Extend = '100113' \n" +
" GROUP BY\n" +
@ -786,7 +786,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsHQWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" IsBack = 1 \n" +
" AND VERSION = '{0} AND STATE<>4' \n" +
" AND VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" AND Extend = '100113' \n" +
" GROUP BY\n" +
@ -810,7 +810,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsHQWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" IsBack = 0 \n" +
" AND VERSION = '{0} AND STATE<>4' \n" +
" AND VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" AND Extend = '100053' \n" +
" GROUP BY\n" +
@ -834,7 +834,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsHQWithOutKanbanOutPutDetial \n" +
" WHERE\n" +
" IsBack = 1 \n" +
" AND VERSION = '{0} AND STATE<>4' \n" +
" AND VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" AND Extend = '100053' \n" +
" GROUP BY\n" +
@ -859,7 +859,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WmsOneTimeSaleOutPutDetial\n" +
" WHERE\n" +
" \n" +
" VERSION = '{0} AND STATE<>4' \n" +
" VERSION = '{0}' AND STATE<>4 \n" +
" AND State = 2 \n" +
" GROUP BY\n" +
" BillNum,\n" +

5
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs
View File

@ -241,7 +241,7 @@ namespace SettleAccount.Job.Services.Report
var _filename = exportName.FirstOrDefault();
var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value;
//var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value;
var begin = p_list.Where(p => p.Name == "Begin").FirstOrDefault().Value;
var end = p_list.Where(p => p.Name == "End").FirstOrDefault().Value;
var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
@ -303,9 +303,6 @@ namespace SettleAccount.Job.Services.Report
库位 = tm == null ? "" : tm.LocCode,
本月减少 = tm == null ? "" : tm.OutQty.ToString(),
本月增加 = tm == null ? "" : tm.InQty.ToString(),
};

Write Preview
Loading…
Cancel
Save