|
|
@ -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.物料号 } |
|
|
|