From db6eb0c339a5e4bd4d7dba84e4046b60896eb76c Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 23 May 2025 13:12:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=85=A5=E5=BA=93=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=91=E5=AE=9A=E8=8D=AF=E5=93=81=E9=99=90=E5=AE=9A?=
 =?UTF-8?q?=E5=8F=AA=E6=9F=A5drawer=5Ftype=3D1=20=E5=A4=9A=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E6=97=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=95=B0=E9=87=8F=E4=B8=BA?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                          |   2 +-
 .../ViewModels/InvoiceInNewWindowViewModel.cs |   2 +-
 .../MultiOrderTakeDialogViewModel.cs          | 371 +++++++++---------
 .../MultiOrderTakeDrugWindowViewModel.cs      |   5 +
 .../Views/Dialog/MultiOrderTakeDialog.xaml    |   4 +-
 5 files changed, 205 insertions(+), 179 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 16c9ff8..003bda7 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=sanya_xianchang;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=sanya_xianchang2;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
diff --git a/DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs b/DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs
index 689ce3d..ee97e3b 100644
--- a/DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs
@@ -307,7 +307,7 @@ namespace DM_Weight.ViewModels
                                                  .Includes(cl => cl.Drug, di => di.DrugManuNos)
                                                  //.Includes(cl => cl.channelStocks, dr => dr.DrugInfo, d => d.DrugManuNos)
                                                  .Where(cl => cl.DrugId == invoices[i].DrugId && cl.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
-                                                 .Where(cl=>cl.DrawerNo>2)  //调拨只能往周转库调住院药房3~16为周转库
+                                                 .Where(cl=>cl.DrawerNo>2&&cl.DrawerType==1)  //调拨只能往周转库调住院药房3~16为周转库
                                                  .ToList();
                     ChannelList channelLst = channelL.Count > 0 ? channelL[0] : null;
                     if (channelLst == null || channelLst.Id is null)
diff --git a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
index e01c64c..fc95386 100644
--- a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
@@ -18,12 +18,13 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Threading;
 
 namespace DM_Weight.ViewModels
 {
     public class MultiOrderTakeDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
     {
-        private readonly ILog logger = LogManager.GetLogger(typeof(OrderTakeDialogViewModel));
+        private readonly ILog logger = LogManager.GetLogger(typeof(MultiOrderTakeDialogViewModel));
         public string Title => "多处方取药";
 
 
@@ -173,17 +174,22 @@ namespace DM_Weight.ViewModels
 
         public void OnDialogOpened(IDialogParameters parameters)
         {
+            logger.Info("进入MultiOrderTakeDialogViewModel_查询数据");
             _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
             OrderInfo = parameters.GetValue<ObservableCollection<OrderInfo>>("orderInfo");
-            MultiOrderNo += string.Join(",   ", OrderInfo.Select(o => o.OrderNo));
+            MultiOrderNo += string.Join(",   ", OrderInfo.Select(o => o.OrderNo)).Length > 60 ? string.Join(",   ", OrderInfo.Select(o => o.OrderNo)).Substring(0, 60) + "……" : string.Join(",   ", OrderInfo.Select(o => o.OrderNo));
             RequestData();
+            logger.Info($"结束MultiOrderTakeDialogViewModel_查询数据，处理处方{MultiOrderNo}");
         }
 
         public async void RequestData()
         {
             orderDetails = SqlSugarHelper.Db.Queryable<OrderDetail>()
               //.Includes<DrugInfo>(od => od.DrugInfo)
-              .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (od, t) => od.DrugId == t.DrugId)
+              .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>()
+              .Where(cs => cs.DrawerType == 1)
+              .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+              .GroupBy(cs => cs.DrugId), (od, t) => od.DrugId == t.DrugId)
               .Where(od => OrderInfo.Select(o => o.OrderNo).Contains(od.OrderNo)).GroupBy(od => od.DrugId)
 
               .Select(od => new OrderDetail { DrugId = od.DrugId, SetEffDate = od.SetEffDate, SetManuNo = od.SetManuNo, Quantity = SqlFunc.AggregateSum(od.Quantity) })
@@ -348,7 +354,6 @@ namespace DM_Weight.ViewModels
             _portUtil.DrawerNo = DrawerNo;
             _portUtil.Start();
         }
-
         private bool _isFinishClick = false;
         // 完成按钮
         public DelegateCommand TakeFinish
@@ -361,183 +366,199 @@ namespace DM_Weight.ViewModels
                     List<ChannelStock> record = ChannelStocks.FindAll(it => it.TakeQuantity > 0).ToList();
 
                     //根据处方单数量分别更新处方状态、写记录信息
-                    if (OrderInfo.Count > 0)
+                    if (OrderInfo != null && OrderInfo.Count > 0)
                     {
-
-                        for (int j = 0; j < OrderInfo.Count; j++)
-                        {
-                            string InvoiceId = OrderInfo[j].OrderNo;
-                            var f = SqlSugarHelper.Db.UseTran(() =>
-                            {
-                                //SqlSugarHelper.Db.Updateable(new OrderInfo()
-                                //{
-                                //    DmStatus = 1,
-                                //    OrderNo = OrderInfo[j].OrderNo
-                                //}).UpdateColumns(it => new { it.DmStatus }).WhereColumns(it => new { it.OrderNo }).ExecuteCommand();
-
-                                //SqlSugarHelper.Db.Insertable(new OrderFinish()
-                                //{
-                                //    OrderNo = OrderInfo[j].OrderNo,
-                                //    PatientId = OrderInfo[j].PatientId,
-                                //    Pharmacy = OrderInfo[j].Pharmacy,
-                                //    State = 1,
-                                //    Operator = HomeWindowViewModel.Operator?.Nickname,
-                                //});
-                                for (int i = 0; i < record.Count; i++)
-                                {
-                                    int ordinalNum = SqlSugarHelper.Db.Queryable<MachineRecord>()
-                                              .Where(mr => mr.OperationTime.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
-                                              .Max(mr => mr.OrdinalNum);
-                                    //处方中该药品明细
-                                    OrderDetail orderDetail = SqlSugarHelper.Db.Queryable<OrderDetail>()
-                                             .Where(od => od.OrderNo == OrderInfo[j].OrderNo && od.DrugId == record[i].DrugId && od.DetailStatus == 0)
-                                                .GroupBy(od => new { od.DrugId, od.OrderId, od.SetManuNo }).Select(od => new OrderDetail
-                                                {
-                                                    OrderId = od.OrderId,
-                                                    DrugId = od.DrugId,
-                                                    Quantity = SqlFunc.AggregateSum(od.Quantity)
-                                                }).First();
-                                    if (orderDetail != null)
-                                    {
-                                        //已取药数量
-                                        int hasTakeQuantity = SqlSugarHelper.Db.Queryable<MachineRecord>()
-                                                 .Where(mr => mr.InvoiceId == InvoiceId && mr.DrugId == record[i].DrugId && mr.GetId == orderDetail.OrderId)
-                                                 .Sum(mr => mr.Quantity);
-                                        //处方中该药品取药数量
-                                        int orderTakeQuantity = orderDetail.Quantity - hasTakeQuantity;
-
-                                        //当前药品库存
-                                        int stockQuantity = SqlSugarHelper.Db.Queryable<ChannelStock>()
-                                                 .Where(cs => cs.MachineId == (record[i].MachineId)
-                                                 && cs.DrugId == record[i].DrugId
-                                                 && cs.ManuNo == record[i].ManuNo && cs.DrawerNo == record[i].DrawerNo
-                                                 && cs.ColNo == record[i].ColNo).Select(cs => cs.Quantity).First();
-
-
-
-                                        //该处方没有这个药，跳出循环
-                                        if (stockQuantity <= 0)
-                                            continue;
-                                        if (!(stockQuantity == orderTakeQuantity))
-                                        {
-                                            if (stockQuantity > orderTakeQuantity)
-                                            {
-                                                //record[i].TakeQuantity = record[i].TakeQuantity - orderTakeQuantity;
-                                                record[i].TakeQuantity = orderTakeQuantity;
-                                                record[i].Quantity = stockQuantity - orderTakeQuantity;
-                                            }
-                                            else if (stockQuantity < orderTakeQuantity)
-                                            {
-                                                record[i].TakeQuantity = stockQuantity;
-                                                record[i].Quantity = 0;
-                                            }
-                                        }
-                                        else
-                                        {
-                                            record[i].TakeQuantity = orderTakeQuantity;
-                                            record[i].Quantity = stockQuantity - record[i].TakeQuantity;
-                                        }
-                                        ChannelStock it = record[i];
-                                        // 更新数据 库存信息
-                                        SqlSugarHelper.Db.Updateable(new ChannelStock()
-                                        {
-                                            Quantity = record[i].Quantity,
-                                            ManuNo = it.ManuNo,
-                                            EffDate = it.EffDate,
-                                            Id = it.Id,
-                                        }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
-                                        // 获取更新完库存后的药品库存
-                                        List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
-                                            .Where(cs => cs.MachineId.Equals(it.MachineId))
-                                            .Where(cs => cs.DrugId.Equals(it.DrugId))
-                                            .Where(cs => cs.DrawerType == 1)
-                                            .ToList();
-
-                                        // 保存数据 出库记录
-                                        SqlSugarHelper.Db.Insertable(new MachineRecord()
-                                        {
-                                            MachineId = it.MachineId,
-                                            DrawerNo = it.DrawerNo,
-                                            ColNo = it.ColNo,
-                                            DrugId = it.DrugId,
-                                            ManuNo = it.ManuNo,
-                                            EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
-                                            Operator = HomeWindowViewModel.Operator?.Id,
-                                            Reviewer = HomeWindowViewModel.Reviewer?.Id,
-                                            OperationTime = DateTime.Now,
-                                            Quantity = record[i].TakeQuantity,
-                                            Type = 2,
-                                            InvoiceId = InvoiceId,
-                                            OrdinalNum = ordinalNum + 1,
-                                            StockQuantity = nowChannels.Sum(it => it.Quantity),
-                                            ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
-                                            SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
-                                            ReceiveDept = OrderInfo[j].DeptName,
-                                            GetId = orderDetail.OrderId
-                                        }).ExecuteCommand();
-                                    }
-                                }
-                                //更新处方状态
-                                SqlSugarHelper.Db.Updateable(new OrderInfo()
-                                {
-                                    DmStatus = 1,
-                                    OrderNo = OrderInfo[j].OrderNo
-                                }).UpdateColumns(it => new { it.DmStatus }).WhereColumns(it => new { it.OrderNo }).ExecuteCommand();
-
-
-                                //更新处方明细状态为已取药1
-                                List<OrderDetail> orderDetailLst = SqlSugarHelper.Db.Queryable<OrderDetail>().Where(od => od.OrderNo == OrderInfo[j].OrderNo && od.DetailStatus == 0).ToList();
-                                if (orderDetailLst != null && orderDetailLst.Count > 0)
-                                {
-                                    orderDetailLst.ForEach(od => od.DetailStatus = 1);
-                                    SqlSugarHelper.Db.Updateable(orderDetailLst).UpdateColumns(it => new { it.DetailStatus }).ExecuteCommand();
-                                }
-
-
-                                return true;
-                            });
-                            if (f.Data)
-                            {
-                logger.Info("f.Data");
-
-                                //});
-                                // 更新屏显库存
-                                List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
-                                if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
-                                {
-                                    singleChannels.ForEach(it =>
-                                    {
-                                        _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
-                                        Thread.Sleep(200);
-                                    });
-                                }
-                                AlertMsg alertMsg = new AlertMsg
-                                {
-                                    Message = "抽屉取药完成，库存已更新",
-                                    Type = MsgType.SUCCESS,
-                                };
-                                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-                            }
-                            if (!f.IsSuccess)
-                            {
-                                AlertMsg alertMsg = new AlertMsg
-                                {
-                                    Message = "抽屉取药完成，库存更新失败！",
-                                    Type = MsgType.ERROR,
-                                };
-                                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-                            }
-                        }
-                        Status = 0;
-                        _isFinishClick = false;
-                        //RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
-                        RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+                        UpdateOrderInfo(OrderInfo, record);
                     }
                 }
-
             });
         }
