Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-27 15:04:58 +01:00
parent c6762133ec 5f888faefb
commit abb24b3685
4 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ES3/WebUserControls/cmp_dispStats.ascx
+1
View File
@@ -8,4 +8,5 @@ statistiche disponibilità:<br />
<li>SOMMA ORE CUMULATE di apertura</li>
<li>SOMMA ORE CUMULATE già allocate</li>
<li>SOMMA ORE CUMULATE disponibili</li>
<li>SOMMA ORE CUMULATE LAVORATE (passate)</li>
</ul>
Jenkinsfile
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1276']) {
withEnv(['NEXT_BUILD_NUMBER=1277']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MAPO.sln
-18
View File
@@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-SITE", "MP-SITE\MP-SITE.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapoSDK", "MapoSDK\MapoSDK.csproj", "{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ES3", "ES3\ES3.csproj", "{C5296C93-4738-4B42-8C9D-B7E5A75110FD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -185,22 +183,6 @@ Global
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Prod|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Release|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Donati|Any CPU.ActiveCfg = Debug|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Donati|Any CPU.Build.0 = Debug|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS01|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS02|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Jetco|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Prod|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
MapoDb/DataLayer.cs
+57 -27
View File
@@ -7,6 +7,7 @@ using System.Data;
using System.Data.SqlClient;
using System.Globalization;
using System.Reflection;
using System.Threading;
namespace MapoDb
{
@@ -1340,6 +1341,15 @@ namespace MapoDb
return mHash(string.Format("CurrStatoMacc:{0}", idxMacchina));
}
/// <summary>
/// Hash x VETO dello SPLIT ODL la macchina specificata
/// </summary>
/// <param name="idxMacchina"></param>
/// <returns></returns>
public static string vetoSplitOdlMaccHash(string idxMacchina)
{
return mHash(string.Format("VetoOdlMacc:{0}", idxMacchina));
}
/// <summary>
/// Hash dati tabella AnagStati macchina
/// </summary>
/// <returns></returns>
@@ -1577,40 +1587,60 @@ namespace MapoDb
#region gestione attrezzaggi
/// <summary>
/// Effettua split ODL
/// </summary>
/// <param name="idxMacchina"></param>
/// <returns></returns>
public static string forceSplitOdl(string idxMacchina)
{
string answ = "KO";
DS_ProdTempi.ODLDataTable currData = null;
DateTime adesso = DateTime.Now;
// chiamo metodo redis/db...
try
// verifico NON CI SIA un veto a NUOVI split... 2 min di default...
string redKey = vetoSplitOdlMaccHash(idxMacchina);
string rawData = memLayer.ML.getRSV(redKey);
if (rawData == "")
{
// recupero ODL corrente
currData = currODLRowTab(idxMacchina);
if (currData.Count > 0)
// registro VETO x altri split... 2 minuti
memLayer.ML.setRSV(redKey, $"Inizio SPLIT-ODL {DateTime.Now}", 120);
// proseguo
DS_ProdTempi.ODLDataTable currData = null;
DateTime adesso = DateTime.Now;
// chiamo metodo redis/db...
try
{
// registro un evento di inizio attrezzaggio (idxTipoEv = 2)
int idxEvento = 2;
logger.lg.scriviLog($"Invio evento ODL-SPLIT per macchina {idxMacchina}, evento {idxEvento}, articolo {currData[0].CodArticolo}", tipoLog.INFO);
inputComando resCmd = MapoDb.obj.scriviRigaEventoBarcode(idxMacchina, idxEvento, currData[0].CodArticolo, "ODL-SPLIT", 0, "", adesso.AddMinutes(-1), adesso);
// chiamo splitOdl
MapoDb.obj.taODL.splitODL(currData[0].IdxODL, 0, idxMacchina, currData[0].TCRichAttr, currData[0].PzPallet, $"Nuovo ODL da forceSplitOdl", true);
// registro fine ODL (idxTipoEv = 1)
idxEvento = 1;
logger.lg.scriviLog($"Invio evento FINE ODL-SPLIT per macchina {idxMacchina}, evento {idxEvento}, articolo {currData[0].CodArticolo}", tipoLog.INFO);
resCmd = MapoDb.obj.scriviRigaEventoBarcode(idxMacchina, idxEvento, currData[0].CodArticolo, "ODL-START");
// chiamo refresh MSE
obj.taMSE.forceRecalc(0, idxMacchina);
// resetto stato macchina...
memLayer.ML.redDelKey(currStatoMaccHash(idxMacchina));
answ = "OK";
logger.lg.scriviLog($"Effettuato reset e ricalcoli x split ODL per macchina {idxMacchina}", tipoLog.INFO);
// recupero ODL corrente
currData = currODLRowTab(idxMacchina);
if (currData.Count > 0)
{
// registro un evento di inizio attrezzaggio (idxTipoEv = 2)
int idxEvento = 2;
logger.lg.scriviLog($"Invio evento ODL-SPLIT per macchina {idxMacchina}, evento {idxEvento}, articolo {currData[0].CodArticolo}", tipoLog.INFO);
inputComando resCmd = MapoDb.obj.scriviRigaEventoBarcode(idxMacchina, idxEvento, currData[0].CodArticolo, "ODL-SPLIT", 0, "", adesso, adesso);
// attendo 1 sec
Thread.Sleep(1000);
adesso = DateTime.Now;
// chiamo splitOdl
MapoDb.obj.taODL.splitODL(currData[0].IdxODL, 0, idxMacchina, currData[0].TCRichAttr, currData[0].PzPallet, $"Nuovo ODL da forceSplitOdl", true);
// attendo 1 sec
Thread.Sleep(1000);
adesso = DateTime.Now;
// registro fine ODL (idxTipoEv = 1)
idxEvento = 1;
logger.lg.scriviLog($"Invio evento FINE ODL-SPLIT per macchina {idxMacchina}, evento {idxEvento}, articolo {currData[0].CodArticolo}", tipoLog.INFO);
resCmd = MapoDb.obj.scriviRigaEventoBarcode(idxMacchina, idxEvento, currData[0].CodArticolo, "ODL-START");
// chiamo refresh MSE
obj.taMSE.forceRecalc(0, idxMacchina);
// resetto stato macchina...
memLayer.ML.redDelKey(currStatoMaccHash(idxMacchina));
answ = "OK";
logger.lg.scriviLog($"Effettuato reset e ricalcoli x split ODL per macchina {idxMacchina}", tipoLog.INFO);
}
}
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in forceSplitOdl{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
}
}
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in forceSplitOdl{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
}
return answ;
}