upadate

TeamAAS-VM/Data/SystemDatabaseService.cs

@@ -177,9 +177,9 @@ namespace TeamAAS_VP.Data
             ////如果没有登录记录则返回一个默认的用户，即第一个用户
             //if (rec == null) return _db.Queryable<User>().First();
             //return _db.Queryable<User>().InSingle(rec.UserId);
-            if (CurrentUser==null)
+            if (CurrentUser == null)
             {
-                CurrentUser= _db.Queryable<User>().ToList().FirstOrDefault();
+                CurrentUser = _db.Queryable<User>().ToList().FirstOrDefault();
             }
             return CurrentUser;
         }
@@ -401,11 +401,16 @@ namespace TeamAAS_VP.Data
             var todayStart = DateTime.UtcNow.Date;
             //今天的结束时间
             var todayEnd = DateTime.UtcNow.Date;
-            todayEnd= todayEnd.AddDays(1);
+            todayEnd = todayEnd.AddDays(1);
             //按照产品名称和时间范围查询生产记录的总数
+            //var total = await _db.Queryable<ProductionRecord>()
+            //    .Where(r => r.ProductName == productName && r.Timestamp >= todayStart && r.Timestamp < todayEnd)
+            //    .SumAsync(r => r.Quantity);
             var total = await _db.Queryable<ProductionRecord>()
-                .Where(r => r.ProductName == productName && r.Timestamp >= todayStart && r.Timestamp < todayEnd)
-                .SumAsync(r => r.Quantity);
+                  .Where(r => r.ProductName == productName && r.Timestamp >= todayStart && r.Timestamp < todayEnd)
+                  .Select(r => r.ProductCode)
+                  .Distinct()
+                  .CountAsync();
             return total;
         }
 
@@ -416,17 +421,46 @@ namespace TeamAAS_VP.Data
         /// <returns></returns>
         public async Task<int> GetLastHourProductionAsync(string productName)
         {
-                        var lastHourStart = DateTime.UtcNow.AddHours(-1);
+            var lastHourStart = DateTime.UtcNow.AddHours(-1);
             var lastHourEnd = DateTime.UtcNow;
 
 
             //按照产品名称和时间范围查询生产记录的总数
+            //var total = await _db.Queryable<ProductionRecord>()
+            //    .Where(r => r.ProductName == productName && r.Timestamp >= lastHourStart && r.Timestamp < lastHourEnd)
+            //    .SumAsync(r => r.Quantity);
             var total = await _db.Queryable<ProductionRecord>()
                 .Where(r => r.ProductName == productName && r.Timestamp >= lastHourStart && r.Timestamp < lastHourEnd)
-                .SumAsync(r => r.Quantity);
+                .Select(r => r.ProductCode)
+                .Distinct()
+                .CountAsync();
             return total;
         }
 
+
+        /// <summary>
+        /// 获取今天ng的数量
+        /// </summary>
+        /// <param name="productName"></param>
+        /// <returns></returns>
+        public async Task<int> GetNGProductionAsync(string productName)
+        {
+            //今天的起始时间
+            var todayStart = DateTime.Now.Date;
+            //今天的结束时间
+            var todayEnd = DateTime.Now.Date;
+            todayEnd = todayEnd.AddDays(1);
+            //按照产品名称和时间范围查询生产记录的总数
+            //var total = await _db.Queryable<ProductionRecord>()
+            //    .Where(r => r.ProductName == productName && r.Timestamp >= todayStart && r.Timestamp < todayEnd && r.Category == "NG")
+            //    .SumAsync(r => r.Quantity);
+            var total = await _db.Queryable<ProductionRecord>()
+               .Where(r => r.ProductName == productName && r.Timestamp >= todayStart && r.Timestamp < todayEnd && r.Category == "NG")
+               .Select(r => r.ProductCode)
+               .Distinct()
+               .CountAsync();
+            return total;
+        }
         /// <summary>
         /// 获取当前月的产能
         /// </summary>
@@ -833,7 +867,7 @@ namespace TeamAAS_VP.Data
             var list = await q.OrderBy(r => r.Timestamp, OrderByType.Desc).ToListAsync();
             return list;
         }
-        
+
         /// <summary>
         /// 记录一次螺丝供料器批次更换记录
         /// </summary>
@@ -845,24 +879,6 @@ namespace TeamAAS_VP.Data
         }
 
 
-        /// <summary>
-        /// 获取今天ng的数量
-        /// </summary>
-        /// <param name="productName"></param>
-        /// <returns></returns>
-        public async Task<int> GetNGProductionAsync(string productName)
-        {
-            //今天的起始时间
-            var todayStart = DateTime.Now.Date;
-            //今天的结束时间
-            var todayEnd = DateTime.Now.Date;
-            todayEnd = todayEnd.AddDays(1);
-            //按照产品名称和时间范围查询生产记录的总数
-            var total = await _db.Queryable<ProductionRecord>()
-                .Where(r => r.ProductName == productName && r.Timestamp >= todayStart && r.Timestamp < todayEnd && r.Category == "NG")
-                .SumAsync(r => r.Quantity);
-            return total;
-        }
 
         #region 抛料
         /// <summary>

TeamAAS-VM/ViewModels/MainWindowViewModel.cs

@@ -253,7 +253,14 @@ namespace TeamAAS_VP.ViewModels
             var systemconfig = _configService.GetSystemConfiguration();
             MyTitle = systemconfig.Title;
             CompanyTitle = systemconfig.CompanyTitle;
-            AppVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            if (systemconfig.SoftwareVersion!="")
+            {
+                AppVersion = systemconfig.SoftwareVersion;
+            }
+            else
+            {
+                AppVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            }
             systemconfig.SoftwareVersion = AppVersion;
             _configService.SaveSystemConfiguration(systemconfig);