diff --git a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs index 7714b89..92ccfff 100644 --- a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs +++ b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs @@ -1146,7 +1146,7 @@ namespace Khd.Core.Wcs.Wcs { } - BaseEquip startEquip = StaticData.BaseEquip.First(t => t.endStationCode == endStationCode); + BaseEquip startEquip = StaticData.BaseEquip.First(t => t.equipNo == endStationCode); List wmsRawReturns = dbContext.WmsRawReturn.Where(t => t.endStationCode == endStationCode) .Where(t => t.auditStatus == "1") .Where(t => t.executeStatus == "0" || t.executeStatus == "1") diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs index 06d9080..18ff12b 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs @@ -2849,14 +2849,6 @@ namespace Khd.Core.Wpf.Form item.executeStatus = "2"; item.endTime = DateTime.Now; } - if (wmsRawStock.totalAmount <= 0) - { - dbContext.Remove(wmsRawStock); - } - else - { - dbContext.Update(wmsRawStock); - } wmsRawStock.totalAmount -= outAmount; if (wmsRawStock.totalAmount == 0) {