maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

查询药箱状态改为3s执行一次

This commit is contained in:
maqiao 2024-12-09 15:41:50 +08:00
parent a82c9f1cd1
commit 3b7ef9e29f
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
View File

@ -851,7 +851,7 @@ namespace DM_Weight.ViewModels
DrawerNo -= 1; DrawerNo -= 1;
RequestData(); RequestData();
Status = 1; Status = 1;
_portUtil.SpeakAsync($"正在打开{DrawerNo + 1}号药箱"); ModbusHelper.SpeakAsync($"正在打开{DrawerNo + 1}号药箱");
//记录开药箱日志 //记录开药箱日志
SqlSugarHelper.Db.Insertable(machineRecord).ExecuteCommand(); SqlSugarHelper.Db.Insertable(machineRecord).ExecuteCommand();
ModbusHelper.GetInstance().OpenBoxDoor(DrawerNo); ModbusHelper.GetInstance().OpenBoxDoor(DrawerNo);
@ -860,7 +860,7 @@ namespace DM_Weight.ViewModels
bool loop = true; bool loop = true;
while (loop) while (loop)
{ {
await Task.Delay(9000); await Task.Delay(3000);
bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState(); bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState();
bool state = Array.TrueForAll(boolsl, b => b == false); bool state = Array.TrueForAll(boolsl, b => b == false);
if (state) if (state)
@ -870,6 +870,7 @@ namespace DM_Weight.ViewModels
} }
else else
{ {
ModbusHelper.BoxOperate = true;
ModbusHelper.SpeakAsync("药箱已打开，请及时关闭"); ModbusHelper.SpeakAsync("药箱已打开，请及时关闭");
} }
} }

38
DM_Weight/ViewModels/HomeWindowViewModel.cs
View File

@ -451,26 +451,26 @@ namespace DM_Weight.ViewModels
// } // }
//} //}
//保存温湿度信息 //保存温湿度信息
private void GetWSD(object sender, ElapsedEventArgs e) //private void GetWSD(object sender, ElapsedEventArgs e)
{ //{
TemperatureHumidityInfo temp = _portUtil.GetWSD(); // TemperatureHumidityInfo temp = _portUtil.GetWSD();
if (temp != null) // if (temp != null)
{ // {
SqlSugarHelper.Db.Insertable(new TemperatureHumidityInfo() // SqlSugarHelper.Db.Insertable(new TemperatureHumidityInfo()
{ // {
GroupNo = temp.GroupNo, // GroupNo = temp.GroupNo,
Temp = temp.Temp, // Temp = temp.Temp,
Humi = temp.Humi, // Humi = temp.Humi,
AddTime = DateTime.Now // AddTime = DateTime.Now
}).ExecuteCommand(); // }).ExecuteCommand();
logger.Info($"保存温湿度信息:{temp.Temp},{temp.Humi}"); // logger.Info($"保存温湿度信息:{temp.Temp},{temp.Humi}");
} // }
else // else
{ // {
logger.Info("温湿度信息返回空"); // logger.Info("温湿度信息返回空");
} // }
} //}
/// <summary> /// <summary>

3
DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs
View File

@ -674,7 +674,7 @@ namespace DM_Weight.ViewModels
bool loop = true; bool loop = true;
while (loop) while (loop)
{ {
await Task.Delay(9000); await Task.Delay(3000);
bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState(); bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState();
bool state = Array.TrueForAll(boolsl, b => b == false); bool state = Array.TrueForAll(boolsl, b => b == false);
if(state) if(state)
@ -684,6 +684,7 @@ namespace DM_Weight.ViewModels
} }
else else
{ {
ModbusHelper.BoxOperate = true;
ModbusHelper.SpeakAsync("药箱已打开，请及时关闭"); ModbusHelper.SpeakAsync("药箱已打开，请及时关闭");
} }
} }

3
DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
View File

@ -232,7 +232,7 @@ namespace DM_Weight.ViewModels
bool loop = true; bool loop = true;
while (loop) while (loop)
{ {
await Task.Delay(9000); await Task.Delay(3000);
bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState(); bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState();
bool state = Array.TrueForAll(boolsl, b => b == false); bool state = Array.TrueForAll(boolsl, b => b == false);
if (state) if (state)
@ -242,6 +242,7 @@ namespace DM_Weight.ViewModels
} }
else else
{ {
ModbusHelper.BoxOperate = true;
ModbusHelper.SpeakAsync("药箱已打开，请及时关闭"); ModbusHelper.SpeakAsync("药箱已打开，请及时关闭");
} }
} }