1206

LogForceTestApp.Modules.MainModule/ViewModels/KBWindowViewModel.cs

@@ -883,25 +883,41 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                 listval1.Clear();
                 listval2.Clear();
                 xlabel.Clear();
-                for (int i = 1; i < 20; i++)
+                //for (int i = 1; i < 20; i++)
+                //{
+                //    changeDay = -i;
+                //    var list = repository.GetFirstDefault<AllNumber>(c => c.DateA == DateTime.Today.AddDays(changeDay));
+                //    if (list != null)
+                //    {
+                //        if (list.RealityA!=0)
+                //        {
+                //            listval1.Add(list.RealityA);
+                //            okrate = Math.Round((list.OkA / list.RealityA) * 100, 2);
+                //            listval2.Add(okrate);
+                //            xlabel.Add(list.DateA.ToString("MM-dd"));
+                //            if (listval1.Count >= 7)
+                //            {
+                //                break;
+                //            }
+                //        }
+                //    }
+                //}
+                DateTime start = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfWeek - 1));
+                DateTime end = start.AddDays(7);
+                start = new DateTime(start.Year, start.Month, start.Day, 0, 0, 0);
+                end = new DateTime(end.Year, end.Month, end.Day, 0, 0, 0);
+                var list = repository.GetAllQuery<AllNumber>(c => c.DateA >=start&&c.DateA<end);
+                if (list != null)
                 {
-                    changeDay = -i;
-                    var list = repository.GetFirstDefault<AllNumber>(c => c.DateA == DateTime.Today.AddDays(changeDay));
-                    if (list != null)
+                    for (int i = 0; i < list.Count; i++)
                     {
-                        if (list.RealityA!=0)
-                        {
-                            listval1.Add(list.RealityA);
-                            okrate = Math.Round((list.OkA / list.RealityA) * 100, 2);
-                            listval2.Add(okrate);
-                            xlabel.Add(list.DateA.ToString("MM-dd"));
-                            if (listval1.Count >= 7)
-                            {
-                                break;
-                            }
-                        }
+                        listval1.Add(list[i].RealityA);
+                        okrate = Math.Round((list[i].OkA / list[i].RealityA) * 100, 2);
+                        listval2.Add(okrate);
+                        xlabel.Add(list[i].DateA.ToString("MM-dd"));
                     }
                 }
+
                 SerLine(listval1, listval2, xlabel);
             }
             catch (Exception)
@@ -1015,20 +1031,10 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
             }
             try
             {
-                var ps = repository.GetAllQuery<ProStatus>(c => c.OrdNoS==str);
+                var ps = repository.GetFirstDefault<ProStatus>(c => c.OrdNoS==str);
                 if (ps != null)
                 {
-                    for (int i = 0; i < ps.Count; i++)
-                    {
-                        if (i==0)
-                        {
-                            Finished = ps[i].RealityS;
-                        }
-                        else
-                        {
-                            Finished = Finished + ps[i].RealityS;
-                        }
-                    }
+                    Finished = ps.RealityS;
                 }
             }
             catch (Exception)

LogForceTestApp.Modules.MainModule/ViewModels/MainPageViewModel.cs

@@ -1131,7 +1131,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                                 try
                                 {
                                     DateTime dt = DateTime.Today;
-                                    var list = _repository.GetFirstDefault<ProStatus>(c => c.DateS == dt);//查一个值
+                                    var list = _repository.GetFirstDefault<ProStatus>(c => c.OrdNoS == Order);//查一个值
                                     if (list != null)
                                     {
                                         list.ErrS++;
@@ -1203,7 +1203,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                                 try
                                 {
                                     DateTime dt = DateTime.Today;
-                                    var list = _repository.GetFirstDefault<ProStatus>(c => c.DateS == dt);//查一个值
+                                    var list = _repository.GetFirstDefault<ProStatus>(c => c.OrdNoS == Order);//查一个值
                                     if (list != null)
                                     {
                                         list.ErrS++;
@@ -1275,7 +1275,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                                 try
                                 {
                                     DateTime dt = DateTime.Today;
-                                    var list = _repository.GetFirstDefault<ProStatus>(c => c.DateS == dt);//查一个值
+                                    var list = _repository.GetFirstDefault<ProStatus>(c => c.OrdNoS == Order);//查一个值
                                     if (list != null)
                                     {
                                         list.ErrS++;
@@ -1411,7 +1411,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                         try
                         {
                             DateTime dt = DateTime.Today;
-                            var list = _repository.GetFirstDefault<ProStatus>(c => c.DateS == dt && c.OrdNoS == Order);//查一个值
+                            var list = _repository.GetFirstDefault<ProStatus>(c => c.OrdNoS == Order);//查一个值
                             if (list != null)
                             {
                                 list.OkS++;
@@ -1434,7 +1434,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                         try
                         {
                             DateTime dt = DateTime.Today;
-                            var list = _repository.GetFirstDefault<ProStatus>(c => c.DateS == dt && c.OrdNoS == Order);//查一个值
+                            var list = _repository.GetFirstDefault<ProStatus>(c =>c.OrdNoS == Order);//查一个值
                             if (list != null)
                             {
                                 list.NgS++;
@@ -1466,7 +1466,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                         try
                         {
                             DateTime dt = DateTime.Today;
-                            var list = _repository.GetFirstDefault<ProStatus>(c => c.DateS == dt && c.OrdNoS == Order);//查一个值
+                            var list = _repository.GetFirstDefault<ProStatus>(c =>c.OrdNoS == Order);//查一个值
                             if (list != null)
                             {
                                 list.OkS++;
@@ -1497,7 +1497,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                         try
                         {
                             DateTime dt = DateTime.Today;
-                            var list = _repository.GetFirstDefault<ProStatus>(c => c.DateS == dt && c.OrdNoS == Order);//查一个值
+                            var list = _repository.GetFirstDefault<ProStatus>(c => c.OrdNoS == Order);//查一个值
                             if (list != null)
                             {
                                 list.NgS++;
@@ -1566,7 +1566,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
             try
             {
                 DateTime dt = DateTime.Today;
-                var list = _repository.GetFirstDefault<ProStatus>(c => c.DateS == dt);//查一个值
+                var list = _repository.GetFirstDefault<ProStatus>(c => c.OrdNoS == Order);//查一个值
                 if (list != null)
                 {
                     list.RealityS++;
@@ -1639,7 +1639,6 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                 var outp = new ProStatus()
                 {
                     Id = Guid.NewGuid(),
-                    DateS = DateTime.Today,
                     OrdNoS = Order,
                     PlanS = plan,
                     RealityS = 0,