|
|
|
|
@ -2577,7 +2577,11 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
|
scanOutMsg.Text = "申请单里该条码无需出库!";
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(wmsRawStock.safeFlag!= "1")
|
|
|
|
|
{
|
|
|
|
|
scanOutMsg.Text = "该条码不是安全库存,且无申请单,禁止出库!";
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (mesBaseBarcodeInfo.PurchaseOrderId == null)
|
|
|
|
|
{
|
|
|
|
|
wmsRawStock.totalAmount -= outScan;
|
|
|
|
|
@ -2764,8 +2768,8 @@ namespace Khd.Core.Wpf.Form
|
|
|
|
|
materialSpec = c.MaterialSpec,
|
|
|
|
|
palletInfoCode = b.palletInfoCode,
|
|
|
|
|
//instockDate = b.instockDate,
|
|
|
|
|
totalAmount = b.totalAmount,
|
|
|
|
|
frozenAmount = b.frozenAmount,
|
|
|
|
|
totalAmount = Math.Round((decimal)b.totalAmount,2),
|
|
|
|
|
frozenAmount = Math.Round((decimal)b.frozenAmount, 2),
|
|
|
|
|
IsSelected = CallSelectedItem.Contains(a.locationId)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|