Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into IobMan

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-31 19:11:55 +01:00
parent 60ba1e5428 b0c394ae0f
commit af1692fd4f
13 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CVCncLib/testSam.dll
BIN
View File
Binary file not shown.
IOB-MAN/App.config
+4 -3
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<appSettings>
<add key="appName" value="IOB-MAN" />
<add key="appNameExt" value="IOB-WIN" />
@@ -59,6 +59,7 @@
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<probing privatePath="lib;libs" xmlns="" />
</assemblyBinding>
</runtime>
</configuration>
IOB-MAN/IOB-MAN.csproj
+7 -3
View File
@@ -183,9 +183,7 @@
<None Include="CONF\.placeholder">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="CONF\process.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="CONF\process.json" />
<None Include="logs\.placeholder">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@@ -226,4 +224,10 @@
<Import Project="..\packages\Fody.6.0.5\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.5\build\Fody.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Target Name="AfterBuild">
<ItemGroup>
<MoveToLibFolder Include="$(OutputPath)*.dll ; $(OutputPath)*.pdb ; $(OutputPath)*.xml" />
</ItemGroup>
<Move SourceFiles="@(MoveToLibFolder)" DestinationFolder="$(OutputPath)lib" OverwriteReadOnlyFiles="true" />
</Target>
</Project>
IOB-MAN/IOBManPanel.cs
-1
View File
@@ -412,7 +412,6 @@ namespace IOB_MAN
{
chekMult = utils.CRI("chekMult");
checkRunningchild();
updateStatus();
}
}
IOB-MAN/iobAdapt.cs
+3 -3
View File
@@ -21,10 +21,10 @@ namespace IOB_MAN
get
{
IobWinStatus answ = new IobWinStatus();
if (scadIobStatus > DateTime.Now)
if (scadIobStatus > DateTime.Now && lastIobStatus != null)
{
answ = lastIobStatus != null ? lastIobStatus : redisMan.iobStatus;
answ = lastIobStatus;
//answ = lastIobStatus != null ? lastIobStatus : redisMan.iobStatus;
}
else
{
IOB-MAN/packages.config
+1
View File
@@ -19,6 +19,7 @@
<package id="NLog.Schema" version="4.6.8" targetFramework="net461" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net461" />
<package id="Pipelines.Sockets.Unofficial" version="2.1.1" targetFramework="net461" />
<package id="PrettyBin" version="1.1.0" targetFramework="net461" />
<package id="SharpCompress" version="0.24.0" targetFramework="net461" />
<package id="SharpZipLib" version="1.2.0" targetFramework="net461" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net461" />
IOB-WIN/IobFanuc.cs
+1
View File
@@ -227,6 +227,7 @@ namespace IOB_WIN
{
if (getOptPar("PZCOUNT_MODE").StartsWith("STD"))
{
lgInfo("Init contapezzi FANUC: pzCntReload(true)");
pzCntReload(true);
// refresh associazione Macchina - IOB
sendM2IOB();
IOB-WIN/IobGeneric.cs
+7 -5
View File
@@ -1017,7 +1017,7 @@ namespace IOB_WIN
lastIdxODL = utils.callUrl(urlGetCurrODL);
lgInfo("Lettura ODL dall'url {0} --> {1}", urlGetCurrODL, lastIdxODL);
// se ho valori in coda da trasmettere uso dati REDIS
if (QueueIN.Count > 0 && !forceCountRec)
if (QueueIN.Count > 0 || !forceCountRec)
{
currServerCount = utils.callUrl(urlGetPzCount);
lgInfo("Lettura contapezzi dall'url {0}", urlGetPzCount);
@@ -1250,8 +1250,9 @@ namespace IOB_WIN
else if (ciclo == gatherCycle.VLF)
{
if (utils.CRB("enableContapezzi"))
{
// rilettura contapezzi da server... SE ABILITATA
{
// rilettura contapezzi da server... SE ABILITATA
lgInfo("Ciclo VLF: pzCntReload(false)");
pzCntReload(false);
// refresh associazione Macchina - IOB
sendM2IOB();
@@ -1413,6 +1414,7 @@ namespace IOB_WIN
private void svuotaCodaContapezzi()
{
lgInfo("Inizio svuotaCodaContapezzi");
// se ho contapezzi OLTRE limite...
while (lastCountCNC > contapezzi + minSendPzCountBlock)
{
@@ -1421,8 +1423,6 @@ namespace IOB_WIN
trySendPzCountBlock();
// aspetto x dare tempo calcolo
Thread.Sleep(300);
//// rileggo
//pzCntReload(true);
}
}
@@ -4167,6 +4167,7 @@ namespace IOB_WIN
// se oltre 1 min NON era online --> check pezzi!
if (DateTime.Now.Subtract(lastIobOnline).TotalMinutes > 1)
{
lgInfo($"sendDataBlock --> offline timeaout ({lastIobOnline}) --> pzCntReload(true)");
pzCntReload(true);
}
lastIobOnline = DateTime.Now;
@@ -4239,6 +4240,7 @@ namespace IOB_WIN
// se oltre 1 min NON era online --> check pezzi!
if (DateTime.Now.Subtract(lastIobOnline).TotalMinutes > 1)
{
lgInfo($"sendToMoonPro --> offline timeaout ({lastIobOnline}) --> pzCntReload(true)");
pzCntReload(true);
}
lastIobOnline = DateTime.Now;
IOB-WIN/IobKawasaki.cs
+1
View File
@@ -349,6 +349,7 @@ namespace IOB_WIN
{
if (getOptPar("PZCOUNT_MODE").StartsWith("STD"))
{
lgInfo("Init contapezzi KAWASAKI: pzCntReload(true)");
pzCntReload(true);
// refresh associazione Macchina - IOB
sendM2IOB();
IOB-WIN/IobOSAI.cs
+1
View File
@@ -127,6 +127,7 @@ namespace IOB_WIN
{
if (getOptPar("PZCOUNT_MODE").StartsWith("OVAR"))
{
lgInfo("Init contapezzi OSAI: pzCntReload(true)");
pzCntReload(true);
// refresh associazione Macchina - IOB
sendM2IOB();
IOB-WIN/IobSiemens.cs
+1
View File
@@ -891,6 +891,7 @@ namespace IOB_WIN
{
if (getOptPar("PZCOUNT_MODE").StartsWith("STD"))
{
lgInfo("Init contapezzi SIEMENS: pzCntReload(true)");
pzCntReload(true);
// refresh associazione Macchina - IOB
sendM2IOB();
IOB-WIN/IobSimula.cs
+1
View File
@@ -122,6 +122,7 @@ namespace IOB_WIN
}
setParamPlc();
// ricarico da server i dati dei pezzi fatti...
lgInfo("Init contapezzi SIMULA: pzCntReload(true)");
pzCntReload(true);
// imposto pezzi CNC ai pezzi contati da server...
lastCountCNC = contapezzi;
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=649']) {
withEnv(['NEXT_BUILD_NUMBER=651']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'