From 0c090cb039159d3528de3cfd9a39a2de56735683 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Thu, 21 Nov 2024 09:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=A4=84=E6=96=B9=E5=8F=96=E8=8D=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E5=80=BC=E7=8F=AD=E6=9F=9C=E8=B7=9F?=
 =?UTF-8?q?=E5=91=A8=E8=BD=AC=E6=9F=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs | 5 +++++
 1 file changed, 5 insertions(+)

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;