1 year ago
parent 5f64dfee86
commit f31843d810

@ -2186,9 +2186,10 @@ namespace Khd.Core.Wcs.Wcs
{
if (index == 1)
{
if (bill.Where(t => t.b.totalAmount - t.b.frozenAmount > needNumber).Any())
if (bill.Where(t => t.b.totalAmount - t.b.frozenAmount >= needNumber).Any())
{
bill = bill.OrderBy(t => t.a.locRow).ThenBy(t => t.a.locColumn)
.Where(t => t.b.totalAmount - t.b.frozenAmount >= needNumber)
.OrderBy(t => t.b.totalAmount - t.b.frozenAmount)
.ToList();
}
@ -2201,10 +2202,11 @@ namespace Khd.Core.Wcs.Wcs
}
else
{
if (bill.Where(t => t.b.totalAmount - t.b.frozenAmount > needNumber).Any())
if (bill.Where(t => t.b.totalAmount - t.b.frozenAmount >= needNumber).Any())
{
bill = bill.OrderByDescending(t => t.a.locRow).ThenBy(t => t.a.locColumn)
.OrderBy(t => t.b.totalAmount - t.b.frozenAmount)
.Where(t => t.b.totalAmount - t.b.frozenAmount >= needNumber)
.ToList();
}
else
@ -2220,10 +2222,11 @@ namespace Khd.Core.Wcs.Wcs
bill = bill.OrderByDescending(t => t.a.locRow).ThenBy(t => t.a.locColumn).ToList();
if (index == 1)
{
if (bill.Where(t => t.b.totalAmount - t.b.frozenAmount > needNumber).Any())
if (bill.Where(t => t.b.totalAmount - t.b.frozenAmount >= needNumber).Any())
{
bill = bill.OrderByDescending(t => t.a.locRow).ThenBy(t => t.a.locColumn)
.OrderBy(t => t.b.totalAmount - t.b.frozenAmount)
.Where(t => t.b.totalAmount - t.b.frozenAmount >= needNumber)
.ToList();
}
else
@ -2235,10 +2238,11 @@ namespace Khd.Core.Wcs.Wcs
}
else
{
if (bill.Where(t => t.b.totalAmount - t.b.frozenAmount > needNumber).Any())
if (bill.Where(t => t.b.totalAmount - t.b.frozenAmount >= needNumber).Any())
{
bill = bill.OrderBy(t => t.a.locRow).ThenBy(t => t.a.locColumn)
.OrderBy(t => t.b.totalAmount - t.b.frozenAmount)
.Where(t => t.b.totalAmount - t.b.frozenAmount >= needNumber)
.ToList();
}
else

Loading…
Cancel
Save