|
|
@ -83,6 +83,17 @@ namespace SettleAccount.Job.Services.Report |
|
|
|
var _ls = new List<UnSettleDiff>(); |
|
|
|
_ls = _dapper.GetDiffReport(0,begin,end, materialCode,kenncode,chassisNumber,version); |
|
|
|
|
|
|
|
foreach (var itm in _ls) |
|
|
|
{ |
|
|
|
if (itm.KENNCode.Length > 8) |
|
|
|
{ |
|
|
|
itm.UNSettleQty = 1; |
|
|
|
itm.DiffQty = 0; |
|
|
|
itm.DiffAmt = 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var _list = _ls.Where(p => p.ParentSapMaterialCode != p.SapMaterialCode && !string.IsNullOrEmpty(p.ParentSapMaterialCode)).GroupBy(p => new { p.ParentSapMaterialCode, p.ChassisNumber, p.KENNCode }) |
|
|
|
.Select(p => p.FirstOrDefault()).ToList(); |
|
|
|
|
|
|
@ -170,14 +181,7 @@ namespace SettleAccount.Job.Services.Report |
|
|
|
|
|
|
|
List<UnSettleDiff> _lsExport = new List<UnSettleDiff>(); |
|
|
|
|
|
|
|
foreach (var itm in _ls) |
|
|
|
{ |
|
|
|
if (itm.KENNCode.Length > 8) |
|
|
|
{ |
|
|
|
itm.UNSettleQty = 1; |
|
|
|
itm.DiffQty = 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
_ls = _ls.OrderBy(p => p.ChassisNumber).ThenBy(p => p.SapMaterialCode).ToList(); |
|
|
|
|
|
|
|