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