diff --git a/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs b/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs index 4f23f9e..14aa41c 100644 --- a/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs @@ -8,10 +8,12 @@ using Prism.Events; using Prism.Mvvm; using Prism.Regions; using System; +using System.Collections; using System.Collections.Generic; using System.Configuration; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Windows.Media; @@ -20,7 +22,13 @@ namespace DM_Weight.ViewModels internal class CheckSelfOrderWindowViewModel : BindableBase, INavigationAware, IRegionMemberLifetime { private readonly ILog logger = LogManager.GetLogger(typeof(CheckOrderNewWindowViewModel)); + private int _drawerType = -1; + public int DrawerType + { + get => _drawerType; + set => SetProperty(ref _drawerType, value); + } public bool KeepAlive => false; private int _pageNum = 1; @@ -89,7 +97,11 @@ namespace DM_Weight.ViewModels private string _publicContent; public string PublicContent { get => _publicContent; set => SetProperty(ref _publicContent, value); } private string _orderDate = DateTime.Now.ToString("yyyy-MM-dd"); - + //名下药箱状态 + private int _selfStatus = 0; + public int SelfStatus { get => _selfStatus; set => SetProperty(ref _selfStatus, value); } + //抽屉号列表 + public static List iList = new List(); /// /// 查询条件 处方日期 /// @@ -421,57 +433,75 @@ namespace DM_Weight.ViewModels { case 1: Button1Enable = true; + SelfEnable=true; break; case 2: Button2Enable = true; + SelfEnable = true; break; case 3: Button3Enable = true; + SelfEnable = true; break; case 4: Button4Enable = true; + SelfEnable = true; break; case 5: Button5Enable = true; + SelfEnable = true; break; case 6: Button6Enable = true; + SelfEnable = true; break; case 7: Button7Enable = true; + SelfEnable = true; break; case 8: Button8Enable = true; + SelfEnable = true; break; case 9: Button9Enable = true; + SelfEnable = true; break; case 10: Button10Enable = true; + SelfEnable = true; break; case 11: Button11Enable = true; + SelfEnable = true; break; case 12: Button12Enable = true; + SelfEnable = true; break; case 13: Button13Enable = true; + SelfEnable = true; break; case 14: Button14Enable = true; + SelfEnable = true; break; case 15: Button15Enable = true; + SelfEnable = true; break; case 16: Button16Enable = true; + SelfEnable = true; break; case 17: Button17Enable = true; + SelfEnable = true; break; case 18: Button18Enable = true; + SelfEnable = true; break; default: break; @@ -609,65 +639,16 @@ namespace DM_Weight.ViewModels ChannelList chl = chlList[i]; if (Convert.ToDateTime(chl.EffDate).ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")) { - switch (chl.DrawerNo) - { - case 1: - Button1Color = Brushes.Yellow; - break; - case 2: - Button2Color = Brushes.Yellow; - break; - case 3: - Button3Color = Brushes.Yellow; - break; - case 4: - Button4Color = Brushes.Yellow; - break; - case 5: - Button5Color = Brushes.Yellow; - break; - case 6: - Button6Color = Brushes.Yellow; - break; - case 7: - Button7Color = Brushes.Yellow; - break; - case 8: - Button8Color = Brushes.Yellow; - break; - case 9: - Button9Color = Brushes.Yellow; - break; - case 10: - Button10Color = Brushes.Yellow; - break; - case 11: - Button11Color = Brushes.Yellow; - break; - case 12: - Button12Color = Brushes.Yellow; - break; - case 13: - Button13Color = Brushes.Yellow; - break; - case 14: - Button14Color = Brushes.Yellow; - break; - case 15: - Button15Color = Brushes.Yellow; - break; - case 16: - Button16Color = Brushes.Yellow; - break; - case 17: - Button17Color = Brushes.Yellow; - break; - case 18: - Button18Color = Brushes.Yellow; - break; - default: - break; - } + SetBtnColor(chl.DrawerNo); + } + //DrawerType== 1为公共药箱 + if (chl.DrawerType == 1) + { + SetBtnEnable(chl.DrawerNo); + } + if (!string.IsNullOrEmpty(chl.BelongUser) && chl.BelongUser == HomeWindowViewModel.Operator.UserBarcode) + { + SetBtnEnable(chl.DrawerNo); } } } @@ -701,6 +682,100 @@ namespace DM_Weight.ViewModels } } + /// + /// 选择药箱,打开药箱 + /// + public DelegateCommand UpdateDrawerNo + { + get => new DelegateCommand(OpenBoxAction); + } + public async void OpenBoxAction(string strDrawerNo) + { + DrawerNo = Convert.ToInt32(strDrawerNo); + DrawerType = SqlSugarHelper.Db.Queryable().Where(cl => cl.MachineId == "DM5" && cl.DrawerNo == Convert.ToInt32(strDrawerNo)).Select(cl => cl.DrawerType).First(); + SelfEnable = true; + //int listSelfState = SqlSugarHelper.Db.Queryable().Where(cl => cl.MachineId == "DM5") + // .WhereIf(cl => cl.BelongUser == HomeWindowViewModel.Operator.UserBarcode).Select(cl => cl.DrawerState).First(); + + int listDrawerState = SqlSugarHelper.Db.Queryable().Where(cl => cl.MachineId == "DM5" && cl.DrawerType == this.DrawerType) + .WhereIF(this.DrawerType == 0, cl => cl.BelongUser == HomeWindowViewModel.Operator.UserBarcode).Select(cl => cl.DrawerState).First(); + if (DrawerType == 1) //公共药箱 + { + if (listDrawerState == 0) + { + SelfContent = "还公共药箱"; + } + else + { + SelfContent = "取公共药箱"; + } + + } + else + { + if (listDrawerState == 0) + { + SelfContent = "还名下药箱"; + } + else + { + SelfContent = "取名下药箱"; + } + + } + + } + public DelegateCommand OpenBoxDelegate + { + get => new DelegateCommand((DrawerType) => + { + SearchBox(); + } + ); + } + private void SearchBox() + { + iList = SqlSugarHelper.Db.Queryable().Where(cl => cl.MachineId == "DM5" && cl.DrawerType == this.DrawerType) + .WhereIF(this.DrawerType == 0, cl => cl.BelongUser == HomeWindowViewModel.Operator.UserBarcode).ToList(); + // .Select(cl => cl.DrawerNo).ToList(); + if (iList.Count > 0) + { + //_portUtil.SpeakAsync("正在打开药箱"); + //_portUtil.DrawerNo = iList[iNumber]; + //iNumber++; + //_portUtil.OpenBox(); + + for (int i = 0; i < iList.Count; i++) + { + ChannelList channelList = iList[i]; + //记录开药箱日志 + SqlSugarHelper.Db.Insertable(new MachineRecord() + { + MachineId = "DM5", + DrawerNo = channelList.DrawerNo, + Operator = HomeWindowViewModel.Operator?.Id, + OperationTime = DateTime.Now, + Type = 55, + InvoiceId = $"打开{iList[i].DrawerNo}号药箱", + OptionType = SelfContent.Substring(0, 1) == "取" ? 0 : 1 + }).ExecuteCommand(); + //记录药箱打开时间 + channelList.EffDate = DateTime.Now.ToString(); + channelList.DrawerState = SelfContent.Substring(0, 1) == "取" ? 0 : 1; + SqlSugarHelper.Db.Updateable(channelList).UpdateColumns(it => new { it.EffDate, it.DrawerState }).ExecuteCommand(); + + _portUtil.SpeakAsync($"正在打开{channelList.DrawerNo}号药箱"); + logger.Info($"正在打开{channelList.DrawerNo}号药箱"); + ModbusHelper.GetInstance().OpenBoxDoor(channelList.DrawerNo - 1); + Thread.Sleep(1000); + } + + SelfStatus = 0; + PublicEnable = true; + SelfEnable = true; + DrawerType = -1; + } + } public DelegateCommand RowSelected { get => new DelegateCommand(() => diff --git a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs index 49f6013..49c176c 100644 --- a/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs +++ b/DM_Weight/ViewModels/RoleManagerWindowViewModel.cs @@ -199,7 +199,7 @@ namespace DM_Weight.ViewModels PremissionDm openBoxWithOrder = new PremissionDm { Id = 14, - PremissionName = "开药箱", + PremissionName = "操作药箱", PremissionPath = "CheckSelfOrderWindow", }; //核对处方 diff --git a/DM_Weight/Views/CheckSelfOrderWindow.xaml b/DM_Weight/Views/CheckSelfOrderWindow.xaml index 87e28d8..da34136 100644 --- a/DM_Weight/Views/CheckSelfOrderWindow.xaml +++ b/DM_Weight/Views/CheckSelfOrderWindow.xaml @@ -124,6 +124,11 @@ +