From 5ab35c846cec8b90644263d1b54bc210b6f6927c Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 31 Dec 2024 13:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E6=9F=9C=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E5=BC=80=E4=B8=80=E4=B8=AA=E6=8A=BD=E5=B1=89=E7=9A=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                                      | 2 +-
 DM_Weight/ViewModels/BindingChannelDialogViewModel.cs     | 4 ++--
 DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs | 4 ++--
 DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs  | 4 ++--
 DM_Weight/ViewModels/CheckStockNew2WindowViewModel.cs     | 4 ++--
 DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs      | 4 ++--
 DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs     | 4 ++--
 DM_Weight/ViewModels/OrderTakeDialogViewModel.cs          | 4 ++--
 DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs        | 4 ++--
 DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs         | 4 ++--
 DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs        | 4 ++--
 DM_Weight/ViewModels/SelfAddWindowViewModel.cs            | 4 ++--
 DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs       | 4 ++--
 DM_Weight/ViewModels/StockListWindowViewModel.cs          | 4 ++--
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 60c148d..db39a32 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_xianchang2;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=sanya_xx;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
diff --git a/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs b/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
index 31e64c4..859d86d 100644
--- a/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
+++ b/DM_Weight/ViewModels/BindingChannelDialogViewModel.cs
@@ -229,8 +229,8 @@ namespace DM_Weight.ViewModels
             var list = SqlSugarHelper.Db.Queryable<ChannelStock>()
         .Includes<DrugInfo>(cs => cs.DrugInfo)
         .WhereIF(DrawerNo > 0, cs => cs.DrawerNo == DrawerNo)
-        .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-        .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
+        .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+        .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
         .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
         .OrderBy(cs => cs.DrawerNo)
         .OrderBy(cs => cs.ColNo)
diff --git a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs
index 8d5a3ed..50504c2 100644
--- a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs	
+++ b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs	
@@ -258,8 +258,8 @@ namespace DM_Weight.ViewModels
             int totalCount = 0;
             var list = SqlSugarHelper.Db.Queryable<ChannelList>()
                 .Includes<DrugInfo>(cl => cl.Drug)
-                .WhereIF(App.SingleModel, cl => cl.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                .WhereIF(!(App.SingleModel), cl => cl.DrawerNo > 2)
+                .WhereIF(App.SingleModel, cl => cl.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                .WhereIF(!(App.SingleModel), cl => cl.DrawerNo > 1)
                 .Includes<ChannelStock>(cs => cs.channelStocks)
                 .WhereIF(DrawerNo > 0, cl => cl.DrawerNo == DrawerNo)
                 .Where(cl => cl.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
diff --git a/DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs b/DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs
index d49b1de..ac8c6b1 100644
--- a/DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs
+++ b/DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs
@@ -159,8 +159,8 @@ namespace DM_Weight.ViewModels
             List<CheckRecordStock> checkList = SqlSugarHelper.Db.Queryable<CheckRecordStock>()
                 .Includes<DrugInfo>(cs => cs.DrugInfo)
                 .Where(cs => cs.optdate == OptDate).OrderByDescending(cs => cs.optdate)
-                .WhereIF(App.SingleModel, cs => cs.rowNo <= 2) //单人登录开前2个抽屉，双人登录开后14个抽屉
-                .WhereIF(!(App.SingleModel), cs => cs.rowNo > 2)
+                .WhereIF(App.SingleModel, cs => cs.rowNo <= 1) //单人登录开前2个抽屉，双人登录开后14个抽屉
+                .WhereIF(!(App.SingleModel), cs => cs.rowNo > 1)
                 .ToList();
             ICollectionView vw = CollectionViewSource.GetDefaultView(checkList);
             vw.GroupDescriptions.Add(new PropertyGroupDescription("DrugInfo"));
diff --git a/DM_Weight/ViewModels/CheckStockNew2WindowViewModel.cs b/DM_Weight/ViewModels/CheckStockNew2WindowViewModel.cs
index 5a58f2a..94d198a 100644
--- a/DM_Weight/ViewModels/CheckStockNew2WindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckStockNew2WindowViewModel.cs
@@ -574,8 +574,8 @@ namespace DM_Weight.ViewModels
                 .Where(cs => cs.DrawerType == 1)
                 .Where(cs => cs.DrugId != null)
                 .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
-                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
+                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                 .WhereIF(!String.IsNullOrEmpty(SearchValue), cs => cs.DrugInfo.DrugName == SearchValue)
                 .OrderBy(cs => cs.DrawerNo)
                 .OrderBy(cs => cs.ColNo)
diff --git a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs
index 0931105..a814390 100644
--- a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs
@@ -722,8 +722,8 @@ namespace DM_Weight.ViewModels
                 .Where(cs => cs.DrawerType == 1)
                 .Where(cs => cs.DrugId != null)
                 .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
-                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
+                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                 .WhereIF(!String.IsNullOrEmpty(SearchValue), cs => cs.DrugInfo.DrugName == SearchValue)
                 .OrderBy(cs => cs.DrawerNo)
                 //.OrderByDescending(cs => cs.DrawerNo)
diff --git a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
index 631bf20..7b56439 100644
--- a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
@@ -198,8 +198,8 @@ 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)
+                     .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前2个抽屉，双人登录开后14个抽屉
+                    .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                     .OrderBy(cs => cs.EffDate)
                     .OrderBy(cs => cs.DrawerNo)
                     .OrderBy(cs => cs.ManuNo)
diff --git a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
index c71ee65..0fe7ba5 100644
--- a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
@@ -207,8 +207,8 @@ 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)
+                    .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前2个抽屉，双人登录开后14个抽屉
+                    .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                     .OrderBy(cs => cs.EffDate)
                     .OrderBy(cs => cs.DrawerNo)
                     .OrderBy(cs => cs.ManuNo)
diff --git a/DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs b/DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs
index 4fc9c05..626ecdb 100644
--- a/DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs
+++ b/DM_Weight/ViewModels/ReturnDrugWindow2ViewModel.cs
@@ -219,8 +219,8 @@ namespace DM_Weight.ViewModels
             List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
                 .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
                 .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1)
