|
|
|
|
@ -663,7 +663,8 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
|
//totalOutstockAmount = g.Sum(t => t.outstockAmount),
|
|
|
|
|
totalOutstockAmount = g.Key.outstockAmount,
|
|
|
|
|
//totalRealOutstockAmount = g.Sum(t => t.realOutstockAmount)
|
|
|
|
|
totalRealOutstockAmount = g.Key.realOutstockAmount
|
|
|
|
|
totalRealOutstockAmount = g.Key.realOutstockAmount,
|
|
|
|
|
applyTime = g.Max(t => t.applyDate)
|
|
|
|
|
}).ToList();
|
|
|
|
|
|
|
|
|
|
//本次所有任务出来的托盘号
|
|
|
|
|
@ -681,7 +682,8 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
|
saleOrderId = g.Key.saleOrderId,
|
|
|
|
|
PalletInfoCode = g.Key.palletInfoCode,
|
|
|
|
|
//携带总可用库存
|
|
|
|
|
canUseAmount = g.Sum(x => x.totalAmount) - g.Sum(x => x.frozenAmount)
|
|
|
|
|
canUseAmount = g.Sum(x => x.totalAmount) - g.Sum(x => x.frozenAmount),
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
.ToList();
|
|
|
|
|
|
|
|
|
|
@ -700,7 +702,8 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
|
.Where(pallet => pallet.MaterialId == order.materialId)
|
|
|
|
|
.Select(pallet => $"托盘{pallet.PalletInfoCode}数量{string.Format("{0:0.00}", pallet.canUseAmount)}")
|
|
|
|
|
),
|
|
|
|
|
EndStationCodes = endStations.Where(t => t.rawOutstockId == order.rawOutStocketId).FirstOrDefault()?.endStationCode
|
|
|
|
|
EndStationCodes = endStations.Where(t => t.rawOutstockId == order.rawOutStocketId).FirstOrDefault()?.endStationCode,
|
|
|
|
|
ApplyTime = order.applyTime,
|
|
|
|
|
//EndStationCodes = string.Join(",", endStations.Where(t => t.materialId == order.materialId && t.orderId == order.saleOrderId).Select(t => t.endStationCode).ToList())
|
|
|
|
|
}).ToList();
|
|
|
|
|
var list1 = new List<string>();
|
|
|
|
|
@ -728,7 +731,8 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
|
realOutstockAmount = string.Format("{0:0.00}", r.RealOutstockAmount),
|
|
|
|
|
isSendOver = r.RequestedAmount <= r.RealOutstockAmount ? "已出完" : "未出完",
|
|
|
|
|
thisOutAmount = r.PalletDetails,
|
|
|
|
|
EndStationCodes = r.EndStationCodes
|
|
|
|
|
EndStationCodes = r.EndStationCodes,
|
|
|
|
|
ApplyTime = r.ApplyTime,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
@ -779,7 +783,7 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
this.OutTaskNumber.ItemsSource = orderNumber.OrderBy(t => t.EndStationCodes.Contains(list1[0]) ? 1 : 99);
|
|
|
|
|
this.OutTaskNumber.ItemsSource = orderNumber.OrderBy(t => t.EndStationCodes.Contains(list1[0]) ? 1 : 99); //.OrderByDescending(x=>x.ApplyTime);
|
|
|
|
|
}
|
|
|
|
|
catch
|
|
|
|
|
{
|
|
|
|
|
|