|
@@ -97,7 +97,6 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
{
|
|
|
get
|
|
|
{
|
|
|
- _connected = tcpNet.Connect();
|
|
|
return _connected;
|
|
|
}
|
|
|
set { _connected = value; }
|
|
@@ -214,6 +213,8 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OutWorkCommand = new DelegateCommand(UploadOutWork);
|
|
|
OrderCommand = new DelegateCommand(OrderEnter);
|
|
|
|
|
|
+ Connected = tcpNet.Connect();
|
|
|
+
|
|
|
#region tcpService
|
|
|
|
|
|
tcpService.Connected = (client, e) =>
|
|
@@ -602,7 +603,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
{
|
|
|
for (int i = 0; i < 30; i++)
|
|
|
{
|
|
|
- if (mes.Split(":")[i + 1] == "2")
|
|
|
+ if (mes.Split(":")[i + 1] == "1")
|
|
|
{
|
|
|
q[i] = 1;
|
|
|
}
|
|
@@ -1515,7 +1516,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- if (tcpNet != null && Connected)
|
|
|
+ if (Connected)
|
|
|
{
|
|
|
if (tcpNet.ReadInt(1500) == 1)
|
|
|
{
|
|
@@ -1560,6 +1561,8 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
allnumbers.RealityA++;
|
|
|
_repository.Update(allnumbers);
|
|
|
}
|
|
|
+
|
|
|
+ Quest(Order);
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
@@ -1847,7 +1850,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p1 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.0", false);
|
|
|
_logger.Information("{@Message}", $"工位1_writefalse2");
|
|
|
}
|
|
@@ -1904,7 +1907,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p2 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.1", false);
|
|
|
_logger.Information("{@Message}", $"工位2_writefalse2");
|
|
|
}
|
|
@@ -1962,7 +1965,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p3 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.2", false);
|
|
|
_logger.Information("{@Message}", $"工位3_writefalse2");
|
|
|
}
|
|
@@ -2020,7 +2023,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p4 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.3", false);
|
|
|
_logger.Information("{@Message}", $"工位4_writefalse2");
|
|
|
}
|
|
@@ -2077,7 +2080,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p5 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.4", false);
|
|
|
_logger.Information("{@Message}", $"工位5_writefalse2");
|
|
|
}
|
|
@@ -2135,7 +2138,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p6 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.5", false);
|
|
|
_logger.Information("{@Message}", $"工位6_writefalse2");
|
|
|
}
|
|
@@ -2193,7 +2196,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p7 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.8", false);
|
|
|
_logger.Information("{@Message}", $"工位7_writefalse2");
|
|
|
}
|
|
@@ -2251,7 +2254,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p8 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.9", false);
|
|
|
_logger.Information("{@Message}", $"工位8_writefalse2");
|
|
|
}
|
|
@@ -2309,7 +2312,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p9 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.10", false);
|
|
|
_logger.Information("{@Message}", $"工位9_writefalse2");
|
|
|
}
|
|
@@ -2366,7 +2369,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p10 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.11", false);
|
|
|
_logger.Information("{@Message}", $"工位10_writefalse2");
|
|
|
}
|
|
@@ -2423,7 +2426,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p11 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.14", false);
|
|
|
_logger.Information("{@Message}", $"工位11_writefalse2");
|
|
|
}
|
|
@@ -2480,7 +2483,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p12 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1025.15", false);
|
|
|
_logger.Information("{@Message}", $"工位12_writefalse2");
|
|
|
}
|
|
@@ -2537,7 +2540,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p13 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1026.0", false);
|
|
|
_logger.Information("{@Message}", $"工位13_writefalse2");
|
|
|
}
|
|
@@ -2597,7 +2600,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
|
|
|
}
|
|
|
p14 = d1.ToString() + d2.ToString() + d3.ToString();
|
|
|
- Thread.Sleep(500);
|
|
|
+ Thread.Sleep(200);
|
|
|
tcpNet.Write("1026.1", false);
|
|
|
_logger.Information("{@Message}", $"工位14_writefalse2");
|
|
|
}
|