liuwf 8 months ago
parent a6f9b55c33
commit 211444568f

@ -249,7 +249,8 @@ namespace Khd.Core.Wpf.Form
} }
SystemData.PlcDic.TryAdd(plcConfig.Code, plc); SystemData.PlcDic.TryAdd(plcConfig.Code, plc);
} }
}; }
;
}); });
GetMenu(); GetMenu();
GetTask(); GetTask();
@ -3029,13 +3030,13 @@ namespace Khd.Core.Wpf.Form
} }
else else
{ {
if (wmsRawStock.safeFlag != "1") if (wmsRawStock.safeFlag != "1" && wmsRawStock.safeFlag != "0")
{ {
scanOutMsg.Text = "该条码不是安全库存,且无申请单,禁止出库!"; scanOutMsg.Text = "该条码不是安全库存,且无申请单,禁止出库!";
return; return;
} }
if (mesBaseBarcodeInfo.PurchaseOrderId == null) //if (mesBaseBarcodeInfo.PurchaseOrderId == null)
{ //{
wmsRawStock.totalAmount -= outScan; wmsRawStock.totalAmount -= outScan;
if (wmsRawStock.totalAmount == 0) if (wmsRawStock.totalAmount == 0)
{ {
@ -3100,18 +3101,18 @@ namespace Khd.Core.Wpf.Form
// dbContext.WmsRawOutstockDetail.Add(wmsProductOutstockDetail); // dbContext.WmsRawOutstockDetail.Add(wmsProductOutstockDetail);
//} //}
// dbContext.SaveChanges(); // dbContext.SaveChanges();
} //}
else //else
{ //{
scanOutMsg.Text = "该条码的销售订单不正确"; // scanOutMsg.Text = "该条码的销售订单不正确";
txtOutScan.Text = string.Empty; // txtOutScan.Text = string.Empty;
txtOutBarCode.Text = string.Empty; // txtOutBarCode.Text = string.Empty;
outMaterialSpecTxt.Text = string.Empty; // outMaterialSpecTxt.Text = string.Empty;
outMaterialNameTxt.Text = string.Empty; // outMaterialNameTxt.Text = string.Empty;
txtOutBox.Text = string.Empty; // txtOutBox.Text = string.Empty;
txtOutBox.Focus(); // txtOutBox.Focus();
return; // return;
} //}
} }
scanOutMsg.Text = "出库成功!"; scanOutMsg.Text = "出库成功!";
txtOutScan.Text = string.Empty; txtOutScan.Text = string.Empty;

Loading…
Cancel
Save