diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs index c284b5b..2373f3c 100644 --- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs +++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs @@ -18,6 +18,7 @@ using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Data; using System.Diagnostics; using System.IO.Ports; @@ -25,11 +26,11 @@ using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; -using Z.EntityFramework.Plus; -using System.Windows.Threading; -using System.Windows.Input; using System.Windows; using System.Windows.Controls; +using System.Windows.Input; +using System.Windows.Threading; +using Z.EntityFramework.Plus; namespace Khd.Core.Wpf.Form { @@ -60,6 +61,20 @@ namespace Khd.Core.Wpf.Form private int pageCount = 15; private object updateLock = new object(); + + private ObservableCollection itemsControlItems; + + //人工叫料选中类 + public class SelectItemModel + { + //料箱位置id + public long baseLocationId { get; set; } + //托盘号 + public string palletInfoCode { get; set; } + } + + + private void ScanMessage() { while (true) @@ -107,28 +122,32 @@ namespace Khd.Core.Wpf.Form { try { + + itemsControlItems = new ObservableCollection(); + itemsControl.ItemsSource = itemsControlItems; + + //连接PLC Task.Run(() => { + Thread.Sleep(2000); foreach (var plcConfig in SystemData.PlcConfigs) { if (!SystemData.PlcDic.Any(t => t.Key == plcConfig.Code)) { Plc.S7.Plc plc; plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot); - //try - //{ - // plc.Open(); - //} - //catch (Exception ex) - //{ - // LogManager.Error(ex); - //} + try + { + plc.Open(); + } + catch (Exception ex) + { + LogManager.Error(ex); + } SystemData.PlcDic.TryAdd(plcConfig.Code, plc); } }; - }); - GetMenu(); DispatcherTimer dispatcherTimer = new DispatcherTimer(); @@ -200,7 +219,7 @@ namespace Khd.Core.Wpf.Form } catch (Exception ex) { - HandyControl.Controls.MessageBox.Error("条码枪连接失败"); + MessageBox.Show("条码枪连接失败"); } @@ -234,7 +253,7 @@ namespace Khd.Core.Wpf.Form // //plc.Open(); // //if (!plc.IsConnected) // //{ - // // HandyControl.Controls.MessageBox.Show("PLC连接失败,重新连接"); + // // MessageBox.Show("PLC连接失败,重新连接"); // //} // //else // //{ @@ -267,7 +286,7 @@ namespace Khd.Core.Wpf.Form } catch (Exception ex) { - HandyControl.Controls.MessageBox.Error(ex.Message); + MessageBox.Show(ex.Message); } } @@ -503,7 +522,7 @@ namespace Khd.Core.Wpf.Form /// private void btnExit_Click(object sender, RoutedEventArgs e) { - if (HandyControl.Controls.MessageBox.Show("是否确认关闭程序", "提示信息", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes) + if (MessageBox.Show("是否确认关闭程序", "提示信息", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes) { System.Environment.Exit(System.Environment.ExitCode); } @@ -547,7 +566,7 @@ namespace Khd.Core.Wpf.Form // this.WcsTaskLogDataGrid.Items.Refresh(); // if (wcsTaskLogs.Count == 0) // { - // HandyControl.Controls.MessageBox.Show("未查询到数据"); + // MessageBox.Show("未查询到数据"); // } // } // catch (Exception ex) @@ -562,7 +581,7 @@ namespace Khd.Core.Wpf.Form // } // catch // { - // HandyControl.Controls.MessageBox.Show("PLC连接失败,无法读取任务"); + // MessageBox.Show("PLC连接失败,无法读取任务"); // } // } // } @@ -603,7 +622,7 @@ namespace Khd.Core.Wpf.Form this.LoadMaterial0.Items.Refresh(); if (data.Count == 0) { - HandyControl.Controls.MessageBox.Show("未查询到数据"); + MessageBox.Show("未查询到数据"); } } /// @@ -615,12 +634,12 @@ namespace Khd.Core.Wpf.Form { if (LoadMaterial0.SelectedIndex == -1) { - HandyControl.Controls.MessageBox.Show("请选择要删除的任务!"); + MessageBox.Show("请选择要删除的任务!"); } else { - MessageBoxResult MessageBoxResult = HandyControl.Controls.MessageBox.Show("确定要删除这些任务吗？", "提示信息", MessageBoxButton.YesNo); - if (MessageBoxResult == MessageBoxResult.Yes) + MessageBoxResult messageBoxResult = MessageBox.Show("确定要删除这些任务吗？", "提示信息", MessageBoxButton.YesNo); + if (messageBoxResult == MessageBoxResult.Yes) { using var scope = _host.Services.CreateScope(); using var dbContext = scope.ServiceProvider.GetRequiredService(); @@ -658,7 +677,7 @@ namespace Khd.Core.Wpf.Form { if (LoadMaterial0.SelectedIndex == -1) { - HandyControl.Controls.MessageBox.Show("请选择要完成的任务!"); + MessageBox.Show("请选择要完成的任务!"); } else { @@ -688,7 +707,7 @@ namespace Khd.Core.Wpf.Form this.LoadMaterial3.Items.Refresh(); if (data.Count == 0) { - HandyControl.Controls.MessageBox.Show("未查询到数据"); + MessageBox.Show("未查询到数据"); } } /// @@ -739,12 +758,12 @@ namespace Khd.Core.Wpf.Form this.LoadMaterial1.Items.Refresh(); if (data.Count == 0) { - HandyControl.Controls.MessageBox.Show("未查询到数据"); + MessageBox.Show("未查询到数据"); } } else { - HandyControl.Controls.MessageBox.Show("请选择仓库!"); + MessageBox.Show("请选择仓库!"); return; } } @@ -769,7 +788,7 @@ namespace Khd.Core.Wpf.Form // this.LoadMaterial.Items.Refresh(); // if (data.Count == 0) // { - // HandyControl.Controls.MessageBox.Show("未查询到数据"); + // MessageBox.Show("未查询到数据"); // } //} ///// @@ -781,7 +800,7 @@ namespace Khd.Core.Wpf.Form //{ // if (LoadMaterial.SelectedIndex == -1) // { - // HandyControl.Controls.MessageBox.Show("请选择要删除的指令!"); + // MessageBox.Show("请选择要删除的指令!"); // } // else // { @@ -803,7 +822,7 @@ namespace Khd.Core.Wpf.Form //{ // if (LoadMaterial.SelectedIndex == -1) // { - // HandyControl.Controls.MessageBox.Show("请选择要重发的指令!"); + // MessageBox.Show("请选择要重发的指令!"); // } // else // { @@ -848,11 +867,11 @@ namespace Khd.Core.Wpf.Form // }; // dbContext.Add(wmsRawOutstock); // dbContext.SaveChanges(); - // HandyControl.Controls.MessageBox.Show("料箱呼叫任务添加成功!"); + // MessageBox.Show("料箱呼叫任务添加成功!"); // } // else // { - // HandyControl.Controls.MessageBox.Show("请输入有效的数字"); + // MessageBox.Show("请输入有效的数字"); // } // } // } @@ -891,7 +910,7 @@ namespace Khd.Core.Wpf.Form // var mesInfo = dbContext.MesBaseBarcodeInfo.Where(t => t.barcodeInfo == txtBarCode.Text).FirstOrDefault(); // if (mesInfo == null) // { - // HandyControl.Controls.MessageBox.Show("请扫描正确的条码"); + // MessageBox.Show("请扫描正确的条码"); // return; // } // barcodeLsit.Add(mesInfo); @@ -919,12 +938,12 @@ namespace Khd.Core.Wpf.Form // var box = txtBox.Text; // if (string.IsNullOrEmpty(box)) // { - // HandyControl.Controls.MessageBox.Show("容器号不能为空!"); + // MessageBox.Show("容器号不能为空!"); // return; // } // if (barcodeLsit.Count == 0) // { - // HandyControl.Controls.MessageBox.Show("未扫描条码!"); + // MessageBox.Show("未扫描条码!"); // return; // } // using var scope = _host.Services.CreateScope(); @@ -932,7 +951,7 @@ namespace Khd.Core.Wpf.Form // WmsBaseLocation? wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512 && t.containerCode == box).FirstOrDefault(); // if (wmsBaseLocation == null) // { - // HandyControl.Controls.MessageBox.Show("容器号不存在!,请重新扫描!"); + // MessageBox.Show("容器号不存在!,请重新扫描!"); // return; // } // if (cbxType.Text == "入库") @@ -943,7 +962,7 @@ namespace Khd.Core.Wpf.Form // .Where(t => t.warehouseFloor == 5 && t.warehouseId == 512).ToList(); // if (wmsRawStocks.Count > 0) // { - // HandyControl.Controls.MessageBox.Show("该批次已入库!"); + // MessageBox.Show("该批次已入库!"); // return; // } // foreach (var item in barcodeLsit) @@ -978,12 +997,12 @@ namespace Khd.Core.Wpf.Form // } // else // { - // HandyControl.Controls.MessageBox.Show("该批次已入库!"); + // MessageBox.Show("该批次已入库!"); // return; // } // } // dbContext.SaveChanges(); - // HandyControl.Controls.MessageBox.Show("入库成功!"); + // MessageBox.Show("入库成功!"); // } // if (cbxType.Text == "出库") // { @@ -1013,7 +1032,7 @@ namespace Khd.Core.Wpf.Form // } // else // { - // HandyControl.Controls.MessageBox.Show("当前容器不存在当前扫描物料"); + // MessageBox.Show("当前容器不存在当前扫描物料"); // } // } @@ -1026,7 +1045,7 @@ namespace Khd.Core.Wpf.Form // .Where(t => t.warehouseFloor == 5 && t.warehouseId == 512).ToList(); // if (wmsRawStocks.Count > 0) // { - // HandyControl.Controls.MessageBox.Show("该批次已入库!"); + // MessageBox.Show("该批次已入库!"); // return; // } // foreach (var item in barcodeLsit) @@ -1061,12 +1080,12 @@ namespace Khd.Core.Wpf.Form // } // else // { - // HandyControl.Controls.MessageBox.Show("该批次已入库!"); + // MessageBox.Show("该批次已入库!"); // return; // } // } // dbContext.SaveChanges(); - // HandyControl.Controls.MessageBox.Show("回库成功!"); + // MessageBox.Show("回库成功!"); // } // barcodeLsit.Clear(); // txtScan.Text = string.Empty; @@ -1085,7 +1104,7 @@ namespace Khd.Core.Wpf.Form /// private void WindowClose_Click(object sender, RoutedEventArgs e) { - if (HandyControl.Controls.MessageBox.Show("是否确认关闭程序", "提示信息", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes) + if (MessageBox.Show("是否确认关闭程序", "提示信息", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes) { System.Environment.Exit(System.Environment.ExitCode); } @@ -1110,7 +1129,7 @@ namespace Khd.Core.Wpf.Form } catch (Exception ex) { - HandyControl.Controls.MessageBox.Error("打开软键盘时出错: " + ex.Message); + MessageBox.Show("打开软键盘时出错: " + ex.Message); } } /// @@ -1131,7 +1150,7 @@ namespace Khd.Core.Wpf.Form } catch (Exception ex) { - HandyControl.Controls.MessageBox.Error("打开软键盘时出错: " + ex.Message); + MessageBox.Show("打开软键盘时出错: " + ex.Message); } } /// @@ -1154,7 +1173,7 @@ namespace Khd.Core.Wpf.Form .FirstOrDefault(); if (wcsCmd == null) { - HandyControl.Controls.MessageBox.Error("未查询到当前有背负式Agv由装配区到捡料区任务"); + MessageBox.Show("未查询到当前有背负式Agv由装配区到捡料区任务"); } else { @@ -1174,12 +1193,12 @@ namespace Khd.Core.Wpf.Form } dbContext.Update(wcsCmd); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Success("背负式Agv任务确认完成成功"); + MessageBox.Show("背负式Agv任务确认完成成功"); } } catch (Exception ex) { - HandyControl.Controls.MessageBox.Error(ex.Message); + MessageBox.Show(ex.Message); } } /// @@ -1237,7 +1256,7 @@ namespace Khd.Core.Wpf.Form // var material = dbContext.WmsRawStock.Where(t => t.instockBatch == callMaterialId.Text).FirstOrDefault(); // if (material == null) // { - // HandyControl.Controls.MessageBox.Show("批次号不存在!"); + // MessageBox.Show("批次号不存在!"); // callMaterialId.Text = string.Empty; // } // else @@ -1263,7 +1282,7 @@ namespace Khd.Core.Wpf.Form { if (LoadMaterial0.SelectedIndex == -1) { - HandyControl.Controls.MessageBox.Show("请选择要开始的任务!"); + MessageBox.Show("请选择要开始的任务!"); } else { @@ -1289,7 +1308,7 @@ namespace Khd.Core.Wpf.Form } catch (Exception ex) { - HandyControl.Controls.MessageBox.Error(ex.Message); + MessageBox.Show(ex.Message); } } @@ -1312,17 +1331,67 @@ namespace Khd.Core.Wpf.Form /// private void CheckPersonBox_Click(object sender, RoutedEventArgs e) { + if (sender is CheckBox checkbox) { dynamic Currentselected = PersonCallMaterial.SelectedItem; if (checkbox.IsChecked != null && checkbox.IsChecked.Value) { + if(itemsControlItems!=null && itemsControlItems.Count >= 6) + { + MessageBox.Show("最多只能选择6个"); + checkbox.IsChecked = false; + return; + } CallSelectedItem.Add(Currentselected.baseLocationId); + + // 添加选中项 + string selectedItem = Currentselected.palletInfoCode; + + bool isIn = itemsControlItems.Any(t => t.baseLocationId == Currentselected.baseLocationId); + if (!isIn) + { + itemsControlItems.Add(new SelectItemModel { + baseLocationId = Currentselected.baseLocationId, + palletInfoCode = Currentselected.palletInfoCode + }); + + } } else { CallSelectedItem.Remove(Currentselected.baseLocationId); + + + // 删除选中项 + SelectItemModel model = itemsControlItems.FirstOrDefault(x => x.baseLocationId == Currentselected.baseLocationId); + if (model != null) + { + itemsControlItems.Remove(model); + } } + + + } + } + + /// + /// 删除选中的值 + /// + /// + /// + private void DeleteButton_Click(object sender, RoutedEventArgs e) + { + // 获取点击按钮的实例 + Button button = sender as Button; + + // 从按钮的 Tag 属性中获取当前数据项 + SelectItemModel itemToRemove = button.Tag as SelectItemModel; + + if (itemToRemove != null) + { + // 从集合中移除数据项 + itemsControlItems.Remove(itemToRemove); } } /// @@ -1415,14 +1484,14 @@ namespace Khd.Core.Wpf.Form WcsTask? wcsTask = dbContext.WcsTask.FirstOrDefault(t => t.nextPointId == 11 && t.taskType == 29); if (wcsTask == null) { - HandyControl.Controls.MessageBox.Info("未查询到当前有CTU入库任务!"); + MessageBox.Show("未查询到当前有CTU入库任务!"); } else { wcsTask.CTUExecute = "1"; dbContext.WcsTask.Update(wcsTask); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Info("CTU入库任务确认完成成功!"); + MessageBox.Show("CTU入库任务确认完成成功!"); } } catch @@ -1465,25 +1534,25 @@ namespace Khd.Core.Wpf.Form { try { - + if (!string.IsNullOrEmpty(txtInBox.Text) && !string.IsNullOrEmpty(txtInBarCode.Text)) { using var scope = _host.Services.CreateScope(); using var dbContext = scope.ServiceProvider.GetRequiredService(); if (txtInScan.Text == "") { - HandyControl.Controls.MessageBox.Error("请先输入数量"); return; + MessageBox.Show("请先输入数量"); return; } decimal amount = decimal.Parse(txtInScan.Text); // 计算入库后当前总数量，仅用来提示使用 decimal? totalMessage = 0; if (amount <= 0) { - HandyControl.Controls.MessageBox.Error("入库数量需大于0"); + MessageBox.Show("入库数量需大于0"); return; } var material = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtInBarCode.Text); - + var container = dbContext.WmsBaseLocation.FirstOrDefault(t => t.containerCode == txtInBox.Text && t.warehouseId == 512); List wmsRawStocks = dbContext.WmsRawStock .Where(t => txtInBarCode.Text == t.instockBatch) @@ -1495,15 +1564,20 @@ namespace Khd.Core.Wpf.Form txtInBox.Text = string.Empty; txtInBarCode.Text = string.Empty; txtInScan.Text = string.Empty; - + materialName.Text = string.Empty; + materialSpec.Text = string.Empty; return; } + + if (material == null) { MsgText.Text = "未查询到该条码内容!"; txtInBox.Text = string.Empty; txtInBarCode.Text = string.Empty; txtInScan.Text = string.Empty; + materialName.Text = string.Empty; + materialSpec.Text = string.Empty; txtInBox.Focus(); return; } @@ -1516,17 +1590,20 @@ namespace Khd.Core.Wpf.Form txtInBox.Text = string.Empty; txtInBarCode.Text = string.Empty; txtInScan.Text = string.Empty; + materialName.Text = string.Empty; + materialSpec.Text = string.Empty; txtInBox.Focus(); return; } else { - WmsRawStock wmsRawStock = wmsRawStocks.First(); + WmsRawStock wmsRawStock = wmsRawStocks.FirstOrDefault(); wmsRawStock.totalAmount += amount; dbContext.WmsRawStock.Update(wmsRawStock); dbContext.SaveChanges(); totalMessage = wmsRawStock.totalAmount; } + } else { @@ -1556,18 +1633,20 @@ namespace Khd.Core.Wpf.Form dbContext.SaveChanges(); totalMessage = newRawStock.totalAmount; } - - + + txtInBox.Focus(); MsgText.Text = $"入库成功!当前库存:{totalMessage}"; txtInBox.Text = string.Empty; txtInBarCode.Text = string.Empty; txtInScan.Text = string.Empty; + materialName.Text = string.Empty; + materialSpec.Text = string.Empty; } else { - MsgText.Text = "请先扫描容器号和条码!"; + MsgText.Text ="请先扫描容器号和条码!"; } } catch (Exception ex) @@ -1576,7 +1655,9 @@ namespace Khd.Core.Wpf.Form txtInBox.Text = string.Empty; txtInBarCode.Text = string.Empty; txtInScan.Text = string.Empty; - MsgText.Text = "入库失败"; + materialName.Text = string.Empty; + materialSpec.Text = string.Empty; + MsgText.Text = "入库异常"+ ex; txtInBarCode.Focus(); } } @@ -1597,7 +1678,7 @@ namespace Khd.Core.Wpf.Form WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.executeStatus == "1").FirstOrDefault(); if (wmsRawReturn == null) { - HandyControl.Controls.MessageBox.Show("未查询到退库任务!"); + MessageBox.Show("未查询到退库任务!"); return; } var material = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtInBarCode.Text); @@ -1607,20 +1688,20 @@ namespace Khd.Core.Wpf.Form .Where(t => t.warehouseFloor == 5 && t.warehouseId == 512).ToList(); if (wmsRawStocks.Count > 0) { - HandyControl.Controls.MessageBox.Info($"该条码已入库!料箱号为{wmsRawStocks.First().palletInfoCode},库位号为{wmsRawStocks.First().locationCode}"); + MessageBox.Show($"该条码已入库!料箱号为{wmsRawStocks.First().palletInfoCode},库位号为{wmsRawStocks.First().locationCode}"); txtInBarCode.Text = string.Empty; txtInScan.Text = string.Empty; return; } if (container == null) { - HandyControl.Controls.MessageBox.Error("未查询到该容器!"); + MessageBox.Show("未查询到该容器!"); txtInBox.Text = string.Empty; return; } if (material == null) { - HandyControl.Controls.MessageBox.Error("未查询到该条码内容!"); + MessageBox.Show("未查询到该条码内容!"); txtInBarCode.Text = string.Empty; txtInScan.Text = string.Empty; return; @@ -1649,20 +1730,20 @@ namespace Khd.Core.Wpf.Form }; dbContext.WmsRawStock.Add(newRawStock); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Success("入库成功!"); + MessageBox.Show("入库成功!"); txtInBarCode.Text = string.Empty; txtInScan.Text = string.Empty; txtInBarCode.Focus(); } else { - HandyControl.Controls.MessageBox.Info("请先扫描容器号和条码!"); + MessageBox.Show("请先扫描容器号和条码!"); } } catch (Exception ex) { LogManager.Error(ex); - HandyControl.Controls.MessageBox.Error("入库失败"); + MessageBox.Show("入库失败"); } } /// @@ -1674,10 +1755,14 @@ namespace Khd.Core.Wpf.Form { try { - + string containerCode = txtInBox.Text; - if (containerCode.Length >= 1) MsgText.Text = string.Empty; - if (containerCode.Length < 15) + if (containerCode.Length >= 1) + { + MsgText.Text = string.Empty; + txtInScan.Text = string.Empty; + } + if (containerCode.Length < 15) return; if (!string.IsNullOrEmpty(containerCode)) { @@ -1689,6 +1774,11 @@ namespace Khd.Core.Wpf.Form MsgText.Text = $"未查询到该容器{txtInBox.Text}!"; txtInBox.Text = string.Empty; txtInBox.Focus(); + }else if(container.ContainerStatus == "1") + { + MsgText.Text = $"该容器已经在库里，请检查是否重复!"; + txtInBox.Text = string.Empty; + txtInBox.Focus(); } else { @@ -1710,18 +1800,19 @@ namespace Khd.Core.Wpf.Form { try { - + materialName.Text = string.Empty; + materialSpec.Text = string.Empty; string barCode = txtInBarCode.Text; if (barCode.Length < 19) return; - + using var scope = _host.Services.CreateScope(); using var dbContext = scope.ServiceProvider.GetRequiredService(); - + if (!string.IsNullOrEmpty(barCode)) { - + var material = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == barCode); if (material == null) { @@ -1742,10 +1833,10 @@ namespace Khd.Core.Wpf.Form } else { - + txtInScan.Text = (material.batchFlag == "1") ? "" : "1.00"; - - + materialName.Text = mesBaseMaterialInfo.MaterialName; + materialSpec.Text = mesBaseMaterialInfo.MaterialSpec; if (mesBaseMaterialInfo.BatchFlag == "0") { txtInScan.IsReadOnly = true; @@ -1754,6 +1845,7 @@ namespace Khd.Core.Wpf.Form { txtInScan.IsReadOnly = false; } + txtInScan.Focus(); } } } @@ -1875,19 +1967,19 @@ namespace Khd.Core.Wpf.Form .FirstOrDefault(t => t.instockBatch == txtOutBarCode.Text && t.palletInfoCode == txtOutBox.Text); if (wmsRawStock == null) { - HandyControl.Controls.MessageBox.Error("库存已经被清空!"); + MessageBox.Show("库存已经被清空!"); return; } decimal outScan = Convert.ToDecimal(this.txtOutScan.Text); if (outScan != 1 && outScan > wmsRawStock.totalAmount - wmsRawStock.frozenAmount) { - HandyControl.Controls.MessageBox.Error("出库数量不能大于库存数量!"); + MessageBox.Show("出库数量不能大于库存数量!"); return; } var wcsTask = dbContext.WcsTask.Where(t => t.containerNo == txtOutBox.Text).FirstOrDefault(); if (wcsTask == null) { - HandyControl.Controls.MessageBox.Error("出库失败，非CTU出库任务，无法出库!"); + MessageBox.Show("出库失败，非CTU出库任务，无法出库!"); return; } else @@ -1906,7 +1998,7 @@ namespace Khd.Core.Wpf.Form } else if (wmsRawOutstock.realOutstockAmount > wmsRawOutstock.outstockAmount) { - HandyControl.Controls.MessageBox.Error("出库数量不能大于申请单数量，当前出库数量为：" + (wmsRawOutstock.realOutstockAmount - outScan) + "，申请单数量为：" + wmsRawOutstock.outstockAmount + "!"); + MessageBox.Show("出库数量不能大于申请单数量，当前出库数量为：" + (wmsRawOutstock.realOutstockAmount - outScan) + "，申请单数量为：" + wmsRawOutstock.outstockAmount + "!"); return; } wmsRawStock.totalAmount -= outScan; @@ -1965,27 +2057,27 @@ namespace Khd.Core.Wpf.Form } else { - HandyControl.Controls.MessageBox.Error("该条码的销售订单不正确"); + MessageBox.Show("该条码的销售订单不正确"); txtOutScan.Text = string.Empty; txtOutBarCode.Text = string.Empty; return; } } - HandyControl.Controls.MessageBox.Success("出库成功!"); + MessageBox.Show("出库成功!"); txtOutScan.Text = string.Empty; txtOutBarCode.Text = string.Empty; txtOutBarCode.Focus(); } else { - HandyControl.Controls.MessageBox.Error("未查询到该条码信息!"); + MessageBox.Show("未查询到该条码信息!"); } } } else { - HandyControl.Controls.MessageBox.Info("请先扫描容器号和条码!"); + MessageBox.Show("请先扫描容器号和条码!"); } } /// @@ -1995,6 +2087,8 @@ namespace Khd.Core.Wpf.Form /// private void SelectButton_Click(object sender, RoutedEventArgs e) { + + CallSelectedItem.Clear(); GetPersonCallMaterialData(); } @@ -2003,18 +2097,32 @@ namespace Khd.Core.Wpf.Form /// private void GetPersonCallMaterialData() { + + try { using var scope = _host.Services.CreateScope(); using var dbContext = scope.ServiceProvider.GetRequiredService(); List materialIds = new List(); List materialInfos = new List(); - if (!string.IsNullOrEmpty(MaterialName.Text)) + //if (!string.IsNullOrEmpty(MaterialName.Text)) + //{ + // materialInfos = dbContext.MesBaseMaterialInfo.Where(t => t.MaterialName.Contains(MaterialName.Text)).ToList(); + // materialIds = materialInfos.Select(t => t.MaterialId).ToList(); + //} + string userInput = MaterialName.Text?.Replace(" ", "") ?? string.Empty; + + if (!string.IsNullOrEmpty(userInput)) { - materialInfos = dbContext.MesBaseMaterialInfo.Where(t => t.MaterialName.Contains(MaterialName.Text)).ToList(); + materialInfos = dbContext.MesBaseMaterialInfo + .Where(t => t.MaterialName.Replace(" ", "").Contains(userInput) || + t.MaterialCode.Replace(" ", "").Contains(userInput) || + t.MaterialSpec.Replace(" ", "").Contains(userInput)) + .ToList(); materialIds = materialInfos.Select(t => t.MaterialId).ToList(); } + var wmsRawStocks = dbContext.WmsRawStock .Where(t => t.warehouseId == 512) .WhereIf(materialIds.Count > 0, t => materialIds.Contains(t.materialId)) @@ -2026,7 +2134,7 @@ namespace Khd.Core.Wpf.Form palletInfoCode = t.Key.palletInfoCode, totalAmount = t.Sum(x => x.totalAmount), frozenAmount = t.Sum(x => x.frozenAmount), - }); + }); //.GroupBy(t => t.palletInfoCode) //.Select(t => new //{ @@ -2043,6 +2151,7 @@ namespace Khd.Core.Wpf.Form if (string.IsNullOrEmpty(MaterialName.Text)) { materialInfos = dbContext.MesBaseMaterialInfo.ToList(); + } var bill = from a in wmsBaseLocations from b in groupWmsRawStock @@ -2056,6 +2165,7 @@ namespace Khd.Core.Wpf.Form materialId = b.materialId, materialName = c.MaterialName, materialSpec = c.MaterialSpec, + materialCode = c.MaterialCode, palletInfoCode = b.palletInfoCode, //instockDate = b.instockDate, totalAmount = b.totalAmount, @@ -2072,18 +2182,23 @@ namespace Khd.Core.Wpf.Form totalAmount = string.Join("\n", t.Select(x => x.totalAmount)), frozenAmount = string.Join("\n", t.Select(x => x.frozenAmount)), materialId = string.Join("\n", t.Select(x => x.materialId)), + materialCode = string.Join("\n", t.Select(x => x.materialCode)), materialName = string.Join("\n", t.Select(x => x.materialName[..(x.materialName.Length > 20 ? 20 : x.materialName.Length)])), materialNameSrc = string.Join("\n", t.Select(x => x.materialName)), materialSpec = string.Join("\n", t.Select(x => x.materialSpec[..(x.materialSpec.Length > 20 ? 20 : x.materialSpec.Length)])), materialSpecSrc = string.Join("\n", t.Select(x => x.materialSpec)) }).ToList(); + + + + bills = bills.OrderBy(t => t.palletInfoCode).ThenBy(t => t.materialId).ToList(); PersonCallMaterial.ItemsSource = bills.Skip((this.Pagination2.PageIndex - 1) * this.pageCount).Take(this.pageCount); int sum = bills.Count(); Pagination2.MaxPageCount = (sum / pageCount) + (sum % pageCount == 0 ? 0 : 1); if (bills.Count == 0) { - HandyControl.Controls.MessageBox.Show("未查询到数据"); + MessageBox.Show("未查询到数据"); } } catch @@ -2244,21 +2359,21 @@ namespace Khd.Core.Wpf.Form dbContext.AddRange(addCheckDetail); dbContext.AddRange(addList); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("任务创建成功!"); + MessageBox.Show("任务创建成功!"); } else { - HandyControl.Controls.MessageBox.Error("无可盘点库位!"); + MessageBox.Show("无可盘点库位!"); } } else { - HandyControl.Controls.MessageBox.Info("当前有盘点任务正在出库"); + MessageBox.Show("当前有盘点任务正在出库"); } } else { - HandyControl.Controls.MessageBox.Info("当前有盘点任务正在出库"); + MessageBox.Show("当前有盘点任务正在出库"); } } } @@ -2285,7 +2400,7 @@ namespace Khd.Core.Wpf.Form //int taskCount = dbContext.WcsTask.Where(t => t.taskType == 30).Count(); //if (taskCount >= 6) //{ - // HandyControl.Controls.HandyControl.Controls.MessageBox.Show("当前CTU入库任务已满6个,请等待任务完成后再叫空箱!"); + // HandyControl.Controls.MessageBox.Show("当前CTU入库任务已满6个,请等待任务完成后再叫空箱!"); // return; //} var wmsBaseLocation = dbContext.WmsBaseLocation @@ -2327,11 +2442,11 @@ namespace Khd.Core.Wpf.Form } dbContext.AddRange(addList); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("任务创建成功!"); + MessageBox.Show("任务创建成功!"); } else { - HandyControl.Controls.MessageBox.Error($"没有足够的空箱库位库位，剩余空库位数量为{wmsBaseLocation.Count}!"); + MessageBox.Show($"没有足够的空箱库位库位，剩余空库位数量为{wmsBaseLocation.Count}!"); } } @@ -2353,9 +2468,14 @@ namespace Khd.Core.Wpf.Form { BaseEquip ctuEquip = SystemData.BaseEquip.First(t => t.objid == 11); BaseEquip endEquip = SystemData.BaseEquip.First(t => t.objid == 20); - if (CallSelectedItem.Count == 0) + //if (CallSelectedItem.Count == 0) + //{ 替换 + // MessageBox.Show("请选择料箱!"); + // return; + //} + if (itemsControlItems.Count == 0) { - HandyControl.Controls.MessageBox.Show("请选择料箱!"); + MessageBox.Show("请选择料箱!"); return; } @@ -2364,18 +2484,23 @@ namespace Khd.Core.Wpf.Form //int taskCount = dbContext.WcsTask.Where(t => t.nextPointId == 11).Count(); //if (taskCount + ids.Count > 6) //{ - // HandyControl.Controls.MessageBox.Show($"当前CTU只能有6个任务,当前任务数{taskCount}"); + // MessageBox.Show($"当前CTU只能有6个任务,当前任务数{taskCount}"); // return; //} - var wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512 && t.ContainerStatus == "1").Where(t => CallSelectedItem.Contains(t.locationId)).ToList(); + + //替换 var wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512 && t.ContainerStatus == "1").Where(t => CallSelectedItem.Contains(t.locationId)).ToList(); + List idList = itemsControlItems.Select(x => x.baseLocationId).ToList(); + var wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512 && t.ContainerStatus == "1").Where(t => idList.Contains(t.locationId)).ToList(); + + StringBuilder stringBuilder = new StringBuilder(); stringBuilder.AppendLine("确认出库:"); foreach (var item in wmsBaseLocation) { stringBuilder.AppendLine($"库位号{item.locationCode},料箱号{item.containerCode}."); } - MessageBoxResult MessageBoxResult = HandyControl.Controls.MessageBox.Show(stringBuilder.ToString(), "提示", MessageBoxButton.YesNo); - if (MessageBoxResult == MessageBoxResult.Yes) + MessageBoxResult messageBoxResult = MessageBox.Show(stringBuilder.ToString(), "提示", MessageBoxButton.YesNo); + if (messageBoxResult == MessageBoxResult.Yes) { List addList = new List(); foreach (var item in wmsBaseLocation) @@ -2407,7 +2532,7 @@ namespace Khd.Core.Wpf.Form } dbContext.AddRange(addList); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("创建出库任务成功!"); + MessageBox.Show("创建出库任务成功!"); } itemsControlItems.Clear(); CallSelectedItem.Clear(); @@ -2442,11 +2567,11 @@ namespace Khd.Core.Wpf.Form dbContext.Update(task); dbContext.SaveChanges(); } - HandyControl.Controls.MessageBox.Show("任务执行成功!"); + MessageBox.Show("任务执行成功!"); } else { - HandyControl.Controls.MessageBox.Error("没有可执行的任务!"); + MessageBox.Show("没有可执行的任务!"); } } } @@ -2460,7 +2585,7 @@ namespace Khd.Core.Wpf.Form { try { - + BasePlcpoint basePlcpoint = SystemData.BasePlcpoints.First(t => t.plcpointNo == "canReceive"); SystemData.PlcDic[1].WriteToPoint(basePlcpoint.plcpointAddress, "1", basePlcpoint.plcpointLength.ToString()); MsgText.Text = "一键收料发送成功"; @@ -2476,11 +2601,8 @@ namespace Khd.Core.Wpf.Form if (item.Value.IP == ex.Message) { MsgText.Text = "PLC断开连接，正在重连!"; - Task.Run(() => - { - SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); - SystemData.PlcDic[item.Key].Open(); - }); + SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Slot, item.Value.Rack); + SystemData.PlcDic[item.Key].Open(); break; } } @@ -2532,7 +2654,7 @@ namespace Khd.Core.Wpf.Form { if (!ReadEmptyLocation()) { - HandyControl.Controls.MessageBox.Show("有任务正在执行"); + MessageBox.Show("有任务正在执行"); return; } using var scope = _host.Services.CreateScope(); @@ -2543,11 +2665,11 @@ namespace Khd.Core.Wpf.Form baseEquip.emptyCount += 1; dbContext.Update(baseEquip); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("下发成功"); + MessageBox.Show("下发成功"); } else { - HandyControl.Controls.MessageBox.Error("未检测到托盘"); + MessageBox.Show("未检测到托盘"); } } catch (Exception ex) @@ -2558,19 +2680,16 @@ namespace Khd.Core.Wpf.Form { if (item.Value.IP == ex.Message) { - HandyControl.Controls.MessageBox.Error("PLC断开连接，正在重连!"); - Task.Run(() => - { - SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); - SystemData.PlcDic[item.Key].Open(); - }); + MessageBox.Show("PLC断开连接，正在重连!"); + SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); + SystemData.PlcDic[item.Key].Open(); } } } LogManager.Error(ex); } } - + private void OneOut_Click(object sender, RoutedEventArgs e) { try @@ -2581,7 +2700,7 @@ namespace Khd.Core.Wpf.Form { if (!ReadEmptyLocation()) { - HandyControl.Controls.MessageBox.Show("有任务正在执行"); + MessageBox.Show("有任务正在执行"); return; } using var scope = _host.Services.CreateScope(); @@ -2592,11 +2711,11 @@ namespace Khd.Core.Wpf.Form baseEquip.emptyCount -= 1; dbContext.Update(baseEquip); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("下发成功"); + MessageBox.Show("下发成功"); } else { - HandyControl.Controls.MessageBox.Show("检测到外侧有托盘，无法出堆垛机"); + MessageBox.Show("检测到外侧有托盘，无法出堆垛机"); } } catch (Exception ex) @@ -2607,12 +2726,9 @@ namespace Khd.Core.Wpf.Form { if (item.Value.IP == ex.Message) { - HandyControl.Controls.MessageBox.Show("PLC断开连接，正在重连!"); - Task.Run(() => - { - SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); - SystemData.PlcDic[item.Key].Open(); - }); + MessageBox.Show("PLC断开连接，正在重连!"); + SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); + SystemData.PlcDic[item.Key].Open(); } } } @@ -2634,7 +2750,7 @@ namespace Khd.Core.Wpf.Form { if (!ReadEmptyLocation()) { - HandyControl.Controls.MessageBox.Show("有任务正在执行"); + MessageBox.Show("有任务正在执行"); return; } int emptyTaskCount = EmptyCountForm.EmptyTaskCount; @@ -2646,12 +2762,12 @@ namespace Khd.Core.Wpf.Form baseEquip.emptyCount = emptyTaskCount; dbContext.Update(baseEquip); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("下发成功"); + MessageBox.Show("下发成功"); } } //else //{ - // HandyControl.Controls.MessageBox.Show("未检测到托盘"); + // MessageBox.Show("未检测到托盘"); //} } catch (Exception ex) @@ -2662,12 +2778,9 @@ namespace Khd.Core.Wpf.Form { if (item.Value.IP == ex.Message) { - HandyControl.Controls.MessageBox.Show("PLC断开连接，正在重连!"); - Task.Run(() => - { - SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); - SystemData.PlcDic[item.Key].Open(); - }); + MessageBox.Show("PLC断开连接，正在重连!"); + SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); + SystemData.PlcDic[item.Key].Open(); } } } @@ -2681,7 +2794,7 @@ namespace Khd.Core.Wpf.Form { if (!ReadEmptyLocation()) { - HandyControl.Controls.MessageBox.Show("有任务正在执行"); + MessageBox.Show("有任务正在执行"); return; } BasePlcpoint lineSignal = SystemData.BasePlcpoints.First(t => t.plcpointNo == "linesignal01"); @@ -2696,11 +2809,11 @@ namespace Khd.Core.Wpf.Form baseEquip.emptyCount = 0; dbContext.Update(baseEquip); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("下发成功"); + MessageBox.Show("下发成功"); } else { - HandyControl.Controls.MessageBox.Show("检测到外侧有托盘，无法出堆垛机"); + MessageBox.Show("检测到外侧有托盘，无法出堆垛机"); } } @@ -2712,12 +2825,9 @@ namespace Khd.Core.Wpf.Form { if (item.Value.IP == ex.Message) { - HandyControl.Controls.MessageBox.Show("PLC断开连接，正在重连!"); - Task.Run(() => - { - SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); - SystemData.PlcDic[item.Key].Open(); - }); + MessageBox.Show("PLC断开连接，正在重连!"); + SystemData.PlcDic[item.Key] = new Plc.S7.Plc(item.Value.CPU, item.Value.IP, item.Value.Port, item.Value.Rack, item.Value.Slot); + SystemData.PlcDic[item.Key].Open(); } } } @@ -2743,7 +2853,7 @@ namespace Khd.Core.Wpf.Form baseEquip.emptyCount = EmptyCountForm.EmptyTaskCount; dbContext.Update(baseEquip); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("修改成功"); + MessageBox.Show("修改成功"); } } } @@ -2771,7 +2881,7 @@ namespace Khd.Core.Wpf.Form bool hasTaskManual = dbContext.WcsTaskManual.Where(t => t.endPointId == baseEquip.objid || t.currPointId == baseEquip.objid).Any(); if (hasTask || hasTaskManual) { - HandyControl.Controls.MessageBox.Show("有任务正在执行，请等待任务完成后再执行此操作!"); + MessageBox.Show("有任务正在执行，请等待任务完成后再执行此操作!"); return; } else @@ -2779,7 +2889,7 @@ namespace Khd.Core.Wpf.Form var endEquip = dbContext.BaseEquip.FirstOrDefault(t => t.equipType == 20 && t.equipStatus == 0 && t.emptyCount == 0); if (endEquip == null) { - HandyControl.Controls.MessageBox.Show("没有空箱库位!"); + MessageBox.Show("没有空箱库位!"); return; } else @@ -2805,7 +2915,7 @@ namespace Khd.Core.Wpf.Form }; dbContext.Add(task); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("任务生成成功!"); + MessageBox.Show("任务生成成功!"); } } } @@ -2825,7 +2935,7 @@ namespace Khd.Core.Wpf.Form bool hasTaskManual = dbContext.WcsTaskManual.Where(t => t.endPointId == baseEquip.objid || t.currPointId == baseEquip.objid).Any(); if (hasTask || hasTaskManual) { - HandyControl.Controls.MessageBox.Show("有任务正在执行，请等待任务完成后再执行此操作!"); + MessageBox.Show("有任务正在执行，请等待任务完成后再执行此操作!"); return; } else @@ -2836,8 +2946,8 @@ namespace Khd.Core.Wpf.Form BaseEquip firstEmptyEquip = dbContext.BaseEquip.First(t => t.objid == 40); if (firstEmptyEquip.emptyCount > 0) { - MessageBoxResult MessageBoxResult = HandyControl.Controls.MessageBox.Show("二楼未找到一个托盘的库位，是否从一楼调取？", "提示", MessageBoxButton.OKCancel); - if (MessageBoxResult == MessageBoxResult.OK) + MessageBoxResult messageBoxResult = MessageBox.Show("二楼未找到一个托盘的库位，是否从一楼调取？", "提示", MessageBoxButton.OKCancel); + if (messageBoxResult == MessageBoxResult.OK) { if (ReadEmptyLocation()) { @@ -2846,17 +2956,17 @@ namespace Khd.Core.Wpf.Form firstEmptyEquip.emptyCount -= 1; dbContext.Update(firstEmptyEquip); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("下发成功"); + MessageBox.Show("下发成功"); } else { - HandyControl.Controls.MessageBox.Show("一楼托盘库忙碌中，请稍后再试!"); + MessageBox.Show("一楼托盘库忙碌中，请稍后再试!"); } } } else { - HandyControl.Controls.MessageBox.Show("未找到一个托盘的库位"); + MessageBox.Show("未找到一个托盘的库位"); return; } } @@ -2883,7 +2993,7 @@ namespace Khd.Core.Wpf.Form }; dbContext.Add(task); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("任务生成成功!"); + MessageBox.Show("任务生成成功!"); } } } @@ -2916,8 +3026,8 @@ namespace Khd.Core.Wpf.Form { if (this.EmptyEquip.SelectedItem is BaseEquip equip) { - MessageBoxResult MessageBoxResult = HandyControl.Controls.MessageBox.Show($"是否清除{equip.equipName}的托盘信息？", "提示", MessageBoxButton.OKCancel); - if (MessageBoxResult == MessageBoxResult.OK) + MessageBoxResult messageBoxResult = MessageBox.Show($"是否清除{equip.equipName}的托盘信息？", "提示", MessageBoxButton.OKCancel); + if (messageBoxResult == MessageBoxResult.OK) { using var scope = _host.Services.CreateScope(); using var dbContext = scope.ServiceProvider.GetRequiredService(); @@ -2926,7 +3036,7 @@ namespace Khd.Core.Wpf.Form baseEquip.equipStatus = 0; dbContext.Update(baseEquip); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("清除成功"); + MessageBox.Show("清除成功"); } } } @@ -2942,7 +3052,7 @@ namespace Khd.Core.Wpf.Form bool hasTaskManual = dbContext.WcsTaskManual.Where(t => t.currPointId == baseEquip.objid || t.endPointId == baseEquip.objid).Any(); if (hastask || hasTaskManual) { - HandyControl.Controls.MessageBox.Show("已存在当前库位的任务"); + MessageBox.Show("已存在当前库位的任务"); return; } if (baseEquip.emptyCount > 0) @@ -2969,12 +3079,12 @@ namespace Khd.Core.Wpf.Form }; dbContext.Add(task); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("下发成功"); + MessageBox.Show("下发成功"); } } else { - HandyControl.Controls.MessageBox.Show("库位已空!"); + MessageBox.Show("库位已空!"); } } } @@ -2998,11 +3108,11 @@ namespace Khd.Core.Wpf.Form baseEquip.containerNo = null; dbContext.Update(baseEquip); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("确认入库成功!"); + MessageBox.Show("确认入库成功!"); } else { - HandyControl.Controls.MessageBox.Show("未扫描到RFID！"); + MessageBox.Show("未扫描到RFID！"); } } @@ -3019,14 +3129,14 @@ namespace Khd.Core.Wpf.Form { if (user.OBJID == 1) { - HandyControl.Controls.MessageBox.Show("不能删除根用户!"); + MessageBox.Show("不能删除根用户!"); return; } using var scope = _host.Services.CreateScope(); using var dbContext = scope.ServiceProvider.GetRequiredService(); dbContext.SysUser.Remove(user); dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("删除成功!"); + MessageBox.Show("删除成功!"); GetMenu(); } } @@ -3098,7 +3208,7 @@ namespace Khd.Core.Wpf.Form { //if (user.OBJID == 1) //{ - // HandyControl.Controls.MessageBox.Show("不能修改根用户!"); + // MessageBox.Show("不能修改根用户!"); // return; //} MenuList menuList = new MenuList(_host, user.OBJID); @@ -3148,7 +3258,7 @@ namespace Khd.Core.Wpf.Form this.InventoryMaterial.Items.Refresh(); if (list.Count == 0) { - HandyControl.Controls.MessageBox.Show("没有数据!"); + MessageBox.Show("没有数据!"); } } catch @@ -3169,23 +3279,5 @@ namespace Khd.Core.Wpf.Form SelectOutRawForm selectOutRawForm = new SelectOutRawForm(this._host); selectOutRawForm.ShowDialog(); } - - private void ContineOutBtn_Click(object sender, RoutedEventArgs e) - { - try - { - using var scope = _host.Services.CreateScope(); - using var dbContext = scope.ServiceProvider.GetRequiredService(); - BaseEquip baseEquip = dbContext.BaseEquip.Where(t => t.objid == 10).First(); - baseEquip.IsOut = 1; - dbContext.Update(baseEquip); - dbContext.SaveChanges(); - HandyControl.Controls.MessageBox.Show("继续出库成功!"); - } - catch - { - - } - } } }