From 684c52207556a00037f631aee6854ab2f53a8e84 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Mon, 18 Nov 2024 12:59:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=9F=9C=E5=8A=A0=E8=8D=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E6=A0=87=E8=AF=86=EF=BC=9A?= =?UTF-8?q?=E5=B7=B2=E5=8F=96=E8=8D=AF=E6=9C=AA=E5=85=A5=E5=BA=93=E3=80=81?= =?UTF-8?q?=E6=9C=AA=E5=8F=96=E8=8D=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/App.config | 4 +- DM_Weight/Converter/StockStatusConverter.cs | 48 +++++++++++++++++++ DM_Weight/Models/ChannelList.cs | 2 +- .../ViewModels/AddToJiaoJieDialogViewModel.cs | 40 +++++++++------- .../ViewModels/AddToJiaoJieWindowViewModel.cs | 9 +++- DM_Weight/Views/AddToJiaoJieWindow.xaml | 4 +- 6 files changed, 86 insertions(+), 21 deletions(-) create mode 100644 DM_Weight/Converter/StockStatusConverter.cs diff --git a/DM_Weight/App.config b/DM_Weight/App.config index 8c2e57e..d68021e 100644 --- a/DM_Weight/App.config +++ b/DM_Weight/App.config @@ -12,7 +12,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/DM_Weight/Converter/StockStatusConverter.cs b/DM_Weight/Converter/StockStatusConverter.cs new file mode 100644 index 0000000..0f31605 --- /dev/null +++ b/DM_Weight/Converter/StockStatusConverter.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Data; + +namespace DM_Weight.Converter +{ + internal class StockStatusConverter : IValueConverter + { + //是否给交接柜补药已补药的则不可勾选，未补药的可勾选以进行补药：0未补1已补 + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + int status = int.Parse(value.ToString()); + if (parameter.ToString() == "EnableState") + { + if (status == 0) + { + return true; + } + else + { + return false; + } + } + if(parameter.ToString()== "TextState") + { + if(status == 0) + { + return "未取药"; + } + else + { + return "已取药待入库"; + } + } + return ""; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/DM_Weight/Models/ChannelList.cs b/DM_Weight/Models/ChannelList.cs index d7aabbe..7e7309f 100644 --- a/DM_Weight/Models/ChannelList.cs +++ b/DM_Weight/Models/ChannelList.cs @@ -84,7 +84,7 @@ namespace DM_Weight.Models [SugarColumn(ColumnName = "board_type")] public int BoardType { get; set; } /// - /// + /// 用于标识是否给交接柜补药：0未补1已补 /// 默认值: 1 /// [SugarColumn(ColumnName = "state")] diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs index 764df77..2a61052 100644 --- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs +++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs @@ -352,22 +352,30 @@ namespace DM_Weight.ViewModels }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand(); //更新 交接柜 库存信息 - List jiaojie = Jiaojie_ChannelStocks.Where(cs => cs.DrugId == it.DrugId).ToList(); - if (jiaojie != null && jiaojie.Count > 0) - { - for (int j = 0; j < jiaojie.Count; j++) - { - // 更新数据 交接柜 库存信息 - ChannelStock jiaojie_it = jiaojie[j]; - SqlSugarHelper.Db.Updateable(new ChannelStock() - { - Quantity = jiaojie_it.BaseQuantity, - //ManuNo = it.ManuNo, - //EffDate = it.EffDate, - Id = jiaojie_it.Id, - }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity }).ExecuteCommand(); - } - } + //List jiaojie = Jiaojie_ChannelStocks.Where(cs => cs.DrugId == it.DrugId).ToList(); + //if (jiaojie != null && jiaojie.Count > 0) + //{ + // for (int j = 0; j < jiaojie.Count; j++) + // { + // // 更新数据 交接柜 库存信息 + // ChannelStock jiaojie_it = jiaojie[j]; + // SqlSugarHelper.Db.Updateable(new ChannelStock() + // { + // Quantity = jiaojie_it.BaseQuantity, + // //ManuNo = it.ManuNo, + // //EffDate = it.EffDate, + // Id = jiaojie_it.Id, + // }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity }).ExecuteCommand(); + + // //更新交接柜状态为 已取药未入库 + // SqlSugarHelper.Db.Updateable(new ChannelList() + // { + // State=1, + // Id=jiaojie_it.ChannelLst.Id + // }).UpdateColumns(it => it.State).ExecuteCommand(); + // } + //} + // 保存数据 出库记录 diff --git a/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs index 65ff3b6..8de0391 100644 --- a/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs +++ b/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs @@ -464,7 +464,14 @@ namespace DM_Weight.ViewModels { if (channelStock != null) { - channelStock.ChannelLst.IsSelected = !channelStock.ChannelLst.IsSelected; + if (channelStock.ChannelLst.State == 0) + { + channelStock.ChannelLst.IsSelected = !channelStock.ChannelLst.IsSelected; + } + else + { + return; + } if (channelStock != null && ChannelStocks != null) { ChannelStocks = ChannelStocks.Select(x => diff --git a/DM_Weight/Views/AddToJiaoJieWindow.xaml b/DM_Weight/Views/AddToJiaoJieWindow.xaml index 6db9915..5d9303b 100644 --- a/DM_Weight/Views/AddToJiaoJieWindow.xaml +++ b/DM_Weight/Views/AddToJiaoJieWindow.xaml @@ -19,6 +19,7 @@ + @@ -146,7 +147,7 @@ materialDesign:ExpanderAssist.HeaderBackground="PaleTurquoise" Expanded="Expander_Expanded" Collapsed="Expander_Collapsed"> - + @@ -166,6 +167,7 @@ +