Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationManager

ViewModel/MainWindowViewModel.cs

@@ -389,7 +389,7 @@ namespace SunlightAggregationManager.ViewModel
         {
             try
             {
-                string DyelotsBulkedRecipe_sql = "SELECT [ProductCode],[ProductName],SUM(DispenseGrams)/1000 " +
+                string DyelotsBulkedRecipe_sql = "SELECT [ProductCode],[ProductName],SUM(DispenseGrams)" +
                     "as TotalDispenseGrams FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] " +
                     "where DispenseEndTime > '" + DateTime.Now.ToString("yyyy-MM-dd") + "' AND DispenseEndTime < '" +
                     DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") + "' GROUP BY [ProductCode],[ProductName] " +