diff --git a/Jenkinsfile b/Jenkinsfile index b972e69a..c24eaea4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=944']) { + withEnv(['NEXT_BUILD_NUMBER=947']) { // 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-Admin/BCode.aspx b/MP-Admin/BCode.aspx index 593aae0b..f4453a37 100644 --- a/MP-Admin/BCode.aspx +++ b/MP-Admin/BCode.aspx @@ -6,5 +6,6 @@ +
diff --git a/MP-Admin/GestKIT.aspx b/MP-Admin/GestKIT.aspx index 4ed8a390..62d99f4d 100644 --- a/MP-Admin/GestKIT.aspx +++ b/MP-Admin/GestKIT.aspx @@ -7,7 +7,9 @@ - + +
+
diff --git a/MP-Admin/WebUserControls/mod_gestPromODL.ascx b/MP-Admin/WebUserControls/mod_gestPromODL.ascx index 3b6fe756..e28e58cd 100644 --- a/MP-Admin/WebUserControls/mod_gestPromODL.ascx +++ b/MP-Admin/WebUserControls/mod_gestPromODL.ascx @@ -2,197 +2,207 @@ <%@ Register Src="~/WebUserControls/mod_newPromessaODL.ascx" TagPrefix="uc1" TagName="mod_newPromessaODL" %> - -
-
+
+
-
-
- PROMESSA ODL +
+

Filtri attivi

-
-
- -
-
-
-
- Modifica -
-
- # Pezzi Richiesti: - -
-
- Pezzi Pallet: - -
-
- Annulla -
-
-
-
-
-

Filtri attivi

-
-
-
-
- Articolo - - -
-
-
-
-
-
- Macchina - - -
-
-
-
-
-
-
- +
+
+
+ Articolo + +
- +
+
+
+
+ Macchina + + +
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ PROMESSA ODL +
+
+
+ +
+
+
+
+ Modifica +
+
+ # Pezzi Richiesti: + +
+
+ Pezzi Pallet: + +
+
+ Annulla +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ <%# Eval("CodArticolo") %> - -
-
- -
-
- -
-
-
- - - + +
+
+ +
+
+ +
+ + + + + <%# Eval("Nome") %>
<%# Eval("CodMacchina") %>
-
-
-
- - - - - - - - - - - -
- - (m:s) -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -    +
+ + + + + + + + + + + + + +
+ + (m:s) +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+