From 8f4faabf3ff809baed1b2b44fc02a96bd6888eb9 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Tue, 5 Nov 2024 10:14:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=8D=AF=E5=93=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E8=8D=AF=E5=93=81=E6=97=B6=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=8E=82=E5=AE=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs | 2 +- DM_Weight/Views/BindBoxPackageWindow.xaml.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs index b70bc0c..bbbc823 100644 --- a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs +++ b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs @@ -240,7 +240,7 @@ namespace DM_Weight.ViewModels public void UpdateComboBoxItems(string text) { string str = @"SELECT d.drug_id,d.py_code,d.drug_barcode,d.drug_name,d.drug_brand_name,d.drug_spec,d.dosage,d.pack_unit, - d.manufactory,d.max_stock,CONCAT(drug_name,' ',drug_spec)as drug_name_spec FROM `drug_info` d"; + d.manufactory,d.max_stock,CONCAT(drug_name,' / ',drug_spec,' / ',manufactory) as drug_name_spec FROM `drug_info` d"; if (string.IsNullOrEmpty(text)) { DrugInfos = SqlSugarHelper.Db.SqlQueryable(str).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList(); diff --git a/DM_Weight/Views/BindBoxPackageWindow.xaml.cs b/DM_Weight/Views/BindBoxPackageWindow.xaml.cs index 3ffc9c6..7ad49c6 100644 --- a/DM_Weight/Views/BindBoxPackageWindow.xaml.cs +++ b/DM_Weight/Views/BindBoxPackageWindow.xaml.cs @@ -35,7 +35,7 @@ namespace DM_Weight.Views /// /// private void ComboBox_KeyUp(object sender, KeyEventArgs e) - { + { ComboBox comboBox = sender as ComboBox; vms.UpdateComboBoxItems(comboBox.Text); if (this.vms.DrugInfos.Count > 0)