10145

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10144";
+            ClientVersion = "10145";
         }
 
         private User user;

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -94,7 +94,7 @@ namespace BBWY.Client.Models
                 return;
             }
             LookCerWindow lookCerWindow = new LookCerWindow(CertificateModel);
-            lookCerWindow.Show();
+            lookCerWindow.ShowDialog();
         }
 
 
@@ -134,7 +134,7 @@ namespace BBWY.Client.Models
             printWindow.CertificateModel = certificateModel;
             printWindow.LoadData();
             //printWindow.Datas = LoadCerLabelModels();
-            printWindow.Show();
+            printWindow.ShowDialog();
         }
 
         /// <summary>
@@ -160,7 +160,7 @@ namespace BBWY.Client.Models
             };
             printWindow.LoadData();
             //printWindow.Datas = LoadBarLabelModels();
-            printWindow.Show();
+            printWindow.ShowDialog();
         }
 
 

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -269,7 +269,7 @@ namespace BBWY.Client.ViewModels.PackTask
             var id = (long)paramList[0];
             var markMsg = paramList[1].ToString();
             SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(OverTimeTaskType.待落仓, id, markMsg, packTaskService, ReflashTask) ;
-            submitOverTimeMarkMsgWindow.Show();
+            submitOverTimeMarkMsgWindow.ShowDialog();
         }
 
         private void SetFallWareConfigured(object obj)
@@ -324,7 +324,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
             SealBoxConfigureWindow sealBoxConfigureWindow = new SealBoxConfigureWindow(updateSealBoxConfig.Data.UpdateSealBoxConfiguredTaskDatas, ReflashTask, sealBoxId);
-            sealBoxConfigureWindow.Show();
+            sealBoxConfigureWindow.ShowDialog();
         }
 
         private void ConfiguredSealBox()
@@ -360,7 +360,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
             }
             SealBoxConfigureWindow sealBoxConfigureWindow = new SealBoxConfigureWindow(updateSealBoxConfig.Data.UpdateSealBoxConfiguredTaskDatas, ReflashTask, 0);
-            sealBoxConfigureWindow.Show();
+            sealBoxConfigureWindow.ShowDialog();
 
 
         }
@@ -1017,7 +1017,7 @@ namespace BBWY.Client.ViewModels.PackTask
         public void CreateTask()
         {
             PublishTaskWindow publish = new PublishTaskWindow(ReflashTask);
-            publish.Show();
+            publish.ShowDialog();
         }
 
         /// <summary>

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -435,7 +435,7 @@ namespace BBWY.Client.ViewModels.PackTask
             }
 
             SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(overTimeTaskType, id, markMsg, packTaskService, ReflashTask);
-            submitOverTimeMarkMsgWindow.Show();
+            submitOverTimeMarkMsgWindow.ShowDialog();
         }
 
         private void LookLSOrderConfigure(object obj)
@@ -487,7 +487,7 @@ namespace BBWY.Client.ViewModels.PackTask
             var totalPageIndex = data.GetWareLSOrderPurchases.Count() % 10 == 0 ? data.GetWareLSOrderPurchases.Count() / 10 : data.GetWareLSOrderPurchases.Count() / 10 + 1;
 
             WareLSAcceptOrderWindow wareLSAcceptOrderWindow = new WareLSAcceptOrderWindow(lsdTaskMsg, lookData, 1, totalPageIndex, model.BoxConfigureData.PrewOrder);
-            wareLSAcceptOrderWindow.Show();
+            wareLSAcceptOrderWindow.ShowDialog();
         }
 
         private void PrintLSOrderConfigure(object obj)
@@ -691,14 +691,14 @@ namespace BBWY.Client.ViewModels.PackTask
             if (fallware.WareType == WareType.京仓)
             {
                 SetJDWareBoxWindow window = new SetJDWareBoxWindow(model);
-                window.Show();
+                window.ShowDialog();
                 //var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType, ReflashTask, false);
                 //w.ShowDialog();
             }
             if (fallware.WareType == WareType.云仓 || fallware.WareType == WareType.聚水潭齐越仓)
             {
                 SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, fallware.WareType);
-                window.Show();
+                window.ShowDialog();
             }
 
         }