From a748602d24dfa17571e7c9b601c37ddf4b93110c Mon Sep 17 00:00:00 2001 From: liuwf Date: Sun, 15 Dec 2024 18:56:38 +0800 Subject: [PATCH] =?UTF-8?q?change-=E5=8C=BA=E5=88=86=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E5=88=86=E5=8F=91=E9=85=8D=E5=8F=91=E3=80=81?= =?UTF-8?q?=E5=8D=B8=E8=BD=A6=E5=AE=B9=E5=99=A8=E5=88=86=E5=8F=91=E9=85=8D?= =?UTF-8?q?=E5=8F=91=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs | 11 +++++++++-- .../viewModel/ContainerTransferOrderViewModel.cs | 8 +++++++- .../viewModel/MainWindowViewModel.cs | 4 +++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs index 6887c52..5be7d3a 100644 --- a/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs +++ b/SlnMesnac.RfidUpload.UI/SelectRouterWindow.xaml.cs @@ -29,8 +29,15 @@ namespace SlnMesnac.RfidUpload.UI private CsbHandleBusiness csbHandleBusiness = CsbHandleBusiness.Instance; TransferOrderInfo _transferOrderInfo; - public SelectRouterWindow(TransferOrderInfo transferOrderInfo) + /// + /// 区分属于哪个界面 + /// 由于库存容器分发配发与卸车容器分发配发使用同一个界面与viewmodel + /// BelongPage = 3，表示库存容器分发配发，BelongPage = 4，表示卸车容器分发配发 + public int BelongPage = 3; + + public SelectRouterWindow(TransferOrderInfo transferOrderInfo,int _BelongPage) { + BelongPage = _BelongPage; _transferOrderInfo = transferOrderInfo; InitializeComponent(); @@ -149,7 +156,7 @@ namespace SlnMesnac.RfidUpload.UI if (res.code == "200") { //封发计划正常可封发 - RefreshSubmitVerifyEvent?.Invoke(3, res.GetMsg(), _transferOrderInfo,institution); + RefreshSubmitVerifyEvent?.Invoke(BelongPage, res.GetMsg(), _transferOrderInfo,institution); this.Close(); } diff --git a/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs index 9ac8ca9..ffc6e55 100644 --- a/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs +++ b/SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs @@ -58,6 +58,12 @@ namespace SlnMesnac.RfidUpload.UI.viewModel public static event RefreshSubmitVerifyDelegate RefreshSubmitVerifyEvent; #endregion + /// + /// 区分属于哪个界面 + /// 由于库存容器分发配发与卸车容器分发配发使用同一个界面与viewmodel + /// BelongPage = 3，表示库存容器分发配发，BelongPage = 4，表示卸车容器分发配发 + /// + public int BelongPage = 3; public delegate void Success(); @@ -213,7 +219,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel [RelayCommand] private void Execute(TransferOrderInfo transferOrderInfo) { - SelectRouterWindow selectRouterWindow = new SelectRouterWindow(transferOrderInfo); + SelectRouterWindow selectRouterWindow = new SelectRouterWindow(transferOrderInfo,BelongPage); selectRouterWindow.ShowDialog(); } diff --git a/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs b/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs index c864be7..6298d8a 100644 --- a/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs +++ b/SlnMesnac.RfidUpload.UI/viewModel/MainWindowViewModel.cs @@ -454,7 +454,7 @@ namespace SlnMesnac.RfidUpload.UI.viewModel } - else if (WorkModelParam == 3) //库存容器封发配发 -- 6.13.容器直连配发-开始配发 + else if (WorkModelParam == 3 || WorkModelParam == 4) //库存容器封发配发 -- 6.13.容器直连配发-开始配发 { //四、6.9接收容器条码接口 var info = labelItems.ToList(); @@ -571,12 +571,14 @@ namespace SlnMesnac.RfidUpload.UI.viewModel } else if (WorkModel == 3) //库存容器封发配发 { + containerTransferOrderViewModel.BelongPage = 3; ContainerTransferOrderWindow containerTransferOrderWindow = new ContainerTransferOrderWindow(containerTransferOrderViewModel); containerTransferOrderWindow.ShowDialog(); } else if (WorkModel == 4) //卸车容器封发配发 { + containerTransferOrderViewModel.BelongPage = 4; ContainerTransferOrderWindow containerTransferOrderWindow = new ContainerTransferOrderWindow(containerTransferOrderViewModel); containerTransferOrderWindow.ShowDialog(); }else if (WorkModel == 5) //退出