sc/SunlightAggregationManager
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Administrator committed 2026-06-11 23:09:25 +08:00
2 parents 683f8ac880 0b444636a4
commit 3bbfe20f84
2 files changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserClass/AsyncTcpClient.cs
+5 -2
View File
@@ -202,8 +202,11 @@ namespace SunlightAggregationManager.UserClass
}
if (Command == "SysData")//回复请求的信息
{
// data_.Add("SysData", MainWindowViewModel.MachineVer);
// data_.Add("ChemicalStatistics", MainWindowViewModel.ChemicalStatistics.ToJsonString());
ret = JsonSerializer.Serialize(data_);
}
if (Command == "ChemicalStatistics")//回复请求的信息
{
data_.Add("ChemicalStatistics", Newtonsoft.Json.JsonConvert.SerializeObject(MainWindowViewModel.ChemicalStatistics));
ret = JsonSerializer.Serialize(data_);
}
if (Command == "Info")//回复info请求的信息
ViewModel/MainWindowViewModel.cs
+4 -4
View File
@@ -155,7 +155,7 @@ namespace SunlightAggregationManager.ViewModel
Service.EndInit();
_timer = new Timer(EXTask, null, TimeSpan.FromSeconds(60), TimeSpan.FromMinutes(30));
_timer = new Timer(EXTask, null, TimeSpan.FromSeconds(5), TimeSpan.FromMinutes(30));
}
//Machines操作数据库
@@ -390,10 +390,10 @@ namespace SunlightAggregationManager.ViewModel
try
{
string DyelotsBulkedRecipe_sql = "SELECT [ProductCode],[ProductName],SUM(DispenseGrams)/1000 " +
"as TotalDispenseGrams,COUNT(*) as PrescriptionCount FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] " +
"as TotalDispenseGrams FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] " +
"where DispenseEndTime > '" + DateTime.Now.ToString("yyyy-MM-dd") + "' AND DispenseEndTime < '" +
DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") + "'AND DispenseGrams IS NOT NULL" + " GROUP BY " +
"[ProductCode],[ProductName] ORDER BY TotalDispenseGrams DESC ";
DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") + "' GROUP BY [ProductCode],[ProductName] " +
"ORDER BY TotalDispenseGrams DESC ";
string Dye_sql =
"SELECT [Dyelot],[ReDye],[StepNumber] FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] " +
"where ((DispenseEndTime >= '" + DateTime.Now.ToString("yyyy-MM-dd") + "' AND DispenseEndTime < '" +