From e8e7bfc36d241a2bc4a72e2268803767988a34fd Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 28 Feb 2024 09:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=A0=87=E7=AD=BE=20?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                          |  4 +-
 .../BindingChannelNewDialogViewModel.cs       | 59 ++++++++++++++-----
 .../Views/Dialog/BindingChannelNewDialog.xaml | 16 ++++-
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 227fd75..6dbd23f 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -40,9 +40,9 @@
 		<!-- 抽屉串口使用的协议232或者485 -->
 		<add key="DrawerProtocol" value="485" />
 		<!-- 抽屉串口的串口号 -->
-		<add key="DrawerPortPath" value="COM18" />
+		<add key="DrawerPortPath" value="COM3" />
 		<!-- can总线串口的串口号 -->
-		<add key="CanBusPortPath" value="COM17" />
+		<add key="CanBusPortPath" value="COM9" />
 		<!-- 条码枪串口的串口号 -->
 		<add key="ScanCodePortPath" value="COM111" />
 		<!-- 抽屉串口的串口号 --><!--
diff --git a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
index b9a261a..b32acd8 100644
--- a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
+++ b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
@@ -218,7 +218,15 @@ namespace DM_Weight.ViewModels
                 SetProperty(ref _pageSize, value);
             }
         }
-
+        /// <summary>
+        /// 渲染标签状态
+        /// </summary>
+        private bool _status = false;
+        public bool Status
+        {
+            get => _status;
+            set => SetProperty(ref _status, value);
+        }
 
 
         public bool CanCloseDialog()
@@ -510,23 +518,29 @@ namespace DM_Weight.ViewModels
         /// </summary>
         public DelegateCommand ResetLabelCommand
         {
-            get => new DelegateCommand(async () =>
+            get => new DelegateCommand(() =>
             {
+
                 var SelectChannels = Channels.FindAll(item => item.IsSelected);
                 var c = SelectChannels.Count;
                 if (c > 0)
-                {
-
+                {  
+                    List<Task> tasks = new List<Task>();
                     SelectChannels.ForEach(async item =>
                     {
                         //var channelStock = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.Chnguid == item.Id).ToList();
+                     
                         if (item.BoardType == 5)
                         {
+
+                            Status = true;
                             if (item.DrugId == null)
                             {
                                 // 清除显示屏库位信息
                                 _portUtil.ClearContent(item.DrawerNo, item.ColNo);
-                                await Task.Delay(200);
+                                //await Task.Delay(200000);
+                                //Thread.Sleep(200);
+                                tasks.Add(TaskSleep());
                                 _portUtil.ShowContent(item.DrawerNo, item.ColNo);
                             }
                             else
@@ -535,23 +549,36 @@ namespace DM_Weight.ViewModels
                                 _portUtil.WindowName = "BindingChannelDialog";
                                 // 向显示屏写入库位信息
                                 _portUtil.WriteChannelInfo(1, drugSelected.DrugName, item.DrawerNo, item.ColNo);
-                                await Task.Delay(200);
+                                //await Task.Delay(200000000);
+                                //Thread.Sleep(200);
+                                tasks.Add(TaskSleep());
                                 _portUtil.WriteChannelInfo(2, drugSelected.DrugSpec, item.DrawerNo, item.ColNo);
-                                await Task.Delay(200);
+                                //await Task.Delay(200);
+                                //Thread.Sleep(200);
+                                tasks.Add(TaskSleep());
                                 _portUtil.WriteChannelInfo(8, drugSelected.Manufactory.Length > 10 ? drugSelected.Manufactory.Substring(0, 10) : drugSelected.Manufactory, item.DrawerNo, item.ColNo);
-                                await Task.Delay(200);
+                                //await Task.Delay(200);
+                                //Thread.Sleep(200);
+                                tasks.Add(TaskSleep());
                                 _portUtil.ShowContent(item.DrawerNo, item.ColNo);
                                 //_portUtil.WriteChannelInfo(6, DrugManuNo.EffDate==null?"": DrugManuNo.EffDate, item.DrawerNo, item.ColNo);
-                                await Task.Delay(200);
+                                //await Task.Delay(200);
+                                //Thread.Sleep(200);
+                                tasks.Add(TaskSleep());
                                 _portUtil.WriteQuantity(item.DrawerNo, item.ColNo, item.totalCount);
                                 //await Task.Delay(200);
                             }
-                            SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
-                            SnackbarMessageQueue.Enqueue("标签渲染完成！");
-                            return;
                         }
                     });
-                    //GetChannelsByDrawerNo();
+                    Task.WhenAll(tasks);
+
+                    if (Status.Equals(true))
+                    {
+                        SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
+                        SnackbarMessageQueue.Enqueue("标签渲染完成！");
+                        Status = false;
+                    }
+                    GetChannelsByDrawerNo();
                 }
                 else
                 {
@@ -560,7 +587,11 @@ namespace DM_Weight.ViewModels
                     SnackbarMessageQueue.Enqueue("请选择库位");
                     return;
                 }
-            });
+            }, () => Status == false);
+        }
+        static async Task TaskSleep()
+        {
+            await Task.Delay(200);
         }
         public DelegateCommand BtnCloseCommand
         {
diff --git a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
index 1e4404a..e343806 100644
--- a/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
+++ b/DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
@@ -17,6 +17,7 @@
 
     <UserControl.Resources>
         <convert:BoardTypeConverter x:Key="BoardTypeConverter" />
+        <convert:StatusConverter x:Key="StatusConverter" />
     </UserControl.Resources>
 
         <Grid>
@@ -73,11 +74,24 @@
                     DisplayMemberPath="drug_name_spec" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
                 />
             <StackPanel HorizontalAlignment="Right"  Grid.Column="2" Grid.ColumnSpan="2" Orientation="Horizontal">
+                <!--<Button
+                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                        ToolTip="渲染标签"
+                        Content="渲染标签"
+                        Command="{Binding ResetLabelCommand}" 
+                        materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                        materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            
+                    />-->
                 <Button
                         Style="{StaticResource MaterialDesignOutlinedLightButton}"
                         ToolTip="渲染标签"
                         Content="渲染标签"
-                        Command="{Binding ResetLabelCommand}"/>
+                        Command="{Binding ResetLabelCommand}" 
+                        materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, UpdateSourceTrigger=PropertyChanged}"
+                        materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, UpdateSourceTrigger=PropertyChanged}"
+                            
+                    />
                     <Button
                         Margin="6 0 6 0"
                         Style="{StaticResource MaterialDesignOutlinedLightButton}"