From b3c39e6d71e53a0df952940445bbe04f69105991 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Thu, 28 Nov 2024 17:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=8D=95=E5=AD=90=E6=97=B6?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=BC=80=E5=87=BA=E7=9A=84=E8=8D=AF=E5=93=81?=
 =?UTF-8?q?=E5=9C=A8=E8=8D=AF=E5=93=81=E8=A1=A8=E9=87=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=88=99=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                          |  2 +-
 .../CheckOrderNewWindowViewModel.cs           |  1 +
 .../CheckSelfOrderWindowViewModel.cs          | 20 ++++++++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 57a9162..62be8f3 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=xiangtan_jiaojie_xx;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xiangtan_mazuike_xx;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 41c0d8c..89b76a0 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -320,6 +320,7 @@ namespace DM_Weight.ViewModels
                 if (OrderInfoList != null && OrderInfoList.Count() > 0)
                 {
                     OrderInfoList.ForEach(oi => oi.ItemIsChecked = true);
+                    OrderInfoList.ForEach(oi => oi.OrderDetailList.ForEach(od => od.DrugInfo = od.DrugInfo ?? new DrugInfo()));
                     //TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).GroupBy(oi => oi.OrderDetailList.DrugInfo.DrugName).Select(oi => new TotalDrug { DrugName = oi.Key, TotalCount = oi.Sum(item => item.OrderDetailList.Quantity) }).ToList();
                     TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).SelectMany(OrderDetailList => OrderDetailList.OrderDetailList).GroupBy(item => item.DrugInfo.DrugName).Select(group => new TotalDrug { DrugName = group.Key, TotalCount = group.Sum(item => item.Quantity) }).ToList();
 
diff --git a/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs b/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs
index 463932d..e73f2c8 100644
--- a/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs
@@ -561,7 +561,7 @@ namespace DM_Weight.ViewModels
             if (DrawerNo >= 0)
             {
                 //查询当前药箱归属的药师
-                ChannelList currentList = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cl => cl.DrawerNo == DrawerNo + 1 && cl.MachineId == "DM5").First();//.Select(cl => cl.BelongUser).First();
+                ChannelList currentList = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cl => cl.DrawerNo == DrawerNo && cl.MachineId == "DM5").First();//.Select(cl => cl.BelongUser).First();
                 DrawerType = currentList.DrawerType;
                 string currentDrawerUser = currentList.BelongUser;
                 OrderInfoList = SqlSugarHelper.Db.Queryable<OrderInfo>()
@@ -580,7 +580,9 @@ namespace DM_Weight.ViewModels
 
                 if (OrderInfoList != null && OrderInfoList.Count() > 0)
                 {
-                    OrderInfoList.ForEach(oi => oi.ItemIsChecked = true);
+                    OrderInfoList.ForEach(oi => oi.ItemIsChecked = true); 
+                    OrderInfoList.ForEach(oi => oi.OrderDetailList.ForEach(od => od.DrugInfo = od.DrugInfo ?? new DrugInfo()));
+
                     //TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).GroupBy(oi => oi.OrderDetailList.DrugInfo.DrugName).Select(oi => new TotalDrug { DrugName = oi.Key, TotalCount = oi.Sum(item => item.OrderDetailList.Quantity) }).ToList();
                     TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).SelectMany(OrderDetailList => OrderDetailList.OrderDetailList).GroupBy(item => item.DrugInfo.DrugName).Select(group => new TotalDrug { DrugName = group.Key, TotalCount = group.Sum(item => item.Quantity) }).ToList();
 
@@ -701,6 +703,7 @@ namespace DM_Weight.ViewModels
                 if (OrderInfoList != null && OrderInfoList.Count() > 0)
                 {
                     OrderInfoList.ForEach(oi => oi.ItemIsChecked = true);
+                    OrderInfoList.ForEach(oi => oi.OrderDetailList.ForEach(od => od.DrugInfo=od.DrugInfo ?? new DrugInfo()));
                     //TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).GroupBy(oi => oi.OrderDetailList.DrugInfo.DrugName).Select(oi => new TotalDrug { DrugName = oi.Key, TotalCount = oi.Sum(item => item.OrderDetailList.Quantity) }).ToList();
                     TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).SelectMany(OrderDetailList => OrderDetailList.OrderDetailList).GroupBy(item => item.DrugInfo.DrugName).Select(group => new TotalDrug { DrugName = group.Key, TotalCount = group.Sum(item => item.Quantity) }).ToList();
 
@@ -741,20 +744,19 @@ namespace DM_Weight.ViewModels
             machineRecord.Operator = HomeWindowViewModel.Operator?.Id;
             machineRecord.OperationTime = DateTime.Now;
             machineRecord.Type = 55;
-            machineRecord.InvoiceId = $"打开{DrawerNo + 1}号药箱";
+            machineRecord.InvoiceId = $"打开{DrawerNo}号药箱";
 
 
             if (DrawerNo > 0)
             {
-                DrawerNo -= 1;
                 RequestData();
                 Status = 1;
-                _portUtil.SpeakAsync($"正在打开{DrawerNo + 1}号药箱");
-                logger.Info($"正在打开{DrawerNo + 1}号药箱");
+                _portUtil.SpeakAsync($"正在打开{DrawerNo}号药箱");
+                logger.Info($"正在打开{DrawerNo}号药箱");
                 //记录开药箱日志
                 SqlSugarHelper.Db.Insertable(machineRecord).ExecuteCommand();
-                ModbusHelper.GetInstance().OpenBoxDoor(DrawerNo);
-                SetBtnEnable(DrawerNo + 1, false);
+                ModbusHelper.GetInstance().OpenBoxDoor(DrawerNo-1);
+                SetBtnEnable(DrawerNo, false);
                 //if (CheckBoxStatusTimer is null)
                 //{
                 //    CheckBoxStatusTimer = new System.Timers.Timer();
@@ -1147,7 +1149,7 @@ namespace DM_Weight.ViewModels
         {
             get => new DelegateCommand(() =>
             {
-                RequestData();
+                GetUseBox(); 
             });
         }
         private void GetUseBox()