|
|
|
|
@ -2007,7 +2007,7 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
|
}
|
|
|
|
|
var bill = from a in wmsBaseLocations
|
|
|
|
|
from b in rawStock
|
|
|
|
|
where a.containerCode == b.palletInfoCode
|
|
|
|
|
where a.containerCode == b.palletInfoCode && b.materialId == order.MaterialId && b.saleOrderId == (order.SaleOrderId == null ? 0 : order.SaleOrderId)
|
|
|
|
|
select new { a, b };
|
|
|
|
|
//如果第一列满足需求,则按第一列排序,否则按最后一列排序
|
|
|
|
|
if (bill.Where(t => t.a.locRow == index).Select(t => t.b.totalAmount - t.b.frozenAmount).Sum() >= needNumber)
|
|
|
|
|
|