diff --git a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
index 42c44f9..acd1b0c 100644
--- a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
@@ -183,6 +183,7 @@ namespace DM_Weight.ViewModels
                 .ToList();
 
 
+
             List<ChannelStock> channelStocks = new List<ChannelStock>();
             List<string> msg = new List<string>();
             for (int i = 0; i < orderDetails.Count; i++)
@@ -197,9 +198,13 @@ namespace DM_Weight.ViewModels
                     .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
                     .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
                     .Where(cs => cs.DrugId == orderDetail.DrugId)
+                     .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前2个抽屉，双人登录开后14个抽屉
+                    .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
                     .OrderBy(cs => cs.EffDate)
                     .OrderBy(cs => cs.DrawerNo)
+                    .OrderBy(cs => cs.ManuNo)
                     .ToList();
+
                 int total = HasQChannels.Sum(it => it.Quantity);
                 int TakeQ = orderDetail.Quantity;
                 int multiTakeQ = orderDetail.Quantity;