|
@@ -83,7 +83,7 @@ namespace DefaultEdit.Core
|
|
|
|
|
|
public double[] ProduceData = new double[]{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 };
|
|
|
|
|
|
-
|
|
|
+
|
|
|
public IServer HttpService { get => _httpService; set { SetProperty(ref _httpService, value); } }
|
|
|
|
|
|
public string UserId { get => _UserId; set { SetProperty(ref _UserId, value); } }
|
|
@@ -100,9 +100,9 @@ namespace DefaultEdit.Core
|
|
|
private Stopwatch[] stopwatchs = new Stopwatch[3];
|
|
|
public Management()
|
|
|
{
|
|
|
- stopwatchs[0] = new Stopwatch();
|
|
|
- stopwatchs[1] = new Stopwatch();
|
|
|
- stopwatchs[2] = new Stopwatch();
|
|
|
+ stopwatchs[ 0 ] = new Stopwatch();
|
|
|
+ stopwatchs[ 1 ] = new Stopwatch();
|
|
|
+ stopwatchs[ 2 ] = new Stopwatch();
|
|
|
for ( int i = 0; i < 6; i++ )
|
|
|
{
|
|
|
CurrStationRfid.Add("");
|
|
@@ -113,7 +113,7 @@ namespace DefaultEdit.Core
|
|
|
WorkThread.Name = "Plc读取";
|
|
|
WorkThread.IsBackground = true;
|
|
|
WorkThread.Start();
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public void ConnectPlc()
|
|
@@ -130,7 +130,7 @@ namespace DefaultEdit.Core
|
|
|
case "1工位离心开始":
|
|
|
if ( value )
|
|
|
{
|
|
|
- stopwatchs[0].Restart();
|
|
|
+ stopwatchs[ 0 ].Restart();
|
|
|
if ( RfIDList.Count != 0 )
|
|
|
{
|
|
|
int index= RfIDList.FindIndex(x => x.StationId == 1);
|
|
@@ -140,17 +140,17 @@ namespace DefaultEdit.Core
|
|
|
CurrStationRfid[ 1 ] = RfIDList[ index ].Rfid;
|
|
|
LogHelper.Info(RfIDList[ index ].Rfid + " 1工位离心开始");
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
|
|
|
LogHelper.Info(" 1工位离心开始");
|
|
|
}
|
|
|
index = RfIDList.FindIndex(x => x.StationId == 1);
|
|
|
- if (index != -1)
|
|
|
+ if ( index != -1 )
|
|
|
{
|
|
|
- RfIDList[index].StationId = 2;
|
|
|
- CurrStationRfid[2] = RfIDList[index].Rfid;
|
|
|
- LogHelper.Info(RfIDList[index].Rfid + " 1工位离心开始");
|
|
|
+ RfIDList[ index ].StationId = 2;
|
|
|
+ CurrStationRfid[ 2 ] = RfIDList[ index ].Rfid;
|
|
|
+ LogHelper.Info(RfIDList[ index ].Rfid + " 1工位离心开始");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -163,13 +163,17 @@ namespace DefaultEdit.Core
|
|
|
|
|
|
LogHelper.Info(" 1工位离心开始");
|
|
|
}
|
|
|
-
|
|
|
+ LogHelper.Debuginfo("1工位离心开始已置位");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LogHelper.Debuginfo("1工位离心开始已复位");
|
|
|
}
|
|
|
break;
|
|
|
case "1工位离心完成":
|
|
|
if ( value )
|
|
|
{
|
|
|
- stopwatchs[0].Stop();
|
|
|
+ stopwatchs[ 0 ].Stop();
|
|
|
if ( RfIDList.Count != 0 )
|
|
|
{
|
|
|
int index= RfIDList.FindIndex(x => x.StationId == 2);
|
|
@@ -178,56 +182,61 @@ namespace DefaultEdit.Core
|
|
|
RfIDList[ index ].StationId = 3;
|
|
|
LogHelper.Info(CurrStationRfid[ 1 ] + " 1工位离心完成");
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
LogHelper.Info(" 1工位离心完成");
|
|
|
|
|
|
}
|
|
|
|
|
|
index = RfIDList.FindIndex(x => x.StationId == 2);
|
|
|
- if (index != -1)
|
|
|
+ if ( index != -1 )
|
|
|
{
|
|
|
- RfIDList[index].StationId = 3;
|
|
|
- LogHelper.Info(CurrStationRfid[2] + " 1工位离心完成");
|
|
|
+ RfIDList[ index ].StationId = 3;
|
|
|
+ LogHelper.Info(CurrStationRfid[ 2 ] + " 1工位离心完成");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
LogHelper.Info(" 1工位离心完成");
|
|
|
|
|
|
}
|
|
|
- CurrStationRfid[1] = "";
|
|
|
- CurrStationRfid[2] = "";
|
|
|
+ CurrStationRfid[ 1 ] = "";
|
|
|
+ CurrStationRfid[ 2 ] = "";
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
LogHelper.Info(" 1工位离心完成");
|
|
|
|
|
|
}
|
|
|
+ LogHelper.Debuginfo("1工位离心完成已置位");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LogHelper.Debuginfo("1工位离心完成已复位");
|
|
|
}
|
|
|
break;
|
|
|
case "2工位离心开始":
|
|
|
if ( value )
|
|
|
{
|
|
|
- stopwatchs[1].Restart();
|
|
|
- if (RfIDList.Count != 0)
|
|
|
+ stopwatchs[ 1 ].Restart();
|
|
|
+ if ( RfIDList.Count != 0 )
|
|
|
{
|
|
|
int index = RfIDList.FindIndex(x => x.StationId == 3);
|
|
|
- if (index != -1)
|
|
|
+ if ( index != -1 )
|
|
|
{
|
|
|
- RfIDList[index].StationId = 4;
|
|
|
- CurrStationRfid[3] = RfIDList[index].Rfid;
|
|
|
- LogHelper.Info(RfIDList[index].Rfid + " 2工位离心开始");
|
|
|
+ RfIDList[ index ].StationId = 4;
|
|
|
+ CurrStationRfid[ 3 ] = RfIDList[ index ].Rfid;
|
|
|
+ LogHelper.Info(RfIDList[ index ].Rfid + " 2工位离心开始");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
LogHelper.Info(" 2工位离心开始");
|
|
|
}
|
|
|
index = RfIDList.FindIndex(x => x.StationId == 1);
|
|
|
- if (index != -1)
|
|
|
+ if ( index != -1 )
|
|
|
{
|
|
|
- RfIDList[index].StationId = 4;
|
|
|
- CurrStationRfid[4] = RfIDList[index].Rfid;
|
|
|
- LogHelper.Info(RfIDList[index].Rfid + " 2工位离心开始");
|
|
|
+ RfIDList[ index ].StationId = 4;
|
|
|
+ CurrStationRfid[ 4 ] = RfIDList[ index ].Rfid;
|
|
|
+ LogHelper.Info(RfIDList[ index ].Rfid + " 2工位离心开始");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -238,12 +247,17 @@ namespace DefaultEdit.Core
|
|
|
{
|
|
|
LogHelper.Info(" 2工位离心开始");
|
|
|
}
|
|
|
+ LogHelper.Debuginfo("2工位离心开始已置位");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LogHelper.Debuginfo("2工位离心开始已复位");
|
|
|
}
|
|
|
break;
|
|
|
case "2工位离心完成":
|
|
|
if ( value )
|
|
|
{
|
|
|
- stopwatchs[1].Stop();
|
|
|
+ stopwatchs[ 1 ].Stop();
|
|
|
if ( RfIDList.Count != 0 )
|
|
|
{
|
|
|
int index= RfIDList.FindIndex(x => x.StationId == 4);
|
|
@@ -252,54 +266,65 @@ namespace DefaultEdit.Core
|
|
|
RfIDList[ index ].StationId = 5;
|
|
|
LogHelper.Info(CurrStationRfid[ 3 ] + " 2工位离心完成");
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
LogHelper.Info(" 2工位离心完成");
|
|
|
}
|
|
|
index = RfIDList.FindIndex(x => x.StationId == 4);
|
|
|
- if (index != -1)
|
|
|
+ if ( index != -1 )
|
|
|
{
|
|
|
- RfIDList[index].StationId = 5;
|
|
|
- LogHelper.Info(CurrStationRfid[4] + " 1工位离心完成");
|
|
|
+ RfIDList[ index ].StationId = 5;
|
|
|
+ LogHelper.Info(CurrStationRfid[ 4 ] + " 1工位离心完成");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
LogHelper.Info(" 1工位离心完成");
|
|
|
|
|
|
}
|
|
|
- CurrStationRfid[3] = "";
|
|
|
- CurrStationRfid[4] = "";
|
|
|
+ CurrStationRfid[ 3 ] = "";
|
|
|
+ CurrStationRfid[ 4 ] = "";
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
LogHelper.Info(" 2工位离心完成");
|
|
|
}
|
|
|
+ LogHelper.Debuginfo("2工位离心完成已置位");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LogHelper.Debuginfo("2工位离心完成已复位");
|
|
|
}
|
|
|
break;
|
|
|
case "脱模开始":
|
|
|
if ( value )
|
|
|
{
|
|
|
-
|
|
|
LogHelper.Info(CurrConfig.Rfid + " 脱模开始");
|
|
|
-
|
|
|
- PlateInPlace(CurrConfig.Rfid);
|
|
|
-
|
|
|
-
|
|
|
+ PlateInPlace(CurrConfig.Rfid);
|
|
|
+ LogHelper.Debuginfo("脱模开始已置位");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LogHelper.Debuginfo("脱模开始已复位");
|
|
|
}
|
|
|
break;
|
|
|
case "脱模完成":
|
|
|
if ( value )
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
LogHelper.Info(CurrConfig.Rfid + " 脱模完成");
|
|
|
- if(processDataModels.Count!=0)
|
|
|
- PrintInfo(processDataModels[0],"手动");
|
|
|
+ if ( processDataModels.Count != 0 )
|
|
|
+ PrintInfo(processDataModels[ 0 ], "手动");
|
|
|
+ LogHelper.Debuginfo("脱模完成已置位");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LogHelper.Debuginfo("脱模完成已复位");
|
|
|
}
|
|
|
break;
|
|
|
case "固化开始":
|
|
|
if ( value )
|
|
|
{
|
|
|
- stopwatchs[2].Restart();
|
|
|
+ stopwatchs[ 2 ].Restart();
|
|
|
if ( RfIDList.Count != 0 )
|
|
|
{
|
|
|
int index= RfIDList.FindIndex(x => x.StationId ==5 );
|
|
@@ -309,17 +334,17 @@ namespace DefaultEdit.Core
|
|
|
CurrStationRfid[ 5 ] = RfIDList[ index ].Rfid;
|
|
|
LogHelper.Info(RfIDList[ index ].Rfid + " 固化开始");
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
- LogHelper.Info( " 固化开始");
|
|
|
+ LogHelper.Info(" 固化开始");
|
|
|
}
|
|
|
|
|
|
index = RfIDList.FindIndex(x => x.StationId == 5);
|
|
|
- if (index != -1)
|
|
|
+ if ( index != -1 )
|
|
|
{
|
|
|
- RfIDList[index].StationId = 6;
|
|
|
- CurrStationRfid[6] = RfIDList[index].Rfid;
|
|
|
- LogHelper.Info(RfIDList[index].Rfid + " 固化开始");
|
|
|
+ RfIDList[ index ].StationId = 6;
|
|
|
+ CurrStationRfid[ 6 ] = RfIDList[ index ].Rfid;
|
|
|
+ LogHelper.Info(RfIDList[ index ].Rfid + " 固化开始");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -330,12 +355,17 @@ namespace DefaultEdit.Core
|
|
|
{
|
|
|
LogHelper.Info(" 固化开始");
|
|
|
}
|
|
|
+ LogHelper.Debuginfo("固化开始已置位");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LogHelper.Debuginfo("固化开始已复位");
|
|
|
}
|
|
|
break;
|
|
|
case "固化完成":
|
|
|
if ( value )
|
|
|
{
|
|
|
- stopwatchs[2].Stop();
|
|
|
+ stopwatchs[ 2 ].Stop();
|
|
|
if ( RfIDList.Count != 0 )
|
|
|
{
|
|
|
int index= RfIDList.FindIndex(x => x.StationId ==6 );
|
|
@@ -344,16 +374,16 @@ namespace DefaultEdit.Core
|
|
|
RfIDList.RemoveAt(index);
|
|
|
LogHelper.Info(RfIDList[ index ].Rfid + " 固化完成");
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
- LogHelper.Info( " 固化完成");
|
|
|
+ LogHelper.Info(" 固化完成");
|
|
|
}
|
|
|
|
|
|
index = RfIDList.FindIndex(x => x.StationId == 6);
|
|
|
- if (index != -1)
|
|
|
+ if ( index != -1 )
|
|
|
{
|
|
|
RfIDList.RemoveAt(index);
|
|
|
- LogHelper.Info(RfIDList[index].Rfid + " 固化完成");
|
|
|
+ LogHelper.Info(RfIDList[ index ].Rfid + " 固化完成");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -362,10 +392,10 @@ namespace DefaultEdit.Core
|
|
|
//CurrStationRfid[5] = RfIDList[index].Rfid;
|
|
|
//CurrStationRfid[6] = RfIDList[index].Rfid;
|
|
|
int hour= DateTime.Now.Hour;
|
|
|
- ProduceData[ hour ] = ProduceData[ hour ]+2;
|
|
|
- for ( int i = hour+1; i < ProduceData.Length; i++ )
|
|
|
+ ProduceData[ hour ] = ProduceData[ hour ] + 2;
|
|
|
+ for ( int i = hour + 1; i < ProduceData.Length; i++ )
|
|
|
{
|
|
|
- ProduceData[ i ] = 0;
|
|
|
+ ProduceData[ i ] = 0;
|
|
|
}
|
|
|
ProduceDataToChangeEvent?.Invoke();
|
|
|
}
|
|
@@ -373,8 +403,11 @@ namespace DefaultEdit.Core
|
|
|
{
|
|
|
LogHelper.Info(" 固化完成");
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ LogHelper.Debuginfo("固化完成已置位");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ LogHelper.Debuginfo("固化完成已复位");
|
|
|
}
|
|
|
break;
|
|
|
default:
|
|
@@ -404,7 +437,7 @@ namespace DefaultEdit.Core
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- if (s7PlcCommunicate!=null&& s7PlcCommunicate.IsConnected )
|
|
|
+ if ( s7PlcCommunicate != null && s7PlcCommunicate.IsConnected )
|
|
|
{
|
|
|
byte []buff= s7PlcCommunicate.ReadByte(25, 780, 84);
|
|
|
int actuallength=buff[73];
|
|
@@ -437,23 +470,23 @@ namespace DefaultEdit.Core
|
|
|
//CurrConfig.Power1_3 = s7PlcCommunicate.GetShortAt(buff, 24);
|
|
|
//CurrConfig.Power1_4 = s7PlcCommunicate.GetShortAt(buff, 26);
|
|
|
|
|
|
- CurrConfig.Realtime = (float)(stopwatchs[0].ElapsedMilliseconds / 1000.0);
|
|
|
- CurrConfig.Realtime2 = (float)(stopwatchs[1].ElapsedMilliseconds / 1000.0);
|
|
|
- CurrConfig.Realtime3 = (float)(stopwatchs[2].ElapsedMilliseconds / 1000.0);
|
|
|
+ CurrConfig.Realtime = ( float ) ( stopwatchs[ 0 ].ElapsedMilliseconds / 1000.0 );
|
|
|
+ CurrConfig.Realtime2 = ( float ) ( stopwatchs[ 1 ].ElapsedMilliseconds / 1000.0 );
|
|
|
+ CurrConfig.Realtime3 = ( float ) ( stopwatchs[ 2 ].ElapsedMilliseconds / 1000.0 );
|
|
|
|
|
|
- for (int i = 0; i < stopwatchs.Length; i++)
|
|
|
+ for ( int i = 0; i < stopwatchs.Length; i++ )
|
|
|
{
|
|
|
- if (stopwatchs[i].ElapsedMilliseconds / 1000.0 > 1000)
|
|
|
+ if ( stopwatchs[ i ].ElapsedMilliseconds / 1000.0 > 1000 )
|
|
|
{
|
|
|
- stopwatchs[i].Stop();
|
|
|
+ stopwatchs[ i ].Stop();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
List<tb_formulasdata> tb_Formulasdatas = SqlSugarHelper.Queryabletb_formulasdata();
|
|
|
- if (tb_Formulasdatas.Count != 0)
|
|
|
- Formulasdata = tb_Formulasdatas[0];
|
|
|
+ if ( tb_Formulasdatas.Count != 0 )
|
|
|
+ Formulasdata = tb_Formulasdatas[ 0 ];
|
|
|
}
|
|
|
catch
|
|
|
{
|
|
@@ -520,25 +553,25 @@ namespace DefaultEdit.Core
|
|
|
var tip = "";
|
|
|
var isoutline = false;
|
|
|
XnRestfulResult<List<Re_Items>> groupdata=new XnRestfulResult<List<Re_Items>>();
|
|
|
- if (Ismeswork)
|
|
|
+ if ( Ismeswork )
|
|
|
{
|
|
|
- groupdata = _httpService.GetGroupItems(boardId, CurentApplicationSettings.DeviceId);
|
|
|
- if (!groupdata.Success)
|
|
|
+ groupdata = _httpService.GetGroupItems(boardId, CurentApplicationSettings.DeviceId);
|
|
|
+ if ( !groupdata.Success )
|
|
|
{
|
|
|
|
|
|
- if (groupdata.RawText.Contains("未点检"))
|
|
|
+ if ( groupdata.RawText.Contains("未点检") )
|
|
|
{
|
|
|
var s = MessageBox.Show("设备未点检,请点检后确认!", "提示", MessageBoxButton.OK);
|
|
|
|
|
|
}
|
|
|
- LogHelper.MesInfo($"网板ID:{boardId}获取信息失败,Code:{(int)groupdata.Code},原因:{groupdata.RawText}");
|
|
|
+ LogHelper.MesInfo($"网板ID:{boardId}获取信息失败,Code:{( int ) groupdata.Code},原因:{groupdata.RawText}");
|
|
|
isoutline = true;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if (groupdata.Data.Count <= 0)
|
|
|
+ if ( groupdata.Data.Count <= 0 )
|
|
|
{
|
|
|
- LogHelper.MesInfo($"网板ID:{boardId}获取信息失败,Code:{(int)groupdata.Code},原因:{groupdata.RawText}");
|
|
|
+ LogHelper.MesInfo($"网板ID:{boardId}获取信息失败,Code:{( int ) groupdata.Code},原因:{groupdata.RawText}");
|
|
|
isoutline = true;
|
|
|
}
|
|
|
}
|
|
@@ -548,15 +581,15 @@ namespace DefaultEdit.Core
|
|
|
|
|
|
isoutline = true;
|
|
|
}
|
|
|
- if (!isoutline)
|
|
|
+ if ( !isoutline )
|
|
|
{
|
|
|
///上传后处理记录
|
|
|
var result = UpdateRecord(boardId);
|
|
|
- if (!string.IsNullOrEmpty(result))
|
|
|
+ if ( !string.IsNullOrEmpty(result) )
|
|
|
{
|
|
|
LogHelper.MesInfo($"上传记录失败,{result}!");
|
|
|
var boxresult = MessageBox.Show($"{result}(是:放回;否:重试)", "提示", MessageBoxButton.YesNo);
|
|
|
- if (boxresult == MessageBoxResult.Yes)
|
|
|
+ if ( boxresult == MessageBoxResult.Yes )
|
|
|
{
|
|
|
IsOK = false;
|
|
|
return;
|
|
@@ -564,7 +597,7 @@ namespace DefaultEdit.Core
|
|
|
|
|
|
}
|
|
|
///读取网板内的牙模的信息(方便打印在小票上),如果读取失败就读取下一个牙模,读取成功就跳出循环
|
|
|
- for (int i = 0; i < 10; i++)
|
|
|
+ for ( int i = 0; i < 10; i++ )
|
|
|
{
|
|
|
try
|
|
|
{
|
|
@@ -572,44 +605,44 @@ namespace DefaultEdit.Core
|
|
|
count = groupdata.Data.Count;
|
|
|
var Id = groupdata.Data[groupdata.Data.Count - i].itemId;
|
|
|
var infos = _httpService.GetModels(Id, CurentApplicationSettings.DeviceId);
|
|
|
- if (infos.Success)
|
|
|
+ if ( infos.Success )
|
|
|
{
|
|
|
modelsinfo = infos.Data.uvcuringReleaseBatch + " " + infos.Data.alignerSpec.material + "-" + infos.Data.alignerSpec.thickness;
|
|
|
- if (infos.Data.order.is_expedited == "1" || infos.Data.remade || infos.Data.produceType == "R")
|
|
|
+ if ( infos.Data.order.is_expedited == "1" || infos.Data.remade || infos.Data.produceType == "R" )
|
|
|
{
|
|
|
modelsinfo = modelsinfo + "\r\n";
|
|
|
- if (infos.Data.order.is_expedited == "1")
|
|
|
+ if ( infos.Data.order.is_expedited == "1" )
|
|
|
{
|
|
|
modelsinfo = modelsinfo + " 加急";
|
|
|
}
|
|
|
- if (infos.Data.remade)
|
|
|
+ if ( infos.Data.remade )
|
|
|
{
|
|
|
modelsinfo = modelsinfo + " 返工";
|
|
|
}
|
|
|
- if (infos.Data.produceType == "R")
|
|
|
+ if ( infos.Data.produceType == "R" )
|
|
|
{
|
|
|
modelsinfo = modelsinfo + " 保持器";
|
|
|
}
|
|
|
}
|
|
|
iskid = infos.Data.isKid;
|
|
|
ishaiwai = infos.Data.order.country.Contains("中国") ? false : true;
|
|
|
- if (infos.Data.processParameters != null)
|
|
|
+ if ( infos.Data.processParameters != null )
|
|
|
{
|
|
|
var carrierf = infos.Data.processParameters.FirstOrDefault(x => x.key == "carrier");
|
|
|
- if (carrierf != null)
|
|
|
+ if ( carrierf != null )
|
|
|
{
|
|
|
isLarge = carrierf.value == "small" ? "小载具" : "大载具";
|
|
|
}
|
|
|
}
|
|
|
var record = _httpService.GetProductionRecord(Id);
|
|
|
- if (record.Success)
|
|
|
+ if ( record.Success )
|
|
|
{
|
|
|
printdeviceId = record.Data.First().deviceId;
|
|
|
- if (record.Data.First().description.FirstOrDefault(x => x.key == "printTaskId") != null)
|
|
|
+ if ( record.Data.First().description.FirstOrDefault(x => x.key == "printTaskId") != null )
|
|
|
{
|
|
|
var taskId = record.Data.First().description.FirstOrDefault(x => x.key == "printTaskId").value;
|
|
|
var taskinfo = _httpService.GetPrintTask(taskId);
|
|
|
- if (taskinfo.Success)
|
|
|
+ if ( taskinfo.Success )
|
|
|
{
|
|
|
materialtype = taskinfo.Data.description.FirstOrDefault(x => x.key == "filmType") != null ? taskinfo.Data.description.FirstOrDefault(x => x.key == "filmType").value : "";
|
|
|
printTagProduct = taskinfo.Data.description.FirstOrDefault(x => x.key == "printTagProduct") != null ? taskinfo.Data.description.FirstOrDefault(x => x.key == "printTagProduct").value : "";
|
|
@@ -620,7 +653,7 @@ namespace DefaultEdit.Core
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- catch (Exception e)
|
|
|
+ catch ( Exception e )
|
|
|
{
|
|
|
LogHelper.Error("读取网板内牙模信息异常:" + e.ToString());
|
|
|
}
|
|
@@ -662,7 +695,7 @@ namespace DefaultEdit.Core
|
|
|
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 )
|
|
|
+ if ( RfIDList.Find(x => x.Rfid == value) == null )
|
|
|
{
|
|
|
RfIDList.Add(rfidInfo);
|
|
|
RuningData.Add(rfidInfo);
|