1227.1查询修改

LogForceTestApp.Modules.MainModule/ViewModels/QualityTracingViewModel.cs

@@ -8,10 +8,12 @@ using Repository.Entiies;
 using Serilog;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Documents;
 
 namespace LogoForceTestApp.Modules.MainModule.ViewModels
 {
@@ -31,7 +33,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
 
         private readonly IRepository repository;
 
-        public string OperatorCode { get; set; }
+        public string FindContent { get; set; }
         public DelegateCommand QueryCommand { get; set; }
 
         #region 价钱
@@ -51,8 +53,11 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
         public double QL1Num { get; set; }
         public double Money { get; set; }
         public DelegateCommand ShowMoneyCommand { get; set; }
+        public string SelectedNames { get; set; }
+        public ObservableCollection<string> ChoiceNames { get; set; }
 
         #endregion
+        string prono;
 
         public QualityTracingViewModel(IMapper mapper, IRepository repository)
         {
@@ -66,6 +71,11 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
             QueryCommand = new DelegateCommand(query);
             ShowMoneyCommand = new DelegateCommand(ShowMoney);
             this.repository = repository;
+
+            ChoiceNames = new ObservableCollection<string>();
+            ChoiceNames.Add("人员ID"); 
+            ChoiceNames.Add("工作机台");
+            ChoiceNames.Add("产品码");
         }
 
         private void ShowMoney()
@@ -96,24 +106,50 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
             _infNew.Clear();
 
             var endTime = SelectedEndDate.AddDays(1);
-            var list = repository.GetAllQuery<Information>(c => c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate&& c.CreateTime <= endTime);
-            GeneralTime = list.Sum(c => c.SpendTime);//个人生产总时间
-            AllNumber = list.Count();//个人生产总量
-
-            var res_60 = repository.GetAllQuery<Information>(c => c.ProType=="P60"&&c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
-            P60Num = res_60.Count();
-            var res_70 = repository.GetAllQuery<Information>(c => c.ProType == "P70" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
-            P70Num = res_70.Count();
-            var res_80 = repository.GetAllQuery<Information>(c => c.ProType == "P80" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
-            P80Num = res_80.Count();
-            var res_90 = repository.GetAllQuery<Information>(c => c.ProType == "P90" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
-            P90Num = res_90.Count();
-            var res_T29 = repository.GetAllQuery<Information>(c => c.ProType == "T29" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
-            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<Information> list = new List<Information>();
+            if (FindContent != "")
+            {
+                if (SelectedNames == "人员ID")
+                {
+                    list = repository.GetAllQuery<Information>(c => c.OperatorCode == FindContent && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+                    GeneralTime = list.Sum(c => c.SpendTime);//个人生产总时间
+                    AllNumber = list.Count();//个人生产总量
+                }
+                if (SelectedNames == "工作机台")
+                {
+                    list = repository.GetAllQuery<Information>(c => c.WorkDev == FindContent && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+                    GeneralTime = list.Sum(c => c.SpendTime);//个人生产总时间
+                    AllNumber = list.Count();//个人生产总量
+                }
+                if (SelectedNames == "产品码")
+                {
+                    var res = repository.GetAllQuery<Information>(c => c.ProCode == FindContent && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+                    if (res.Count!=0)
+                    {
+                        if (res[0].ProNo != "")
+                        { prono = res[0].ProNo; }
+                        else { prono = res[1].ProNo; }
+                    }
+                    list = repository.GetAllQuery<Information>(c => c.ProNo == prono && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+                }
+            }
+
+
+            //var res_60 = repository.GetAllQuery<Information>(c => c.ProType=="P60"&&c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+            //P60Num = res_60.Count();
+            //var res_70 = repository.GetAllQuery<Information>(c => c.ProType == "P70" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+            //P70Num = res_70.Count();
+            //var res_80 = repository.GetAllQuery<Information>(c => c.ProType == "P80" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+            //P80Num = res_80.Count();
+            //var res_90 = repository.GetAllQuery<Information>(c => c.ProType == "P90" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+            //P90Num = res_90.Count();
+            //var res_T29 = repository.GetAllQuery<Information>(c => c.ProType == "T29" && c.OperatorCode == OperatorCode && c.CreateTime >= SelectedStartDate && c.CreateTime <= endTime);
+            //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

@@ -24,14 +24,22 @@
             <hc:DatePicker Margin="4,0"
                            hc:InfoElement.Title="选择结束时间"
                            SelectedDate="{Binding SelectedEndDate}" />
-            <TextBlock Text="人员ID："
+            <!--<TextBlock Text="人员ID："
                        Margin="5"
                        FontSize="16"
-                       VerticalAlignment="Center" />
+                       VerticalAlignment="Center" />-->
+            <hc:ComboBox HorizontalAlignment="Center"
+                         VerticalAlignment="Center"
+                         Margin="4,0"
+                         Width="150"
+                         Height="40"
+                         SelectedItem="{Binding SelectedNames}"
+                         ItemsSource="{Binding ChoiceNames}"
+                         FontSize="16" />
             <TextBox Width="200"
                      VerticalAlignment="Center"
                      FontSize="20"
-                     Text="{Binding OperatorCode,UpdateSourceTrigger=PropertyChanged}"
+                     Text="{Binding FindContent,UpdateSourceTrigger=PropertyChanged}"
                      Margin="4,0"/>
             <Button Margin="4,0"
                     VerticalAlignment="Center"

LogoForceTestApp/Views/MainWindow.xaml

@@ -57,11 +57,11 @@
                                               Height="80"
                                               Kind="AreaChart" />
                 </Button>
-                <Button Command="{Binding StatementPageCommand}">
+                <!--<Button Command="{Binding StatementPageCommand}">
                     <icon:PackIconEvaIcons Width="80"
                                            Height="80"
                                            Kind="Eye" />
-                </Button>
+                </Button>-->
                 <Button Command="{Binding LogCommand}">
                     <icon:PackIconMaterial Width="80"
                                            Height="80"