1115

LogForceTestApp.Modules.MainModule/ViewModels/MainPageViewModel.cs

@@ -1558,7 +1558,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                 {
                     WriteLog("Timer:" + ex.Message, LogType.Error);
                 }
-                //await Task.Delay(1000);
+                await Task.Delay(1000);
             }
         }
         public void ProcessFinish(object sender, StateEventArgs e)

LogForceTestApp.Modules.MainModule/ViewModels/QualityTracingViewModel.cs

@@ -41,12 +41,14 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
         public double P90_Price { get; set; }
         public double T29_Price { get; set; }
         public double DH88_Price { get; set; }
+        public double QL1_Price { get; set; }
         public double P60Num { get; set; }
         public double P70Num { get; set; }
         public double P80Num { get; set; }
         public double P90Num { get; set; }
         public double T29Num { get; set; }
         public double DH88Num { get; set; }
+        public double QL1Num { get; set; }
         public double Money { get; set; }
         public DelegateCommand ShowMoneyCommand { get; set; }
 
@@ -69,7 +71,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
         private void ShowMoney()
         {
             Money = P60_Price * P60Num + P70_Price * P70Num + P80_Price * P80Num + P90_Price * P90Num
-                + T29_Price * T29Num + DH88_Price * DH88Num;
+                + T29_Price * T29Num + DH88_Price * DH88Num + QL1_Price * QL1Num;
         }
 
         /// <summary>
@@ -110,7 +112,8 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
             T29Num = res_T29.Count();
             var res_DH88 = repository.GetAllQuery<Information>(c => c.ProType == "DH-88" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
             DH88Num = res_DH88.Count();
-
+            var res_QL1 = repository.GetAllQuery<Information>(c => c.ProType == "QL-1" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+            QL1Num = res_QL1.Count();
 
 
             list.Reverse();

LogForceTestApp.Modules.MainModule/Views/QualityTracing.xaml

@@ -82,6 +82,13 @@
                 <TextBox Text="{Binding DH88_Price,UpdateSourceTrigger=PropertyChanged}"
                          Width="100"
                          Height="30" />
+                <TextBlock VerticalAlignment="Center"
+                           FontSize="16"
+                           Margin="3"
+                           Text="QL-1：" />
+                <TextBox Text="{Binding QL1_Price,UpdateSourceTrigger=PropertyChanged}"
+                         Width="100"
+                         Height="30" />
             </StackPanel>
         </GroupBox>
         <GroupBox Header="信息显示"
@@ -157,6 +164,14 @@
                                FontSize="16"
                                Margin="3"
                                VerticalAlignment="Center" />
+                    <TextBlock Text="QL-1："
+                               FontSize="16"
+                               Margin="20,3,0,3"
+                               VerticalAlignment="Center" />
+                    <TextBlock Text="{Binding QL1Num}"
+                               FontSize="16"
+                               Margin="3"
+                               VerticalAlignment="Center" />
                 </StackPanel>
                 <StackPanel Grid.Column="1"
                             Orientation="Horizontal">