From 54ab9a6801a599a127fe7740fd6c64bc118ed78b Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Sat, 18 Jan 2025 15:07:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E8=BD=AF=E4=BB=B6=E6=96=AD?= =?UTF-8?q?=E5=BC=80=E4=B8=8E=E6=9D=BF=E5=AD=90=E7=9A=84=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/Port/SocketHelper.cs | 12 ++++++++++-- DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs | 2 ++ .../ViewModels/CheckSelfOrderWindowViewModel.cs | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/DM_Weight/Port/SocketHelper.cs b/DM_Weight/Port/SocketHelper.cs index 85534f0..e214f74 100644 --- a/DM_Weight/Port/SocketHelper.cs +++ b/DM_Weight/Port/SocketHelper.cs @@ -122,8 +122,16 @@ namespace DM_Weight.Port } public void SocketDisConnect() { - acceptor.SessionClosed -=new EventHandler(SessionCloseMethod); - iConnectFuture.Session.CloseNow(); + + try + { + acceptor.SessionClosed -= new EventHandler(SessionCloseMethod); + iConnectFuture.Session.CloseNow(); + } + catch (Exception ex) + { + logger.Info($"SocketDisConnect异常{ex.Message}"); + } } public void SendMessage(MyBaseMessage baseMessage) diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs index eb12c11..331bb8e 100644 --- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs @@ -317,6 +317,8 @@ namespace DM_Weight.ViewModels .Where(oi => oi.HisDispFlag == 0) .Where(oi => oi.CancelFlag == 0) .Where(oi => oi.DrawerCode==DrawerNo+1) + .Where(oi=>oi._OrderDetail.SetManuNo!=null && oi._OrderDetail.SetManuNo != "null") + .Where(oi => oi._OrderDetail.Quantity > 0) .OrderBy(oi => oi.OrderId) .ToPageList(PageNum, PageSize, ref totalCount); diff --git a/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs b/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs index a2c752e..e2ddd05 100644 --- a/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs @@ -579,6 +579,8 @@ namespace DM_Weight.ViewModels .Where(oi => oi.HisDispFlag == 0) .Where(oi => oi.CancelFlag == 0) .Where(oi => oi.DoctorCode == currentDrawerUser) + .Where(oi => oi._OrderDetail.SetManuNo != null&&oi._OrderDetail.SetManuNo!="null") + .Where(oi=>oi._OrderDetail.Quantity>0) .OrderBy(oi => oi.OrderId) .ToPageList(PageNum, PageSize, ref totalCount);