刘彬 пре 1 недеља
родитељ
комит
c39b5cb50c
3 измењених фајлова са 11 додато и 5 уклоњено
  1. 9 3
      Core/Management.cs
  2. 1 1
      ViewModels/WorkRunViewModel.cs
  3. 1 1
      Views/WorkRunView.xaml

+ 9 - 3
Core/Management.cs

@@ -43,8 +43,8 @@ namespace DefaultEdit.Core
         private List<RfidInfo> _RfIDList=new List<RfidInfo>();
         public List<RfidInfo> RfIDList { get => _RfIDList; set => _RfIDList = value; }
 
-        private ObservableCollection<RfidInfo> _RuningData=new ObservableCollection<RfidInfo>();
-        public ObservableCollection<RfidInfo> RuningData { get => _RuningData; set => _RuningData = value; }
+      //  private ObservableCollection<RfidInfo> _RuningData=new ObservableCollection<RfidInfo>();
+      //  public ObservableCollection<RfidInfo> RuningData { get => _RuningData; set => _RuningData = value; }
 
         private CurrConfig _currConfig = new CurrConfig();
 
@@ -225,6 +225,7 @@ namespace DefaultEdit.Core
                             {
                                 RfIDList[ index ].StationId = 4;
                                 CurrStationRfid[ 3 ] = RfIDList[ index ].Rfid;
+                                RfIDList[ index ].State = "离心中";
                                 LogHelper.Info(RfIDList[ index ].Rfid + " 2工位离心开始");
                             }
                             else
@@ -236,6 +237,7 @@ namespace DefaultEdit.Core
                             {
                                 RfIDList[ index ].StationId = 4;
                                 CurrStationRfid[ 4 ] = RfIDList[ index ].Rfid;
+                                RfIDList[ index ].State = "离心中";
                                 LogHelper.Info(RfIDList[ index ].Rfid + " 2工位离心开始");
                             }
                             else
@@ -264,6 +266,7 @@ namespace DefaultEdit.Core
                             if ( index != -1 )
                             {
                                 RfIDList[ index ].StationId = 5;
+                                RfIDList[ index ].State = "离心完成";
                                 LogHelper.Info(CurrStationRfid[ 3 ] + " 2工位离心完成");
                             }
                             else
@@ -274,6 +277,7 @@ namespace DefaultEdit.Core
                             if ( index != -1 )
                             {
                                 RfIDList[ index ].StationId = 5;
+                                RfIDList[ index ].State = "离心完成";
                                 LogHelper.Info(CurrStationRfid[ 4 ] + " 1工位离心完成");
                             }
                             else
@@ -335,6 +339,7 @@ namespace DefaultEdit.Core
                             {
                                 RfIDList[ index ].StationId = 6;
                                 CurrStationRfid[ 5 ] = RfIDList[ index ].Rfid;
+                                RfIDList[ index ].State = "固化中";
                                 LogHelper.Info(RfIDList[ index ].Rfid + " 固化开始");
                             }
                             else
@@ -347,6 +352,7 @@ namespace DefaultEdit.Core
                             {
                                 RfIDList[ index ].StationId = 6;
                                 CurrStationRfid[ 6 ] = RfIDList[ index ].Rfid;
+                                RfIDList[ index ].State = "固化中";
                                 LogHelper.Info(RfIDList[ index ].Rfid + " 固化开始");
                             }
                             else
@@ -701,7 +707,7 @@ namespace DefaultEdit.Core
                                 if ( RfIDList.Find(x => x.Rfid == value) == null )
                                 {
                                     RfIDList.Add(rfidInfo);
-                                    RuningData.Add(rfidInfo);
+                                   // RuningData.Add(rfidInfo);
                                 }
                             });
 

+ 1 - 1
ViewModels/WorkRunViewModel.cs

@@ -124,7 +124,7 @@ namespace DefaultEdit.ViewModels
         void ClearRunData()
         {
 
-            Management.RuningData.Clear();
+            Management.RfIDList.Clear();
 
         }
 

+ 1 - 1
Views/WorkRunView.xaml

@@ -386,7 +386,7 @@
                         BorderThickness="2"
                         CornerRadius="5"
                         Padding="1">
-                    <ListView ItemsSource="{Binding Management.RuningData}">
+                    <ListView ItemsSource="{Binding Management.RfIDList}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn  Header="网板ID"