+        private void UpdateOrderInfo(ObservableCollection<OrderInfo> orderInfo, List<ChannelStock> record)
+        {
+            var f = SqlSugarHelper.Db.UseTran(() =>
+            {
+                logger.Info("UseTran");
+                for (int j = 0; j < OrderInfo.Count; j++)
+                {
+                    logger.Info($"OrderInfo j-{j}");
+                    string InvoiceId = OrderInfo[j].OrderNo;
+                    for (int i = 0; i < record.Count; i++)
+                    {
 
+                        logger.Info($"record j-{i}");
+                        List<OrderDetail> orderDetails = SqlSugarHelper.Db.Queryable<OrderDetail>()
+                                     .Where(od => od.OrderNo == OrderInfo[j].OrderNo && od.DrugId == record[i].DrugId && od.DetailStatus == 0).ToList();
+                        if (orderDetails == null || orderDetails.Count <= 0)
+                        {
+                            logger.Info($"处方{OrderInfo[j].OrderNo}下无药品{record[i].DrugId}，或detail_status字段不为 0");
+                            continue;
+                        }
+                        logger.Info($"orderDetails");
+                        OrderDetail orderDetail = orderDetails.FirstOrDefault();
+                        orderDetail.Quantity = orderDetails.Sum(it => it.Quantity);
+                        //处方中该药品明细
+                        //OrderDetail orderDetail = SqlSugarHelper.Db.Queryable<OrderDetail>()
+                        //             .Where(od => od.OrderNo == OrderInfo[j].OrderNo && od.DrugId == record[i].DrugId && od.DetailStatus == 0)
+                        //                .GroupBy(od => new { od.DrugId, od.OrderId }).Select(od => new OrderDetail
+                        //                {
+                        //                    OrderId = od.OrderId,
+                        //                    DrugId = od.DrugId,
+                        //                    Quantity = SqlFunc.AggregateSum(od.Quantity)
+                        //                }).First();
+
+                        int ordinalNum = SqlSugarHelper.Db.Queryable<MachineRecord>()
+                                      .Where(mr => mr.OperationTime.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
+                                      .Max(mr => mr.OrdinalNum);
+                        logger.Info($"ordinalNum{ordinalNum}");
+                        //已取药数量
+                        int hasTakeQuantity = SqlSugarHelper.Db.Queryable<MachineRecord>()
+                                     .Where(mr => mr.InvoiceId == InvoiceId && mr.DrugId == record[i].DrugId && mr.GetId == orderDetail.OrderId)
+                                     .Sum(mr => mr.Quantity);
+                        //处方中该药品取药数量
+                        int orderTakeQuantity = orderDetail.Quantity - hasTakeQuantity;
+                        logger.Info($"orderTakeQuantity{orderTakeQuantity}");
+
+                        //当前药品库存
+                        int stockQuantity = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                     .Where(cs => cs.MachineId == (record[i].MachineId)
+                                     && cs.DrugId == record[i].DrugId
+                                     && cs.ManuNo == record[i].ManuNo && cs.DrawerNo == record[i].DrawerNo
+                                     && cs.ColNo == record[i].ColNo).Select(cs => cs.Quantity).First();
+
+
+                        logger.Info($"stockQuantity{stockQuantity}");
+
+                        //该处方没有这个药，跳出循环
+                        if (stockQuantity <= 0 || orderTakeQuantity <= 0)
+                            continue;
+                        if (!(stockQuantity == orderTakeQuantity))
+                        {
+                            if (stockQuantity > orderTakeQuantity)
+                            {
+                                //record[i].TakeQuantity = record[i].TakeQuantity - orderTakeQuantity;
+                                record[i].TakeQuantity = orderTakeQuantity;
+                                record[i].Quantity = stockQuantity - orderTakeQuantity;
+                            }
+                            else if (stockQuantity < orderTakeQuantity)
+                            {
+                                record[i].TakeQuantity = stockQuantity;
+                                record[i].Quantity = 0;
+                            }
+                        }
+                        else
+                        {
+                            record[i].TakeQuantity = orderTakeQuantity;
+                            record[i].Quantity = stockQuantity - record[i].TakeQuantity;
+                        }
+
+                        logger.Info($"record{stockQuantity}");
+                        ChannelStock it = record[i];
+                        // 更新数据 库存信息
+                        SqlSugarHelper.Db.Updateable(new ChannelStock()
+                        {
+                            Quantity = record[i].Quantity,
+                            ManuNo = it.ManuNo,
+                            EffDate = it.EffDate,
+                            Id = it.Id,
+                        }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                        logger.Info("更新数据 库存信息");
+                        // 获取更新完库存后的药品库存
+                        List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                                .Where(cs => cs.MachineId.Equals(it.MachineId))
+                                .Where(cs => cs.DrugId.Equals(it.DrugId))
+                                .Where(cs => cs.DrawerType == 1)
+                                .ToList();
+
+                        logger.Info("查询当前库存");
+                        // 保存数据 出库记录
+                        SqlSugarHelper.Db.Insertable(new MachineRecord()
+                        {
+                            MachineId = it.MachineId,
+                            DrawerNo = it.DrawerNo,
+                            ColNo = it.ColNo,
+                            DrugId = it.DrugId,
+                            ManuNo = it.ManuNo,
+                            EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                            Operator = HomeWindowViewModel.Operator?.Id,
+                            Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                            OperationTime = DateTime.Now,
+                            Quantity = orderDetail.Quantity,//record[i].TakeQuantity,
+                            Type = 2,
+                            InvoiceId = InvoiceId,
+                            OrdinalNum = ordinalNum + 1,
+                            StockQuantity = nowChannels.Sum(it => it.Quantity),
+                            ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
+                            SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
+                            ReceiveDept = OrderInfo[j].DeptName,
+                            GetId = orderDetail.OrderId
+                        }).ExecuteCommand();
+
+                        logger.Info("Insertable MachineRecord");
+                    }
+                    //更新处方状态
+                    SqlSugarHelper.Db.Updateable(new OrderInfo()
+                    {
+                        DmStatus = 1,
+                        OrderNo = OrderInfo[j].OrderNo
+                    }).UpdateColumns(it => new { it.DmStatus }).WhereColumns(it => new { it.OrderNo }).ExecuteCommand();
+
+
+                    logger.Info("更新处方");
+                    //更新处方明细状态为已取药1
+                    List<OrderDetail> orderDetailLst = SqlSugarHelper.Db.Queryable<OrderDetail>().Where(od => od.OrderNo == OrderInfo[j].OrderNo && od.DetailStatus == 0).ToList();
+                    if (orderDetailLst != null && orderDetailLst.Count > 0)
+                    {
+                        orderDetailLst.ForEach(od => od.DetailStatus = 1);
+                        SqlSugarHelper.Db.Updateable(orderDetailLst).UpdateColumns(it => new { it.DetailStatus }).ExecuteCommand();
+                    }
+                    else
+                    {
+                        logger.Info($"处方{OrderInfo[j].OrderNo}药品明细状态未更新");
+                    }
+
+                    logger.Info("处方明细状态为已取药1");
+                }
+                return true;
+            });
+            if (f.Data)
+            {
+                logger.Info("f.Data");
+
+                //});
+                // 更新屏显库存
+                List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
+                if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
+                {
+                    singleChannels.ForEach(it =>
+                    {
+                        _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                        Thread.Sleep(200);
+                    });
+                }
+                AlertMsg alertMsg = new AlertMsg
+                {
+                    Message = "抽屉取药完成，库存已更新",
+                    Type = MsgType.SUCCESS,
+                };
+                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+            }
+            if (!f.IsSuccess)
+            {
+                System.Windows.Application.Current.Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "抽屉取药完成，库存更新失败！",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }));
+            }
+            Status = 0;
+            _isFinishClick = false;
+            //RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+        }
         public long CurrentTimeMillis()
         {
             return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
diff --git a/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs
index 5497b74..a3f4731 100644
--- a/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs
@@ -1,6 +1,8 @@
 using DM_Weight.Models;
 using DM_Weight.msg;
 using DM_Weight.util;
+using log4net;
+using log4net.Repository.Hierarchy;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -299,6 +301,7 @@ namespace DM_Weight.ViewModels
             });
         }
 
