From 65d425b66c2a578b85d810c93f29305b540ad2bd Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 5 Nov 2024 11:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=8D=AF=E5=93=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=8D=AF=E5=93=81=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=8E=82?=
 =?UTF-8?q?=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/App.config                                  | 2 +-
 DM_Weight/ViewModels/BindingChannelDialogViewModel.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 328ded2..4493cbd 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -3,7 +3,7 @@
   <connectionStrings>
 	<!-- 数据库连接字符串 -->
 	<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
-	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xiangxiang_xianchang;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xx_xiangchang2;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
diff --git a/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs b/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
index 83dbe8b..de18b7d 100644
--- a/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
+++ b/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
@@ -394,7 +394,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<DrugInfo>(str).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList();