Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
18be46f737
  1. 10
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs
  2. 3
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs

10
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs

@ -74,7 +74,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
}
public virtual List<SalesStockSum> GetSalesStockSum()
public virtual List<SalesStockSum> GetSalesStockSum(string version)
{
string str =
"SELECT A\n" +
@ -90,15 +91,16 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" PartGroup \n" +
" FROM\n" +
" [ VIEW_PG_SIMPLE_PART ] \n" +
" ) B ON A.PartCode = B.PartCode";
" ) B ON A.PartCode = B.PartCode where a.version='{0}'";
str = string.Format(str, version);
var _list = DbConnection.Query<SalesStockSum>(str);
return _list.ToList();
}
//public virtual Dictionary<string,decimal> GetSapList<T>(List<T> childList, string version, bool isNotHistoryPart = false) where T : ReportDetailBase, new()
//{

3
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs

@ -288,13 +288,14 @@ namespace SettleAccount.Job.Services.Report
public List<UnSettledSum> GetReport(Guid id, List<string> exportName, List<CustomCondition> p_list)
{
var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
List<UnSettledSum> _ls = new List<UnSettledSum>();
_ls.AddRange(GetFisSum(id, exportName, p_list));
_ls.AddRange(GetHQKanbanSum(id, exportName, p_list));
_ls.AddRange(GetKanbanSum(id, exportName, p_list));
var _lst = _wmsDapper.GetSalesStockSum();
var _lst = _wmsDapper.GetSalesStockSum(version);
var query = from itm in _lst
join itm1 in _ls
on new { Version = itm.Version, PartCode = itm.PartCode } equals new { Version = itm1., PartCode = itm1. }

Loading…
Cancel
Save