+        private readonly ILog logger = LogManager.GetLogger(typeof(MultiOrderTakeDrugWindowViewModel));
         public void RequestData()
         {
             OrderInfos.Clear();
@@ -343,12 +346,14 @@ namespace DM_Weight.ViewModels
             }
             //TotalCount = totalCount;
             //PageCount = (int)Math.Ceiling((double)TotalCount / PageSize);
+            logger.Info("结束MultiOrderTakeDrugWindowViewModel_查询数据");
 
         }
 
         //接收导航传过来的参数  现在是在此处初始化了表格数据
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
+            logger.Info("进入MultiOrderTakeDrugWindowViewModel_查询数据");
             //_eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
             RequestData();
         }
diff --git a/DM_Weight/Views/Dialog/MultiOrderTakeDialog.xaml b/DM_Weight/Views/Dialog/MultiOrderTakeDialog.xaml
index a6489d1..8782722 100644
--- a/DM_Weight/Views/Dialog/MultiOrderTakeDialog.xaml
+++ b/DM_Weight/Views/Dialog/MultiOrderTakeDialog.xaml
@@ -21,7 +21,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="50" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="450" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid Background="#03a9f4" Grid.Row="0">
@@ -149,7 +149,7 @@
                             Content="取药"
                             Command="{Binding OpenDrawer}">
                     </Button>-->
-                    <TextBox  Margin="6"  Width="110"
+                    <TextBox  Margin="0 2 6 2"  Width="110"
                     Style="{StaticResource MaterialDesignOutlinedTextBox}"
                     VerticalAlignment="Top" Text="{Binding ReceivePerson}"
                     materialDesign:HintAssist.Hint="取药人(科室)" />