diff --git a/DM_Weight/Models/UseFor.cs b/DM_Weight/Models/UseFor.cs new file mode 100644 index 0000000..1b2909f --- /dev/null +++ b/DM_Weight/Models/UseFor.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DM_Weight.Models +{ + /// + /// 取药或加药用途字段(如果是补库存则不加入到报表中) + /// + public class UseFor + { + /// + /// 96不用于入账册 + /// + public int UseId { get; set; } + /// + /// (入账册/不入账册) + /// + public string UseName { get; set; } + + } +} diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs index b2a9c51..9918106 100644 --- a/DM_Weight/ViewModels/AddDrugControlViewModel.cs +++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs @@ -25,6 +25,33 @@ namespace DM_Weight.ViewModels { public class AddDrugControlViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime { + public static List SelectUseList = new() + { + new UseFor{UseId=0,UseName="入账册"}, + new UseFor { UseId = 96, UseName = "不入账册" } + }; + private List _selects = SelectUseList; + + public List Selects + { + get { return _selects; } + set + { + SetProperty(ref _selects, value); + } + } + private UseFor _selectedItem = SelectUseList[0]; + /// + /// 取药或加药用途字段 + /// + public UseFor SelectedItem + { + get { return _selectedItem; } + set + { + SetProperty(ref _selectedItem, value); + } + } private readonly ILog logger = LogManager.GetLogger(typeof(AddDrugControlViewModel)); private List _drawerNoList = new List(); public static AddDrugControlViewModel vm; @@ -325,7 +352,7 @@ namespace DM_Weight.ViewModels Reviewer = HomeWindowViewModel.Reviewer?.Id, OperationTime = DateTime.Now, Quantity = it.AddQuantity, - Type = 1, + Type = SelectedItem.UseId == 0 ? 1 : SelectedItem.UseId, InvoiceId = InvoiceId, StockQuantity = nowChannels.Sum(it => it.Quantity), ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity) diff --git a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs index c52806b..0931105 100644 --- a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs @@ -26,6 +26,34 @@ namespace DM_Weight.ViewModels { public class CheckStockNewWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime { + public static List SelectUseList = new() + { + + new UseFor{UseId=0,UseName="入账册"}, + new UseFor { UseId = 96, UseName = "不入账册" } + }; + private List _selectsUseFor = SelectUseList; + + public List SelectsUseFor + { + get { return _selectsUseFor; } + set + { + SetProperty(ref _selectsUseFor, value); + } + } + private UseFor _selectedItemUseFor = SelectUseList[0]; + /// + /// 取药或加药用途字段 + /// + public UseFor SelectedItemUseFor + { + get { return _selectedItemUseFor; } + set + { + SetProperty(ref _selectedItemUseFor, value); + } + } //public static CheckStockNewWindowViewModel vm; private readonly ILog logger = LogManager.GetLogger(typeof(CheckStockNewWindowViewModel)); public string drugId; @@ -416,7 +444,7 @@ namespace DM_Weight.ViewModels Reviewer = HomeWindowViewModel.Reviewer?.Id, OperationTime = DateTime.Now, Quantity = it.CheckQuantity - it.Quantity, - Type = 4, + Type = SelectedItemUseFor.UseId==0? 4: SelectedItemUseFor.UseId, InvoiceId = InvoiceId, StockQuantity = nowChannels.Sum(it => it.Quantity), CheckQuantity = it.CheckQuantity, diff --git a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs index b6c0e74..25ace0e 100644 --- a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs @@ -22,6 +22,34 @@ namespace DM_Weight.ViewModels { public class DrawerAddDrugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime { + public static List SelectUseList = new() + { + + new UseFor{UseId=0,UseName="入账册"}, + new UseFor { UseId = 96, UseName = "不入账册" } + }; + private List _selectsUseFor = SelectUseList; + + public List SelectsUseFor + { + get { return _selectsUseFor; } + set + { + SetProperty(ref _selectsUseFor, value); + } + } + private UseFor _selectedItemUseFor = SelectUseList[0]; + /// + /// 取药或加药用途字段 + /// + public UseFor SelectedItemUseFor + { + get { return _selectedItemUseFor; } + set + { + SetProperty(ref _selectedItemUseFor, value); + } + } private readonly ILog logger = LogManager.GetLogger(typeof(DrawerAddDrugWindowViewModel)); private List _drawerNoList = new List(); @@ -276,7 +304,7 @@ namespace DM_Weight.ViewModels Reviewer = HomeWindowViewModel.Reviewer?.Id, OperationTime = DateTime.Now, Quantity = it.AddQuantity, - Type = 1, + Type = SelectedItemUseFor.UseId == 0 ? 1 : SelectedItemUseFor.UseId, InvoiceId = InvoiceId, StockQuantity = nowChannels.Sum(it => it.Quantity), ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity), diff --git a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs index d2c2f35..e1fdc08 100644 --- a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs @@ -26,6 +26,34 @@ namespace DM_Weight.ViewModels { public class DrawerTakeDrugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime { + public static List SelectUseList = new() + { + + new UseFor{UseId=0,UseName="入账册"}, + new UseFor { UseId = 96, UseName = "不入账册" } + }; + private List _selectsUseFor = SelectUseList; + + public List SelectsUseFor + { + get { return _selectsUseFor; } + set + { + SetProperty(ref _selectsUseFor, value); + } + } + private UseFor _selectedItemUseFor = SelectUseList[0]; + /// + /// 取药或加药用途字段 + /// + public UseFor SelectedItemUseFor + { + get { return _selectedItemUseFor; } + set + { + SetProperty(ref _selectedItemUseFor, value); + } + } private readonly ILog logger = LogManager.GetLogger(typeof(DrawerTakeDrugWindowViewModel)); private List _channelStocks = new List(); @@ -253,7 +281,7 @@ namespace DM_Weight.ViewModels Reviewer = HomeWindowViewModel.Reviewer?.Id, OperationTime = DateTime.Now, Quantity = it.TakeQuantity, - Type = 2, + Type = SelectedItemUseFor.UseId == 0 ? 2 : SelectedItemUseFor.UseId, InvoiceId = InvoiceId, StockQuantity = nowChannels.Sum(it => it.Quantity), ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity), diff --git a/DM_Weight/ViewModels/SelfAddDialogViewModel.cs b/DM_Weight/ViewModels/SelfAddDialogViewModel.cs index 4e50021..2b3f932 100644 --- a/DM_Weight/ViewModels/SelfAddDialogViewModel.cs +++ b/DM_Weight/ViewModels/SelfAddDialogViewModel.cs @@ -25,7 +25,34 @@ namespace DM_Weight.ViewModels { public class SelfAddDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime { + public static List SelectUseList = new() + { + new UseFor{UseId=0,UseName="入账册"}, + new UseFor { UseId = 96, UseName = "不入账册" } + }; + private List _selectsUseFor = SelectUseList; + + public List SelectsUseFor + { + get { return _selectsUseFor; } + set + { + SetProperty(ref _selectsUseFor, value); + } + } + private UseFor _selectedItemUseFor = SelectUseList[0]; + /// + /// 取药或加药用途字段 + /// + public UseFor SelectedItemUseFor + { + get { return _selectedItemUseFor; } + set + { + SetProperty(ref _selectedItemUseFor, value); + } + } private readonly ILog logger = LogManager.GetLogger(typeof(SelfAddDialogViewModel)); public string Title => "自选加药"; @@ -349,7 +376,7 @@ namespace DM_Weight.ViewModels Reviewer = HomeWindowViewModel.Reviewer?.Id, OperationTime = DateTime.Now, Quantity = it.AddQuantity, - Type = 1, + Type = SelectedItemUseFor.UseId == 0 ? 1 : SelectedItemUseFor.UseId, InvoiceId = InvoiceId, StockQuantity = nowChannels.Sum(it => it.Quantity), ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity), diff --git a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs index ee525ff..f051abc 100644 --- a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs +++ b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs @@ -23,7 +23,34 @@ namespace DM_Weight.ViewModels { public class SelfTakeDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime { + public static List SelectUseList = new() + { + new UseFor{UseId=0,UseName="入账册"}, + new UseFor { UseId = 96, UseName = "不入账册" } + }; + private List _selects = SelectUseList; + + public List Selects + { + get { return _selects; } + set + { + SetProperty(ref _selects, value); + } + } + private UseFor _selectedItem = SelectUseList[0]; + /// + /// 取药或加药用途字段 + /// + public UseFor SelectedItem + { + get { return _selectedItem; } + set + { + SetProperty(ref _selectedItem, value); + } + } private readonly ILog logger = LogManager.GetLogger(typeof(SelfTakeDialogViewModel)); public string Title => "自选取药"; @@ -308,7 +335,7 @@ namespace DM_Weight.ViewModels OperationTime = DateTime.Now, Quantity = it.TakeQuantity, Reviewer = HomeWindowViewModel.Reviewer?.Id, - Type = 2, + Type = SelectedItem.UseId == 0 ? 2 : SelectedItem.UseId, InvoiceId = InvoiceId, StockQuantity = nowChannels.Sum(it => it.Quantity), ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity), diff --git a/DM_Weight/Views/AddDrugControl.xaml b/DM_Weight/Views/AddDrugControl.xaml index 3e07b87..d359dc0 100644 --- a/DM_Weight/Views/AddDrugControl.xaml +++ b/DM_Weight/Views/AddDrugControl.xaml @@ -175,7 +175,14 @@ materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}" Style="{StaticResource MaterialDesignOutlinedLightButton}" Content="加药" /> - + + + +