diff --git a/MainWindow.xaml b/MainWindow.xaml index 02122f6..70410b4 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -87,8 +87,8 @@ - - + + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 054534c..9890296 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -64,7 +64,7 @@ namespace StatisticsUI "AS TotalDispenseGrams FROM DyelotsBulkedRecipe dbr " + "INNER JOIN Dyelots d ON dbr.Dyelot = d.Dyelot WHERE " + "dbr.ProductCode = '" + DataGridStatistics_ProductCode + "'" + - "AND Created >= '" + query_start + " " + date_start_time + "' AND Created< '" + + "AND DispenseEndTime >= '" + query_start + " " + date_start_time + "' AND DispenseEndTime< '" + query_end + " " + date_end_time + "'" + "GROUP BY d.Machine ORDER BY d.Machine"; conn_SC.OpenAsync(); //连接数据库 @@ -105,8 +105,8 @@ namespace StatisticsUI { DyelotsBulkedRecipe_sql = "SELECT [ProductCode],[ProductName],SUM(DispenseGrams)/1000 as TotalDispenseGrams,COUNT(*) as PrescriptionCount " + - "FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] where Created > '" + query_start + " " + - date_start_time + "' AND Created < '" + query_end + " " + date_end_time + "'AND DispenseGrams IS NOT NULL" + + "FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] where DispenseEndTime > '" + query_start + " " + + date_start_time + "' AND DispenseEndTime < '" + query_end + " " + date_end_time + "'AND DispenseGrams IS NOT NULL" + " GROUP BY [ProductCode],[ProductName] ORDER BY TotalDispenseGrams DESC "; Machine_sql = "SELECT m.Name AS MachineName," + @@ -122,7 +122,7 @@ namespace StatisticsUI { DyelotsBulkedRecipe_sql = "SELECT [ProductCode],[ProductName],SUM(DispenseGrams)/1000 as TotalDispenseGrams,COUNT(*) as PrescriptionCount " + - "FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] where Created >= '" + query_start + " " + date_start_time + "' AND Created < '" + + "FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] where DispenseEndTime >= '" + query_start + " " + date_start_time + "' AND DispenseEndTime < '" + query_end + " " + date_end_time + "'AND ProductType='"+ type + "'AND DispenseGrams IS NOT NULL" + " GROUP BY [ProductCode],[ProductName] ORDER BY TotalDispenseGrams DESC "; Machine_sql = @@ -132,8 +132,8 @@ namespace StatisticsUI "' THEN CONCAT(dbr.Dyelot, '|', dbr.ReDye, '', '|', dbr.StepNumber, '')END"+ " ) AS UniqueRecipeCount FROM Machines m LEFT JOIN Dyelots d ON m.Name = d.Machine " + "AND d.CreationTime >= '" + query_start + " " + date_start_time + "' AND d.CreationTime < '" + query_end + - " " + date_end_time + "' LEFT JOIN DyelotsBulkedRecipe dbr ON d.Dyelot = dbr.Dyelot AND dbr.Created>='" + query_start + - " " + date_start_time + "' AND dbr.Created < '" + query_end + " " + date_end_time + "' GROUP BY m.Name ORDER BY m.Name"; + " " + date_end_time + "' LEFT JOIN DyelotsBulkedRecipe dbr ON d.Dyelot = dbr.Dyelot AND dbr.DispenseEndTime>='" + query_start + + " " + date_start_time + "' AND dbr.DispenseEndTime < '" + query_end + " " + date_end_time + "' GROUP BY m.Name ORDER BY m.Name"; } conn_SC.OpenAsync(); //连接数据库 Machine.Clear();