Browse Source

打印小票信息不在清除

刘彬 2 weeks ago
parent
commit
d5f3f80049
2 changed files with 16 additions and 9 deletions
  1. 16 8
      Core/Management.cs
  2. 0 1
      ViewModels/WorkRunViewModel.cs

+ 16 - 8
Core/Management.cs

@@ -123,7 +123,7 @@ namespace DefaultEdit.Core
             s7PlcCommunicate.OpenPlc();
 
         }
-        private void Management_RuningToWorkEvent(string key, bool value)
+        private async void Management_RuningToWorkEvent(string key, bool value)
         {
             switch ( key )
             {
@@ -318,8 +318,15 @@ namespace DefaultEdit.Core
                         LogHelper.Info(CurrConfig.Rfid + " 脱模完成");
                         if ( processDataModels.Count != 0 )
                         {
-                            PrintInfo(processDataModels[ 0 ], "手动");
-                            processDataModels.RemoveAt(0);
+                            ProcessDataModel  data=processDataModels.ToList().Find(it=>it.BoardId== CurrConfig.Rfid);
+                            if ( data != null )
+                            {
+                                PrintInfo(data, "手动");
+                            }
+                            else 
+                            {
+                                LogHelper.Info(" 网板信息没找到");
+                            }
                         }
                         LogHelper.Debuginfo("脱模完成已置位");
                     }
@@ -680,6 +687,11 @@ namespace DefaultEdit.Core
                             ///将生产信息记录下,用于在打印完成时打印小票
                             App.Current.Dispatcher.Invoke(( System.Action ) delegate
                             {
+                                ProcessDataModel data= processDataModels.ToList().Find(it => it.BoardId == boardId);
+                                if ( data != null ) 
+                                {
+                                    processDataModels.Remove(data);
+                                }
                                 //添加记录
                                 processDataModels.Add(new ProcessDataModel()
                                 {
@@ -699,10 +711,6 @@ namespace DefaultEdit.Core
                                     Brand = brand,
                                     Count = count,
                                 });
-                                if ( processDataModels.Count > 10 )
-                                {
-                                    processDataModels.RemoveAt(0);
-                                }
                                 RfidInfo rfidInfo=   new RfidInfo() { Rfid = value, StationId = 1, ModelsInfo=modelsinfo, State="入料中", StartTime=DateTime.Now };
                                 if ( RfIDList.Find(x => x.Rfid == value) == null )
                                 {
@@ -800,7 +808,7 @@ namespace DefaultEdit.Core
         /// </summary>
         /// <param name="printinfo"></param>
         /// <param name="Position"></param>
-        public void PrintInfo(ProcessDataModel printinfo, string Position)
+        public async Task PrintInfo(ProcessDataModel printinfo, string Position)
         {
             try
             {

+ 0 - 1
ViewModels/WorkRunViewModel.cs

@@ -158,7 +158,6 @@ namespace DefaultEdit.ViewModels
                 if ( Management.processDataModels[ i ].BoardId == rfid )
                 {
                     Management.PrintInfo(Management.processDataModels[ i ], "手动");
-                    Management.processDataModels.RemoveAt(i);
                     isok=true;
                     MessageBox.Show("打印完成");
                 }