From 328b96be255196d77d3f2ca50b4636dc4986a187 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 31 Aug 2020 16:48:54 +0200 Subject: [PATCH 1/2] Start new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 907fe0f..3c0b0e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=361']) { + withEnv(['NEXT_BUILD_NUMBER=362']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') From 49246f83e2e83692fad7412a6d6417b9eec1607b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 31 Aug 2020 17:56:31 +0200 Subject: [PATCH 2/2] Update visualizzazione x SMART dei MIA --- .../WebUserControls/cmp_PartMIA_byBinID.ascx | 70 ++++++++- .../WebUserControls/cmp_PartMIA_byCartID.ascx | 70 ++++++++- NKC_WF/WebUserControls/cmp_partMIA.ascx | 142 ++++++++---------- .../WebUserControls/cmp_partMIA_byPLID.ascx | 70 ++++++++- NKC_WF/site/PartMIA.aspx | 4 +- 5 files changed, 267 insertions(+), 89 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_PartMIA_byBinID.ascx b/NKC_WF/WebUserControls/cmp_PartMIA_byBinID.ascx index ad8ebf0..1d64f13 100644 --- a/NKC_WF/WebUserControls/cmp_PartMIA_byBinID.ascx +++ b/NKC_WF/WebUserControls/cmp_PartMIA_byBinID.ascx @@ -3,7 +3,7 @@ - + <%--
@@ -94,6 +94,74 @@
+
--%> + + +
+
+
+ +
+ +
+
+
+ + +
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ CART + +
+ +
+
+
+
+
+ BIN + +
+ +
+
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx b/NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx index 0a396ea..4ef326e 100644 --- a/NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx +++ b/NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx @@ -3,7 +3,7 @@ - + <%--
@@ -94,6 +94,74 @@
+
--%> + + +
+
+
+ +
+ +
+
+
+ + +
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ CART + +
+ +
+
+
+
+
+ BIN + +
+ +
+
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_partMIA.ascx b/NKC_WF/WebUserControls/cmp_partMIA.ascx index 30b310f..746490c 100644 --- a/NKC_WF/WebUserControls/cmp_partMIA.ascx +++ b/NKC_WF/WebUserControls/cmp_partMIA.ascx @@ -6,96 +6,72 @@ -
- -
- -
-
- - - - - -
- - -
-
-
- - - - - -
-
- +
+
+
+ +
+
-
- +
+
+ + +
+
+
+ + +
+
+ + +
+
-
- +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
-
- +
+
+
+
+
+ CART + +
+ +
+
+
+
+
+ BIN + +
+ +
+
+
- - - - - -
-
- -
- -
-
-
- - - - - -
-
- -
-
-
-
- - - - - -
-
- -
- -
-
-
- - - - - -
- -
- -
- -
-
-
diff --git a/NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx b/NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx index 643c38d..410c9e2 100644 --- a/NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx +++ b/NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx @@ -3,7 +3,7 @@ - + <%--
@@ -94,6 +94,74 @@
+
--%> + + +
+
+
+ +
+ +
+
+
+ + +
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ CART + +
+ +
+
+
+
+
+ BIN + +
+ +
+
+
+
+
+
diff --git a/NKC_WF/site/PartMIA.aspx b/NKC_WF/site/PartMIA.aspx index ab649c6..36aa9b5 100644 --- a/NKC_WF/site/PartMIA.aspx +++ b/NKC_WF/site/PartMIA.aspx @@ -6,8 +6,6 @@ <%@ Register Src="~/WebUserControls/cmp_PartMIA_byCartID.ascx" TagPrefix="uc1" TagName="cmp_PartMIA_byCartID" %> <%@ Register Src="~/WebUserControls/cmp_PartMIA_byBinID.ascx" TagPrefix="uc1" TagName="cmp_PartMIA_byBinID" %> - -
@@ -19,7 +17,7 @@
-
+