From 6d9955cfe562ba8fd81cdfdc63bafe9cebbf6113 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Thu, 28 Nov 2024 13:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E8=A1=A8=E4=B8=AD=E6=95=88?=
 =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5=E4=B8=8E=E5=BA=93=E5=AD=98=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E6=95=88=E6=9C=9F=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E6=88=AA=E5=8F=96=E5=86=8D?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=87=B3=E5=BA=93=E5=AD=98=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                                  | 2 +-
 DM_Weight/ViewModels/AddDrugControlViewModel.cs       | 2 +-
 DM_Weight/ViewModels/BindingChannelDialogViewModel.cs | 9 ++++++---
 DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 4e2f10b..38204ac 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=xiangtan_mazuike;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xiangtan_mazuike_xx;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
index a332048..d75f8f8 100644
--- a/DM_Weight/ViewModels/AddDrugControlViewModel.cs
+++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
@@ -240,7 +240,7 @@ namespace DM_Weight.ViewModels
                             {
                                 ChannelStock it = record[i];
                                 it.ManuNo = it.drugManuNo.ManuNo;
-                                it.EffDate = it.drugManuNo.EffDate;
+                                it.EffDate = it.drugManuNo.EffDate.Length>=10?it.drugManuNo.EffDate.Substring(0,10):it.drugManuNo.EffDate;
                                 if (it.Id != null)
                                 {
                                     // 更新数据 库存信息
diff --git a/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs b/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
index 5156593..d7fc660 100644
--- a/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
+++ b/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
@@ -298,11 +298,14 @@ namespace DM_Weight.ViewModels
                                 {
                                     item.PosNo = 0;
                                 }
-
+                                if(DrugManuNo.EffDate!=null&& DrugManuNo.EffDate.Length>=10)
+                                {
+                                    DrugManuNo.EffDate= DrugManuNo.EffDate.Substring(0,10);
+                                }
                                 item.DrugId = DrugInfo.DrugId.ToString();
                                 item.ManuNo = DrugManuNo.ManuNo;
                                 item.DrugInfo = DrugInfo;
-                                item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate);
+                                item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate.Length>=10? DrugManuNo.EffDate.Substring(0,10): DrugManuNo.EffDate);
                                 SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.ManuNo, it.EffDate, it.PosNo }).ExecuteCommand();
 
                                 if (item.BoardType == 5)
@@ -317,7 +320,7 @@ namespace DM_Weight.ViewModels
                                     await Task.Delay(200);
                                     await _portUtil.WriteChannelInfo(6, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
                                     await Task.Delay(200);
-                                    await _portUtil.WriteChannelInfo(5, String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate), item.DrawerNo, item.ColNo);
+                                    await _portUtil.WriteChannelInfo(5, String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate.Length>=10? DrugManuNo.EffDate.Substring(0,10): DrugManuNo.EffDate), item.DrawerNo, item.ColNo);
                                     await Task.Delay(200);
                                     _portUtil.ShowContent(item.DrawerNo, item.ColNo);
                                 }
diff --git a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
index 453a82d..d341030 100644
--- a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
@@ -201,7 +201,7 @@ namespace DM_Weight.ViewModels
                             {
                                 ChannelStock it = record[i];
                                 it.ManuNo = it.drugManuNo.ManuNo;
-                                it.EffDate = it.drugManuNo.EffDate;
+                                it.EffDate = it.drugManuNo.EffDate.Length>10? it.drugManuNo.EffDate.Substring(0,10): it.drugManuNo.EffDate;
 
 
                                 // 更新数据 库存信息