diff --git a/Jenkinsfile b/Jenkinsfile
index 909e91eb..a00f17b9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'
diff --git a/MP-ADM/Bundle.config b/MP-ADM/Bundle.config
index 3b130c8e..922fb92d 100644
--- a/MP-ADM/Bundle.config
+++ b/MP-ADM/Bundle.config
@@ -3,7 +3,6 @@
-
diff --git a/MP-ADM/Content/Site.css b/MP-ADM/Content/Site.css
deleted file mode 100644
index a9f86155..00000000
--- a/MP-ADM/Content/Site.css
+++ /dev/null
@@ -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;
- }
-}
diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj
index 236de644..42e3ed2b 100644
--- a/MP-ADM/MP-ADM.csproj
+++ b/MP-ADM/MP-ADM.csproj
@@ -137,7 +137,6 @@
fonts.css
-
Style.less
diff --git a/MP-ADM/WebUserControls/mod_barcode.ascx.cs b/MP-ADM/WebUserControls/mod_barcode.ascx.cs
index 51848a83..e9d29482 100644
--- a/MP-ADM/WebUserControls/mod_barcode.ascx.cs
+++ b/MP-ADM/WebUserControls/mod_barcode.ascx.cs
@@ -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
diff --git a/MP-ADM/WebUserControls/mod_newPromessaODL.ascx b/MP-ADM/WebUserControls/mod_newPromessaODL.ascx
index 15d755b9..3834f5ba 100644
--- a/MP-ADM/WebUserControls/mod_newPromessaODL.ascx
+++ b/MP-ADM/WebUserControls/mod_newPromessaODL.ascx
@@ -97,7 +97,7 @@
Attivabile
diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss
index 6a0fea71..28e82d4e 100644
--- a/MapoDb/DS_ProdTempi.xss
+++ b/MapoDb/DS_ProdTempi.xss
@@ -4,32 +4,32 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file