-                                                                      .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                                                                      .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
+                                                                      .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                                                                      .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                                                                       .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
                 .WhereIF(OrderDate != null, oi => oi.OrderDate.ToString("yyyy-MM-dd") == OrderDate)
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("OrderNo"), oi => oi.OrderNo == SearchValue)
diff --git a/DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs b/DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs
index 9668557..c7989e9 100644
--- a/DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ReturnDrugWindowViewModel.cs
@@ -184,8 +184,8 @@ namespace DM_Weight.ViewModels
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (mr) => mr.DrugInfo.DrugName.Contains(SearchValue))
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (mr) => mr.DrugInfo.PyCode.Contains(SearchValue))
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (mr) => mr.DrugInfo.DrugBarcode.Contains(SearchValue))
-                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
+                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                 .OrderBy(mr => mr.OperationTime)
                 .ToList();
             MachineRecords = queryData;
diff --git a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
index 42fc5f7..9bbeff3 100644
--- a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
@@ -105,8 +105,8 @@ namespace DM_Weight.ViewModels
             Channels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                 .LeftJoin<DrugInfo>((cs,di) => cs.DrugId == di.DrugId.ToString())
                 .Where((cs) => cs.DrawerType != 1)
-                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
+                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                 .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
                 .Select((cs, di) => new ChannelStock{
                     CanReturnQuantity = SqlFunc.Subqueryable<MachineRecord>().Where(mr => mr.DrugId == cs.DrugId&&mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) ,
diff --git a/DM_Weight/ViewModels/SelfAddWindowViewModel.cs b/DM_Weight/ViewModels/SelfAddWindowViewModel.cs
index fc7c0ba..91f3ea6 100644
--- a/DM_Weight/ViewModels/SelfAddWindowViewModel.cs
+++ b/DM_Weight/ViewModels/SelfAddWindowViewModel.cs
@@ -212,8 +212,8 @@ namespace DM_Weight.ViewModels
             //ChannelStocks = queryData;
             List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
                 .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
-                                                              .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                                                              .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
+                                                              .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                                                              .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                                                               .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))
diff --git a/DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs
index 7492ab6..5847835 100644
--- a/DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/SelfTakeDrugWindowViewModel.cs
@@ -197,8 +197,8 @@ namespace DM_Weight.ViewModels
             //ChannelStocks = queryData;
             List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
                 .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
-                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2 ) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2 )
+                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1 ) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1 )
                 .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null&&cs.Quantity>0).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
              .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))
diff --git a/DM_Weight/ViewModels/StockListWindowViewModel.cs b/DM_Weight/ViewModels/StockListWindowViewModel.cs
index 33eb09e..6b8ec0a 100644
--- a/DM_Weight/ViewModels/StockListWindowViewModel.cs
+++ b/DM_Weight/ViewModels/StockListWindowViewModel.cs
@@ -243,8 +243,8 @@ namespace DM_Weight.ViewModels
 
             List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
                .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
-                                                             .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉
-                                                             .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
+                                                             .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉，双人登录开后8个抽屉
+                                                             .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
                                                              .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))