change-区分库存容器分发配发、卸车容器分发配发界面

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)
+        /// <summary>
+        /// 区分属于哪个界面
+        /// 由于库存容器分发配发与卸车容器分发配发使用同一个界面与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();
 
             }

SlnMesnac.RfidUpload.UI/viewModel/ContainerTransferOrderViewModel.cs

@@ -58,6 +58,12 @@ namespace SlnMesnac.RfidUpload.UI.viewModel
         public static event RefreshSubmitVerifyDelegate RefreshSubmitVerifyEvent;
         #endregion
 
+        /// <summary>
+        /// 区分属于哪个界面
+        /// 由于库存容器分发配发与卸车容器分发配发使用同一个界面与viewmodel
+        /// BelongPage = 3，表示库存容器分发配发，BelongPage = 4，表示卸车容器分发配发
+        /// </summary>
+        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();
           
         }

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) //退出