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

FIX gestione TCiclo recuperato da storico

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-10-30 15:37:12 +01:00
parent 179d789161
commit e863290c38
7 changed files with 48 additions and 59 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=963']) {
withEnv(['NEXT_BUILD_NUMBER=965']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-ADM/Bundle.config
-1
View File
@@ -3,7 +3,6 @@
<styleBundle path="~/Content/css">
<include path="~/Content/font-awesome.min.css" />
<include path="~/Content/themes/base/all.css" />
<!--<include path="~/Content/fonts.min.css" />-->
<include path="~/Content/Style.min.css" />
</styleBundle>
<styleBundle path="~/Content/bootstrap">
MP-ADM/Content/Site.css
-31
View File
@@ -1,31 +0,0 @@
/* Move down content because we have a fixed navbar that is 50px tall */
body {
padding-top: 50px;
padding-bottom: 20px;
}
/* Wrapping element */
/* Set some basic padding to keep content from hitting the edges */
.body-content {
padding-left: 15px;
padding-right: 15px;
}
/* Set widths on the form inputs since otherwise they're 100% wide */
input,
select,
textarea {
max-width: 280px;
}
/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
.jumbotron {
margin-top: 20px;
}
.body-content {
padding: 0;
}
}
MP-ADM/MP-ADM.csproj
-1
View File
@@ -137,7 +137,6 @@
<Content Include="Content\fonts.min.css">
<DependentUpon>fonts.css</DependentUpon>
</Content>
<Content Include="Content\Site.css" />
<Content Include="Content\Style.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
MP-ADM/WebUserControls/mod_barcode.ascx.cs
+23 -1
View File
@@ -374,8 +374,30 @@ namespace MP_ADM.WebUserControls
// controllo se ho tutti i dati necessari...
if (codOrd != "" && codArt != "" && codGruppo != "" && idxMacc != "" && qta > 0)
{
// recupero TC promessa da ultimo per articolo/macchina
decimal TCiclo = 0;
DS_ProdTempi.ODLDataTable tabODL = DataLayer.obj.taODL.getByMacchinaArticolo(codArt, idxMacc);
// se non lo trovo prendo da SOLO ARTICOLO
if (tabODL.Rows.Count == 0)
{
tabODL = DataLayer.obj.taODL.getByMacchinaArticolo(codArt, "");
}
// recupero TCiclo
if (tabODL.Rows.Count > 0)
{
TCiclo = tabODL[0].TCAssegnato;
}
// se non lo trovo è valore default da config DB (oppure 59...)
else
{
TCiclo = memLayer.ML.CRI("TCicloStd");
}
if (TCiclo == 0)
{
TCiclo = 59;
}
// creo nuova PROMESSA ODL...
DataLayer.obj.taPODL.insertQuery(codOrd, codOrd, true, codArt, codGruppo, idxMacc, qta, 1, DateTime.Now, 1, 1);
DataLayer.obj.taPODL.insertQuery(codOrd, codOrd, true, codArt, codGruppo, idxMacc, qta, TCiclo, DateTime.Now, 1, 1);
}
}
// resetto ricaricando
MP-ADM/WebUserControls/mod_newPromessaODL.ascx
+1 -1
View File
@@ -97,7 +97,7 @@
Attivabile
</div>
<div class="my-0">
<asp:CheckBox runat="server" ID="chkAttiv" Checked="true" CssClass="form form-check-input text-right" />
<asp:CheckBox runat="server" ID="chkAttiv" Checked="true" CssClass="text-center mx-3 px-2" />
</div>
</div>
<div class="col-2 pr-0 pl-1">
MapoDb/DS_ProdTempi.xss
+23 -23
View File
@@ -4,32 +4,32 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="29" ViewPortY="359" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="10" ViewPortY="778" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:TempiCicloRilevati" ZOrder="5" X="20" Y="81" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:ODL" ZOrder="3" X="590" Y="407" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:AnagArticoli" ZOrder="4" X="261" Y="516" Height="342" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:DatiMacchine" ZOrder="16" X="985" Y="402" Height="319" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:TempiCicloRilevati" ZOrder="6" X="20" Y="81" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:ODL" ZOrder="4" X="590" Y="407" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:AnagArticoli" ZOrder="5" X="261" Y="516" Height="342" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:DatiMacchine" ZOrder="17" X="985" Y="402" Height="319" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:PostazioniMapo" ZOrder="24" 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="17" X="181" Y="769" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
<Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="18" X="181" Y="769" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
<Shape ID="DesignTable:DatiConfermati" ZOrder="23" X="585" Y="50" Height="411" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:CalendFesteFerie" ZOrder="7" X="346" Y="364" Height="135" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="22" X="154" Y="956" Height="113" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="54" />
<Shape ID="DesignTable:DatiProduzione" ZOrder="15" 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="21" 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="20" 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="19" X="166" Y="1132" Height="204" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:TurniMacchina" ZOrder="6" X="363" Y="94" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
<Shape ID="DesignTable:MappaStatoExpl" ZOrder="2" X="907" Y="1262" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:ProduzioneAs400" ZOrder="18" X="177" Y="1342" Height="227" Width="292" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="9" X="928" Y="2187" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
<Shape ID="DesignTable:ResProdDett_splitGG" ZOrder="8" X="924" Y="2426" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:ResProdTot" ZOrder="10" X="544" Y="2122" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:RegistroControlli" ZOrder="14" X="536" Y="1403" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
<Shape ID="DesignTable:RegistroScarti" ZOrder="13" X="172" Y="1581" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:StatoProd" ZOrder="12" X="539" Y="1784" Height="319" Width="295" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
<Shape ID="DesignTable:PromesseODL" ZOrder="1" X="927" Y="1708" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:ElencoConfermeProd" ZOrder="11" X="166" Y="2050" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
<Shape ID="DesignTable:CalendFesteFerie" ZOrder="8" X="346" Y="364" Height="135" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="1" X="86" Y="991" Height="113" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="54" />
<Shape ID="DesignTable:DatiProduzione" ZOrder="16" 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="22" 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="21" 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="20" X="166" Y="1132" Height="204" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:TurniMacchina" ZOrder="7" X="363" Y="94" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
<Shape ID="DesignTable:MappaStatoExpl" ZOrder="3" X="907" Y="1262" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:ProduzioneAs400" ZOrder="19" X="177" Y="1342" Height="227" Width="292" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="10" X="928" Y="2187" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
<Shape ID="DesignTable:ResProdDett_splitGG" ZOrder="9" X="924" Y="2426" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:ResProdTot" ZOrder="11" X="544" Y="2122" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:RegistroControlli" ZOrder="15" X="536" Y="1403" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
<Shape ID="DesignTable:RegistroScarti" ZOrder="14" X="172" Y="1581" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:StatoProd" ZOrder="13" X="539" Y="1784" Height="319" Width="295" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
<Shape ID="DesignTable:PromesseODL" ZOrder="2" X="927" Y="1708" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:ElencoConfermeProd" ZOrder="12" X="166" Y="2050" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
</Shapes>
<Connectors />
</DiagramLayout>