From d7484e070c2f1b285cc56fe91e7bf934c2422ad3 Mon Sep 17 00:00:00 2001 From: liuwf Date: Mon, 12 Aug 2024 19:00:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs index 6fa0695..036e912 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs @@ -4152,7 +4152,12 @@ namespace Khd.Core.Wpf.Form private void OutEnter(object sender, KeyEventArgs e) { - OutRaw(); + if (e.Key == Key.Enter) + { + // 触发按钮的点击事件 + OutRaw(); + } + } } } From 337127ad7818a7ec121fbc84b0c64b303e163d63 Mon Sep 17 00:00:00 2001 From: liuwf Date: Mon, 12 Aug 2024 19:43:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?change-=E4=BF=AE=E6=94=B9ctu=E5=A4=9A?= =?UTF-8?q?=E5=87=BA=E6=96=99=E7=AE=B1=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs index dd7e472..96b643c 100644 --- a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs +++ b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs @@ -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)