baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
master
范 1 year ago
parent 5f64dfee86
commit f31843d810
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File

12
src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save