From a3eb3a702fd0a5c59df4f2e67a71d9111ad83e3c Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 10 Dec 2024 09:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B7=BB=E5=8A=A035=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=86=99=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                              |  4 ++--
 DM_Weight/ViewModels/CheckStockWindowViewModel.cs | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 11a94e6..d8b9827 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -54,9 +54,9 @@
 		<!-- 抽屉串口使用的协议232或者485 -->
 		<add key="DrawerProtocol" value="485" />
 		<!-- 抽屉串口的串口号 -->
-		<add key="DrawerPortPath" value="COM1" />
+		<add key="DrawerPortPath" value="COM3" />
 		<!-- can总线串口的串口号 -->
-		<add key="CanBusPortPath" value="COM17" />
+		<add key="CanBusPortPath" value="COM11" />
 		<!-- 条码枪串口的串口号 -->
 		<add key="ScanCodePortPath" value="COM8" />
 		<!-- 冰箱的串口号 -->
diff --git a/DM_Weight/ViewModels/CheckStockWindowViewModel.cs b/DM_Weight/ViewModels/CheckStockWindowViewModel.cs
index 2e46b39..e91c9f8 100644
--- a/DM_Weight/ViewModels/CheckStockWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckStockWindowViewModel.cs
@@ -141,7 +141,7 @@ namespace DM_Weight.ViewModels
         // 完成按钮
         public DelegateCommand TakeFinish
         {
-            get => new DelegateCommand(() =>
+            get => new DelegateCommand(async() =>
             {
                 _isFinishClick = true;
                 List<ChannelStock> record = ChannelStocks.FindAll(it => it.Quantity != it.CheckQuantity).ToList();
@@ -206,7 +206,16 @@ namespace DM_Weight.ViewModels
                                 _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.CheckQuantity);
                             });
                         }
-
+                        if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 35)
+                        {
+                            for (int i = 0; i < singleChannels.Count; i++)
+                            {
+                                await Task.Delay(200);
+                                await _portUtil.WriteChannelInfoMethod(2, (singleChannels[i].CheckQuantity).ToString(), singleChannels[i].DrawerNo, singleChannels[i].ColNo);
+                                await Task.Delay(200);
+                                await _portUtil.ShowContentMethod(singleChannels[i].DrawerNo, singleChannels[i].ColNo);
+                            }
+                        }
                         RequestData();
                         AlertMsg alertMsg = new AlertMsg
                         {