From 344c70eec2a15314392c2bbdd12026e287173608 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 19 Nov 2024 15:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E4=B8=AD=E7=9A=84=E8=8D=AF?=
 =?UTF-8?q?=E5=93=81=E6=95=88=E6=9C=9F=E5=8F=96=E5=89=8D10=E4=BD=8D?=
 =?UTF-8?q?=EF=BC=88=E5=8F=96=E5=88=B0=E6=97=A5=E6=9C=9F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                             | 2 +-
 DM_Weight/ViewModels/OrderTakeDialogViewModel.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 9bfa6cd..11a94e6 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -29,7 +29,7 @@
 
 
 		<!--2023/7/13 药房代码 有则写无则空 -->
-		<add key="storage" value="159" />
+		<add key="storage" value="4" />
 		<!-- 登录模式 1单人登录2双人登录 -->
 		<add key="loginMode" value="1" />
 		<!-- 登录顺序,指定先登录的人的名称有效值，只有在登录模式等于2时才会生效； 发药人：【operator】审核人：【reviewer】 -->
diff --git a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
index ad191e8..b49f122 100644
--- a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
@@ -184,7 +184,7 @@ namespace DM_Weight.ViewModels
                     .Where(cs => cs.Quantity > 0)
                     .Where(cs => cs.DrawerType == 1)
                     .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
-                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate.Substring(0,10)))
                     .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
                     .Where(cs => cs.DrugId == orderDetail.DrugId)
                     .OrderBy(cs => cs.EffDate)