Merge branch 'hotfix-feng-blowingFixNoData-20200326' into dev-6.0

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowing.xaml.cs

@@ -23,12 +23,13 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
         }
         [InjectionMethod]
         public void Init(
-            IBlowingFixService blowingFixService,
+            IBlowingService blowingFixService,
             IBlowingDetectService blowingDetectService)
         {
 
             viewModel = new PgBlowingVm();
-            viewModel.Init(blowingFixService, blowingDetectService);
+
+            viewModel.Init((IBlowingFixService)blowingFixService, blowingDetectService);
             this.DataContext = viewModel;
             //this.grid_blowing.DataContext = viewModel.renZiJiaService;
             //this.grid_bDetect.DataContext = viewModel.bDetect;

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/DynAreaBlowing.xaml.cs

@@ -25,11 +25,12 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
         [InjectionMethod]
         public void Init(
             IUnityContainer container,
-            IBlowingFixService blowingFixService,
+            IBlowingService blowingFixService,
             IBlowingDetectService blowingDetectService)
         {
             this.container = container;
-            this.blowingFixService = blowingFixService;
+            
+            this.blowingFixService = (IBlowingFixService)blowingFixService;
             this.blowingDetectService = blowingDetectService;
 
             Border_Blowing.DataContext = blowingFixService;

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/ScanGraphCircular.xaml.cs

@@ -23,7 +23,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
         ScanGraphCircularParam graphparam;
         BulkDataServiceClientAdv bulkDataServiceClientAdv;
         IDynAreaService dynAreaService;
-        IBlowingFixService blowingFixService;
+        IBlowingService blowingService;
         public ScanGraphCircular()
         {
             InitializeComponent();
@@ -33,11 +33,11 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
         public void Init(int id,
             IDynAreaService dynAreaService,
             BulkDataServiceClientAdv bulkDataServiceClientAdv,
-            IBlowingFixService blowingFixService)
+            IBlowingService blowingService)
         {
             this.dynAreaService = dynAreaService;
             this.bulkDataServiceClientAdv = bulkDataServiceClientAdv;
-            this.blowingFixService = blowingFixService;
+            this.blowingService = blowingService;
 
             //查找参数
             graphparam = ScanGraphCircularParams.Current.Items.Find(p => p.ID == id);
@@ -62,8 +62,8 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
             graph.SetBinding(GraphScanCircular.MPIsRightProperty, new Binding("MPIsRight"));
 
             //TODO
-            graph.SetBinding(GraphScanCircular.BoltCntProperty, new Binding("NBolts") { Source = blowingFixService });
-            graph.SetBinding(GraphScanCircular.OrgBoltNoProperty, new Binding("OrgBoltNo") { Source = blowingFixService });
+            graph.SetBinding(GraphScanCircular.BoltCntProperty, new Binding("NBolts") { Source = blowingService });
+            graph.SetBinding(GraphScanCircular.OrgBoltNoProperty, new Binding("OrgBoltNo") { Source = blowingService });
 
             graph.SetBinding(GraphScanCircular.TargetProperty, new Binding("Target") { Source = dynAreaService.DynArea });
             graph.SetBinding(GraphScanCircular.AlarmProperty, new Binding("Alarm") { Source = dynAreaService.DynArea });