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

Testing invio email x creazione ODL provvisorio

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-07-19 08:54:17 +02:00
parent 0333cccc19
commit c29c3283ae
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=798']) {
withEnv(['NEXT_BUILD_NUMBER=799']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/WebUserControls/cmp_newODL.ascx.cs
+10 -5
View File
@@ -1,4 +1,5 @@
using MapoDb;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -56,11 +57,15 @@ namespace MoonProTablet.WebUserControls
int.TryParse(txtTC_min.Text, out numMin);
int.TryParse(txtTC_sec.Text, out numSec);
decimal tCiclo = numMin + ((decimal)numSec) / 60;
// !!!FARE!!!
//DataLayer.obj.taODL.insertProvv(ddlArticolo.SelectedValue, idxMacchina, numPz, tCiclo, txtNote.Text.Trim());
// invio email notifica creazione ODL PROVVISORIO (da riconciliare...)
string note = txtNote.Text.Trim();
#if false
// insert su DB
DataLayer.obj.taODL.insertProvv(ddlArticolo.SelectedValue, idxMacchina, numPz, tCiclo, note);
#endif
// invio email notifica creazione ODL PROVVISORIO (da riconciliare...)
string subject = "Effettuato attrezzaggio con ODL provvisorio";
string oggetto = string.Format("E' stato effettuato unattrezzaggio con ODL provvisorio.<br/>Macchina: {0}<br>Articolo: {1}<br>Lanciati <b>{2}</b> pezzi con T.Ciclo {3} ({4} min, {5} sec)", idxMacchina, ddlArticolo.SelectedValue, numPz, tCiclo, numMin, numSec);
gestEmail.geAuth.mandaEmail(memLayer.ML.confReadString("_fromEmail"), memLayer.ML.confReadString("_adminEmail"), subject, oggetto);
// sollevo evento!
if (eh_newVal != null)
{
MapoDb/DS_ProdTempi.xss
+10 -10
View File
@@ -6,28 +6,28 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:TempiCicloRilevati" ZOrder="3" X="266" Y="244" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:ODL" ZOrder="9" X="590" Y="407" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:AnagArticoli" ZOrder="1" X="261" Y="516" Height="319" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
<Shape ID="DesignTable:DatiMacchine" ZOrder="8" X="985" Y="402" Height="319" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:TempiCicloRilevati" ZOrder="4" X="266" Y="244" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:ODL" ZOrder="1" X="590" Y="407" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:AnagArticoli" ZOrder="2" X="261" Y="516" Height="319" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
<Shape ID="DesignTable:DatiMacchine" ZOrder="9" X="985" Y="402" Height="319" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:PostazioniMapo" ZOrder="22" X="950" Y="39" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
<Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="10" X="181" Y="769" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
<Shape ID="DesignTable:DatiConfermati" ZOrder="20" X="585" Y="50" Height="411" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:CalendFesteFerie" ZOrder="21" X="13" Y="736" Height="135" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="19" X="154" Y="999" Height="113" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="54" />
<Shape ID="DesignTable:DatiProduzione" ZOrder="7" X="554" Y="922" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="19" X="154" Y="998" Height="113" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="54" />
<Shape ID="DesignTable:DatiProduzione" ZOrder="8" X="554" Y="922" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:stp_repDonati_getDatiProdMacchina" ZOrder="18" X="1005" Y="771" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:stp_repDonati_getLastStatoDurataMacchina" ZOrder="17" X="1003" Y="1118" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:stp_repDonati_getDatiProdMacchinaPeriodo" ZOrder="16" X="166" Y="1132" Height="204" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:TurniMacchina" ZOrder="15" X="13" Y="455" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
<Shape ID="DesignTable:MappaStatoExpl" ZOrder="2" X="891" Y="1267" Height="434" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:MappaStatoExpl" ZOrder="3" X="891" Y="1267" Height="434" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:ProduzioneAs400" ZOrder="14" X="177" Y="1342" Height="227" Width="292" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="12" X="27" Y="15" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
<Shape ID="DesignTable:ResProdDett_splitGG" ZOrder="11" X="31" Y="224" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:ResProdTot" ZOrder="13" X="271" Y="20" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:RegistroControlli" ZOrder="6" X="536" Y="1403" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
<Shape ID="DesignTable:RegistroScarti" ZOrder="5" X="172" Y="1581" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:StatoProd" ZOrder="4" X="572" Y="1795" Height="250" Width="295" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:RegistroControlli" ZOrder="7" X="536" Y="1403" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
<Shape ID="DesignTable:RegistroScarti" ZOrder="6" X="172" Y="1581" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:StatoProd" ZOrder="5" X="572" Y="1795" Height="250" Width="295" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
</Shapes>
<Connectors />
</DiagramLayout>