From fe8cc4307a6dff2ab4484fa3e06415e7a4ff7af7 Mon Sep 17 00:00:00 2001 From: liuwf Date: Fri, 17 Jan 2025 20:01:17 +0800 Subject: [PATCH] =?UTF-8?q?change-=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SerialPortBusiness.cs | 2 +- .../ContainerTransferOrderWindow.xaml | 8 ++++---- SlnMesnac.RfidUpload.UI/MainWindow.xaml | 4 ++-- .../TransferOrderWindow.xaml | 8 ++++---- .../viewModel/MainWindowViewModel.cs | 18 +++++++++++++++--- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/SlnMesnac.RfidUpload.Business/SerialPortBusiness.cs b/SlnMesnac.RfidUpload.Business/SerialPortBusiness.cs index 75d7356..2a98980 100644 --- a/SlnMesnac.RfidUpload.Business/SerialPortBusiness.cs +++ b/SlnMesnac.RfidUpload.Business/SerialPortBusiness.cs @@ -111,7 +111,7 @@ namespace SlnMesnac.RfidUpload.Business _serialPort.Read(buffer, 0, bytesToRead); - RefreshLogMessageEvent?.Invoke("Received data: " + BitConverter.ToString(buffer).Replace("-", " ")); + // RefreshLogMessageEvent?.Invoke("Received data: " + BitConverter.ToString(buffer).Replace("-", " ")); if (CheckReceivedData(buffer)) { diff --git a/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml index c5f1659..70566b6 100644 --- a/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml +++ b/SlnMesnac.RfidUpload.UI/ContainerTransferOrderWindow.xaml @@ -75,11 +75,11 @@ - - + + - - + + diff --git a/SlnMesnac.RfidUpload.UI/MainWindow.xaml b/SlnMesnac.RfidUpload.UI/MainWindow.xaml index 89ca90c..d4a0cce 100644 --- a/SlnMesnac.RfidUpload.UI/MainWindow.xaml +++ b/SlnMesnac.RfidUpload.UI/MainWindow.xaml @@ -46,7 +46,7 @@ - + @@ -162,7 +162,7 @@ diff --git a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml index ffaa1c7..3262572 100644 --- a/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml +++ b/SlnMesnac.RfidUpload.UI/TransferOrderWindow.xaml @@ -77,11 +77,11 @@ - + - - - + + + diff --git a/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs index 3cf5658..6aac80d 100644 --- a/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs +++ b/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs @@ -296,6 +296,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel private void Init() { + //程序启动默认打开串口7 + _selectedSerialPortItems = "COM7"; + OpenSerialPort(); + WorkModelParam = Convert.ToInt32(appConfig.workModel); //webApiServerApp.Init(); @@ -448,8 +452,10 @@ namespace SlnMesnac.RfidUpload.UI.viewModel { batchNo++; res = csbHandleBusiness.containerStorageBatchQueryByCsb(TrackNo,batchNo.ToString(), enumerable.ToList()); + PrintMessageToListBox($"新容器入库结果 [{res.GetMsg()}]"); } MainPageTipMessage = $"新容器入库 [{res.GetMsg()}]"; + if (res.IsSuccess) { Task.Run(() => @@ -457,7 +463,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel Thread.Sleep(3000); CsbResult res = csbHandleBusiness.receContainerStorageByCsb(TrackNo, "1"); - + PrintMessageToListBox($"新容器入库反馈接口 [{res.GetMsg()}]"); Application.Current.Dispatcher.Invoke(() => { MainPageTipMessage = $"新容器入库反馈接口，[{res.GetMsg()}]"; @@ -482,6 +488,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel res = csbHandleBusiness.containerScanSealByCsb(TransferOrderInfoItem.ffjhNo, opBatch, TransferOrderInfoItem.ffjhscrq, batchNo.ToString(), enumerable.ToList()); + PrintMessageToListBox($"封发-按调拨单结果 [{res.GetMsg()}]"); } // MessageBox.Show($"封发-按调拨单 [{res.GetMsg()}]"); @@ -500,6 +507,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel Application.Current.Dispatcher.Invoke(() => { MainPageTipMessage = $"封发-按调拨单反馈接口，[{res.GetMsg()}]"; + PrintMessageToListBox($"封发-按调拨单反馈接口结果 [{res.GetMsg()}]"); // 如果需要弹出消息框，也需要在 UI 线程调用 MessageBox // MessageBox.Show($"封发-按调拨单反馈接口，[{res.GetMsg()}]"); }); @@ -525,6 +533,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel res = csbHandleBusiness.containerScanSealByCsb(TransferOrderInfoItem.ffjhNo, opBatch, TransferOrderInfoItem.ffjhscrq, batchNo.ToString(), enumerable.ToList()); + PrintMessageToListBox($"封发-按调拨单接口结果 [{res.GetMsg()}]"); } MainPageTipMessage = $"封发-按调拨单 [{res.GetMsg()}]"; @@ -536,20 +545,22 @@ namespace SlnMesnac.RfidUpload.UI.viewModel Task.Delay(3000); CsbResult res1 = csbHandleBusiness.containerScanSealResultByCsb(TransferOrderInfoItem.ffjhNo, opBatch); MainPageTipMessage = $"封发-按调拨单反馈接口，[{res1.GetMsg()}]"; - - if(!res1.IsSuccess) return; + PrintMessageToListBox($"封发-按调拨单反馈接口，[{res1.GetMsg()}]"); + if (!res1.IsSuccess) return; //六、6.12 效验发运计划(利用上一步的opBatch) string stationOrgCode = Institution != null ? Institution.stationOrgCode : ""; string stationOrgName = Institution != null ? Institution.stationOrgName : ""; CsbResult res2 = csbHandleBusiness.tranPlanCheckByCsb(_transferOrderInfo.ffjhNo, opBatch, stationOrgCode, stationOrgName); MainPageTipMessage = "校验发运计划结果：" + res2.GetMsg(); + PrintMessageToListBox("校验发运计划结果：" + res2.GetMsg()); if (res2.IsSuccess) { // 七、6.13.容器直连配发-开始配发 CsbResult res3 = csbHandleBusiness.containerAllotByCsb(TransferOrderInfoItem.ffjhNo, opBatch); MainPageTipMessage = $"库存容器封发配发 -- 6.13.容器直连配发-开始配发 [{res3.GetMsg()}]"; + PrintMessageToListBox($"库存容器封发配发 -- 6.13.容器直连配发-开始配发 [{res3.GetMsg()}]"); if (res3.IsSuccess) { Task.Delay(3000); @@ -562,6 +573,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel { CsbResult res4 = csbHandleBusiness.containerAllotResultByCsb(TransferOrderInfoItem.ffjhNo, opBatch); MainPageTipMessage = $"八、反馈接收接口，确认是否和实际相符[{res4.GetMsg()}]"; + PrintMessageToListBox($"库存容器封发配发反馈接收接口 [{res4.GetMsg()}]"); if (res4.IsSuccess) { break;