diff --git a/DM_Weight/Port/PortUtil.cs b/DM_Weight/Port/PortUtil.cs index 9a8974a..5b38b1b 100644 --- a/DM_Weight/Port/PortUtil.cs +++ b/DM_Weight/Port/PortUtil.cs @@ -1902,7 +1902,8 @@ namespace DM_Weight.Port //{ // wsdSerial.Close(); //} - master.Dispose(); + //master.Dispose(); + logger.Info($"获取温湿度{string.Join("", r)}"); } catch (Exception ex) { diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs index 5d7545f..0a7047a 100644 --- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs @@ -65,7 +65,7 @@ namespace DM_Weight.ViewModels } } //所选药箱号 - private int _drawerNo = 0; + private int _drawerNo = -1; public int DrawerNo { @@ -144,7 +144,7 @@ namespace DM_Weight.ViewModels void RequestData() { int totalCount = 0; - if (DrawerNo > 0) + if (DrawerNo >= 0) { //查询当前药箱归属的药师 string currentDrawerUser = SqlSugarHelper.Db.Queryable().Where(cl => cl.DrawerNo == DrawerNo && cl.MachineId == "DM5").Select(cl => cl.BelongUser).First(); @@ -424,13 +424,14 @@ namespace DM_Weight.ViewModels public async void OpenBoxAction(string strDrawerNo) { - DrawerNo = Convert.ToInt32(strDrawerNo)-1; + DrawerNo = Convert.ToInt32(strDrawerNo); if (DrawerNo > 0) { + DrawerNo -= 1; RequestData(); IsEnable = false; Status = 1; - _portUtil.SpeakAsync($"正在打开{DrawerNo}号药箱"); + _portUtil.SpeakAsync($"正在打开{DrawerNo+1}号药箱"); //记录开药箱日志 SqlSugarHelper.Db.Insertable(new MachineRecord() { @@ -439,7 +440,7 @@ namespace DM_Weight.ViewModels Operator = HomeWindowViewModel.Operator?.Id, OperationTime = DateTime.Now, Type = 55, - InvoiceId = $"打开{DrawerNo}号药箱", + InvoiceId = $"打开{DrawerNo+1}号药箱", }).ExecuteCommand(); ModbusHelper.GetInstance().OpenBoxDoor(DrawerNo); } diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs index 5acdb39..842b1bc 100644 --- a/DM_Weight/ViewModels/HomeWindowViewModel.cs +++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs @@ -333,7 +333,7 @@ namespace DM_Weight.ViewModels GroupNo = temp.GroupNo, Temp = temp.Temp, Humi = temp.Humi, - AddTime = temp.AddTime + AddTime = DateTime.Now }).ExecuteCommand(); logger.Info($"保存温湿度信息:{temp.Temp},{temp.Humi}"); } diff --git a/DM_Weight/Views/CheckOrderNewWindow.xaml b/DM_Weight/Views/CheckOrderNewWindow.xaml index 68818c6..199a5cb 100644 --- a/DM_Weight/Views/CheckOrderNewWindow.xaml +++ b/DM_Weight/Views/CheckOrderNewWindow.xaml @@ -75,26 +75,26 @@ -