diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs index 5f81c6a..8021723 100644 --- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs @@ -851,7 +851,7 @@ namespace DM_Weight.ViewModels DrawerNo -= 1; RequestData(); Status = 1; - _portUtil.SpeakAsync($"正在打开{DrawerNo + 1}号药箱"); + ModbusHelper.SpeakAsync($"正在打开{DrawerNo + 1}号药箱"); //记录开药箱日志 SqlSugarHelper.Db.Insertable(machineRecord).ExecuteCommand(); ModbusHelper.GetInstance().OpenBoxDoor(DrawerNo); @@ -860,7 +860,7 @@ namespace DM_Weight.ViewModels bool loop = true; while (loop) { - await Task.Delay(9000); + await Task.Delay(3000); bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState(); bool state = Array.TrueForAll(boolsl, b => b == false); if (state) @@ -870,6 +870,7 @@ namespace DM_Weight.ViewModels } else { + ModbusHelper.BoxOperate = true; ModbusHelper.SpeakAsync("药箱已打开,请及时关闭"); } } diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs index d5029ab..0fd076e 100644 --- a/DM_Weight/ViewModels/HomeWindowViewModel.cs +++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs @@ -451,26 +451,26 @@ namespace DM_Weight.ViewModels // } //} //保存温湿度信息 - private void GetWSD(object sender, ElapsedEventArgs e) - { - TemperatureHumidityInfo temp = _portUtil.GetWSD(); - if (temp != null) - { - SqlSugarHelper.Db.Insertable(new TemperatureHumidityInfo() - { - GroupNo = temp.GroupNo, - Temp = temp.Temp, - Humi = temp.Humi, - AddTime = DateTime.Now - }).ExecuteCommand(); - logger.Info($"保存温湿度信息:{temp.Temp},{temp.Humi}"); - } - else - { + //private void GetWSD(object sender, ElapsedEventArgs e) + //{ + // TemperatureHumidityInfo temp = _portUtil.GetWSD(); + // if (temp != null) + // { + // SqlSugarHelper.Db.Insertable(new TemperatureHumidityInfo() + // { + // GroupNo = temp.GroupNo, + // Temp = temp.Temp, + // Humi = temp.Humi, + // AddTime = DateTime.Now + // }).ExecuteCommand(); + // logger.Info($"保存温湿度信息:{temp.Temp},{temp.Humi}"); + // } + // else + // { - logger.Info("温湿度信息返回空"); - } - } + // logger.Info("温湿度信息返回空"); + // } + //} /// diff --git a/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs b/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs index a04f521..4bf9b99 100644 --- a/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs @@ -674,7 +674,7 @@ namespace DM_Weight.ViewModels bool loop = true; while (loop) { - await Task.Delay(9000); + await Task.Delay(3000); bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState(); bool state = Array.TrueForAll(boolsl, b => b == false); if(state) @@ -684,6 +684,7 @@ namespace DM_Weight.ViewModels } else { + ModbusHelper.BoxOperate = true; ModbusHelper.SpeakAsync("药箱已打开,请及时关闭"); } } diff --git a/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs b/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs index c95a3d6..37c4353 100644 --- a/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs +++ b/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs @@ -232,7 +232,7 @@ namespace DM_Weight.ViewModels bool loop = true; while (loop) { - await Task.Delay(9000); + await Task.Delay(3000); bool[] boolsl = ModbusHelper.GetInstance().GetAllBoxState(); bool state = Array.TrueForAll(boolsl, b => b == false); if (state) @@ -242,6 +242,7 @@ namespace DM_Weight.ViewModels } else { + ModbusHelper.BoxOperate = true; ModbusHelper.SpeakAsync("药箱已打开,请及时关闭"); } }