marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

picking model: set state right after pcb detection

Browse Source
This commit is contained in:
Stoyan Zlatev 2026-02-23 10:20:06 +01:00
parent 59f2fbfcf3
commit 25d296d3b7
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj
View File

@ -16,7 +16,7 @@
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>C:\Users\SZLATEV\Desktop\sdfgsdfg\</PublishUrl>
<PublishUrl>Z:\Aktuelle Anwendungen\Publish\Cordonel Assembly Line\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
@ -30,8 +30,7 @@
<PublisherName>Xylem Sensus Laatzen</PublisherName>
<SuiteName>Cordonel Assembly Line</SuiteName>
<WebPage>publish.htm</WebPage>
<AutorunEnabled>true</AutorunEnabled>
<ApplicationRevision>22</ApplicationRevision>
<ApplicationRevision>27</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@ -212,6 +211,7 @@
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="bin\Debug\configuration.json" />
<None Include="CordonelAssemblyLine_TemporaryKey.pfx" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">

19
Common/CordonelAssemblyLine/Model/PickingModel.cs
View File

@ -1135,17 +1135,18 @@ namespace CordonelAssemblyLine.Model
batch.AddMeter(tryMeter);
tryMeter.Logout();
Log("Try to get PcbID");
// _pcbId = "250639533"; //
// _pcbId = "250639533";
// _pcbId = "221520009";
_pcbId = tryMeter.GetPcbId();
_state = PickingStateMachine.GetOrderDetails;
SetState($"Pcb gefunden {_pcbId}");
Log($"New PcbID detected {_pcbId}");
var hasDetect = !string.IsNullOrEmpty(_pcbId);
if (hasDetect)
if (!string.IsNullOrEmpty(_pcbId))
{
SetState($"Pcb gefunden {_pcbId}");
Log($"New PcbID detected {_pcbId}");
try
{
for (var i = 0; i < 3; i++)
@ -1183,22 +1184,20 @@ namespace CordonelAssemblyLine.Model
else
{
lblS02Color = _progressDone;
lblS03Color = _progressWaiting;
_state = PickingStateMachine.GetOrderDetails;
lblS03Color = _progressDone;
break;
}
}
}
else
{
_state = PickingStateMachine.GetOrderDetails;
break;
}
break;
}
}
lblS02Text = _pcbId;
}
catch (Exception e)
{

2
Common/LaaPackages

@ -1 +1 @@
Subproject commit 653498d43dcca1234a8fba95959ca02bb2c3f480
Subproject commit 1cd877ff8628cdcb94a7ad2751d61dc77e1211da