Răsfoiți Sursa

手动打印小票

刘彬 1 săptămână în urmă
părinte
comite
2fd93450e7
2 a modificat fișierele cu 50 adăugiri și 14 ștergeri
  1. 37 10
      ViewModels/WorkRunViewModel.cs
  2. 13 4
      Views/WorkRunView.xaml

+ 37 - 10
ViewModels/WorkRunViewModel.cs

@@ -4,6 +4,7 @@ using DefaultEdit.Log4xml;
 using DefaultEdit.Model;
 using DefaultEdit.Views;
 using Microsoft.Xaml.Behaviors;
+using NextTreatMesDemo.Models;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Ioc;
@@ -14,6 +15,7 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Threading;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace DefaultEdit.ViewModels
@@ -30,7 +32,7 @@ namespace DefaultEdit.ViewModels
 
         private ObservableCollection<string> _Logs = new ObservableCollection<string>();
         public ObservableCollection<string> Logs { get => _Logs; set => _Logs = value; }
-        public Management Management { get => _management; set => _management =  value ; }
+        public Management Management { get => _management; set => _management = value; }
 
 
         private DelegateCommand _OpenRoleLoginViewCommand;
@@ -39,10 +41,10 @@ namespace DefaultEdit.ViewModels
 
         private DelegateCommand _DLoginCommand;
         public DelegateCommand DLoginCommand =>
-            _DLoginCommand ?? (_DLoginCommand = new DelegateCommand(DLoginViewShow));
+            _DLoginCommand ?? ( _DLoginCommand = new DelegateCommand(DLoginViewShow) );
 
         private DelegateCommand _SwitchModeCommand;
-        public DelegateCommand  SwitchModeCommand =>
+        public DelegateCommand SwitchModeCommand =>
             _SwitchModeCommand ?? ( _SwitchModeCommand = new DelegateCommand(SwitchModeMethod) );
 
         private DelegateCommand _ClearRunDataCommand;
@@ -51,9 +53,14 @@ namespace DefaultEdit.ViewModels
 
 
         private DelegateCommand _ClearLogDataCommand;
-        public DelegateCommand  ClearLogDataCommand =>
+        public DelegateCommand ClearLogDataCommand =>
             _ClearLogDataCommand ?? ( _ClearLogDataCommand = new DelegateCommand(ClearLogData) );
 
+
+        private DelegateCommand<string> _ManualPrintCommand;
+        public DelegateCommand<string> ManualPrintCommand =>
+            _ManualPrintCommand ?? ( _ManualPrintCommand = new DelegateCommand<string>(ManualPrint) );
+
         public WorkRunViewModel(IContainerProvider container, IRegionManager regionManager, IEventAggregator eventAggregator)
         {
             _container = container;
@@ -64,9 +71,9 @@ namespace DefaultEdit.ViewModels
             LogHelper.Info("===========================程序启动==========================");
             Management.CurentApplicationSettings = FileHelper.ReadApplicationConfiguration();
             LogHelper.Info("加载配置文件完成");
-            Management. ConnectPlc();
-              //创建一个定时器,每秒更新一次时间
-              var timer = new System.Timers.Timer(1000);
+            Management.ConnectPlc();
+            //创建一个定时器,每秒更新一次时间
+            var timer = new System.Timers.Timer(1000);
             timer.Elapsed += (sender, e) =>
             {
                 Management.DateTimeNow = DateTime.Now;
@@ -105,7 +112,7 @@ namespace DefaultEdit.ViewModels
 
         void SwitchModeMethod()
         {
-            if (Management.Ismeswork)
+            if ( Management.Ismeswork )
             {
                 Management.Ismeswork = false;
             }
@@ -114,11 +121,11 @@ namespace DefaultEdit.ViewModels
                 Management.Ismeswork = true;
             }
         }
-        void ClearRunData() 
+        void ClearRunData()
         {
 
             Management.RuningData.Clear();
-        
+
         }
 
         void ClearLogData()
@@ -141,8 +148,28 @@ namespace DefaultEdit.ViewModels
             Management.UserName = "";
         }
 
+        void ManualPrint(string rfid)
+        {
 
 
+            bool isok=false;
+            for ( int i = 0; i < Management.processDataModels.Count; i++ )
+            {
+                if ( Management.processDataModels[ i ].BoardId == rfid )
+                {
+                    Management.PrintInfo(Management.processDataModels[ i ], "手动");
+                    Management.processDataModels.RemoveAt(i);
+                    isok=true;
+                    MessageBox.Show("打印完成");
+                }
+            }
+            if ( !isok ) 
+            {
+                MessageBox.Show("网板信息未找到");
+
+            }
+        }
+
 
 
 

+ 13 - 4
Views/WorkRunView.xaml

@@ -12,7 +12,7 @@
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d"
              d:DesignHeight="850"
-             d:DesignWidth="1200">
+             d:DesignWidth="1920">
     <UserControl.Resources>
         <c:BoolToStrConverter x:Key="boolTostr"></c:BoolToStrConverter>
     </UserControl.Resources>
@@ -394,13 +394,22 @@
                                                  Width="150" />
                                 <GridViewColumn  Header="状态"
                                                  DisplayMemberBinding="{Binding State}"
-                                                 Width="200" />
+                                                 Width="100" />
                                 <GridViewColumn  Header="批次信息"
                                                  DisplayMemberBinding="{Binding ModelsInfo}"
-                                                 Width="200" />
+                                                 Width="150" />
                                 <GridViewColumn  Header="开始时间"
                                                  DisplayMemberBinding="{Binding StartTime,StringFormat=yyyy-MM-dd}"
-                                                 Width="200" />
+                                                 Width="150" />
+                                <GridViewColumn Header="操作" Width="150">
+                                    <GridViewColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <Button Content="打印小票"
+                                                    Command="{Binding ManualPrintCommand}"
+                                                    CommandParameter="{Binding Rfid}"/>
+                                        </DataTemplate>
+                                    </GridViewColumn.CellTemplate>
+                                </GridViewColumn>
                             </GridView>
                         </ListView.View>