diff --git a/Jenkinsfile b/Jenkinsfile index dbede6a..7233ce2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=195']) { + withEnv(['NEXT_BUILD_NUMBER=197']) { // env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index 01d06bf..634b45d 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -299,6 +299,10 @@ + + + + @@ -309,7 +313,7 @@ - + @@ -753,6 +757,34 @@ cmp_ML_ShDet.ascx + + cmp_MU_carts.ascx + ASPXCodeBehind + + + cmp_MU_carts.ascx + + + cmp_MU_stats.ascx + ASPXCodeBehind + + + cmp_MU_stats.ascx + + + cmp_MU_bins.ascx + ASPXCodeBehind + + + cmp_MU_bins.ascx + + + cmp_MU_suggestions.ascx + ASPXCodeBehind + + + cmp_MU_suggestions.ascx + cmp_numRow.ascx ASPXCodeBehind @@ -823,12 +855,12 @@ cmp_stackNextloading.ascx - - cmp_svgViewer.ascx + + cmp_MU_svgViewer.ascx ASPXCodeBehind - - cmp_svgViewer.ascx + + cmp_MU_svgViewer.ascx cmp_taktList.ascx diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx b/NKC_WF/WebUserControls/cmp_MU_bins.ascx new file mode 100644 index 0000000..e8553a2 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx @@ -0,0 +1,92 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_bins.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_bins" %> + +
+
BINS
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CodD/T%
BIN0000850/50100%
BIN0000950/50100%
BIN0001050/50100%
BIN0001150/50100%
BIN0001212/5024%
BIN0001310/5020%
BIN000141/502%
BIN000150/500%
BIN000160/500%
BIN000170/500%
BIN000180/500%
BIN000190/500%
BIN000200/500%
BIN000210/500%
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs new file mode 100644 index 0000000..c1caa0c --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_MU_bins : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs new file mode 100644 index 0000000..0c0dfba --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_MU_bins + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx b/NKC_WF/WebUserControls/cmp_MU_carts.ascx new file mode 100644 index 0000000..c5a955d --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx @@ -0,0 +1,92 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_carts.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_carts" %> + +
+
CARTS
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CodD/T%
CR0000750/50100%
CR0000850/50100%
CR0000950/50100%
CR0001050/50100%
CR0001150/50100%
CR0001212/5024%
CR0001310/5020%
CR000140/500%
CR000150/500%
CR000160/500%
CR000170/500%
CR000180/500%
CR000190/500%
CR000200/500%
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs new file mode 100644 index 0000000..99da0a5 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_MU_carts : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs new file mode 100644 index 0000000..904580f --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_MU_carts + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx b/NKC_WF/WebUserControls/cmp_MU_stats.ascx new file mode 100644 index 0000000..4ece5a3 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx @@ -0,0 +1,124 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_stats.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_stats" %> + + +
+
+
+
BINS
+
+ + + + + + + + + + + + + + + +
WAITWIPDONE
1235
+
+
+
+
+
+
SHEET SH00000123
+
+ + + + + + + + + + + + + + + +
DONETOTRATIO
52520%
+
+
+
+
+
+
+
+
BUNK ST00000A2
+
+ + + + + + + + + + + + + + + +
DONETOTRATIO
31225%
+
+
+
+
+
+
+
+
SHIFT B20190916.0
+
+ + + + + + + + + + + + + + + +
DONETOTRATIO
2540%
+
+
+
+
+
+
CARTS
+
+ + + + + + + + + + + + + + + +
WAITWIPDONE
2426
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs new file mode 100644 index 0000000..c6cf7bf --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_MU_stats : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs new file mode 100644 index 0000000..93aede4 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_stats.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_MU_stats + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx new file mode 100644 index 0000000..d250e45 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx @@ -0,0 +1,64 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_suggestions.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_suggestions" %> + +
+
+
+
TO BIN
+
+
+
+ BIN00010 +
+
+ +
+
+ IT000002 +
+
+
+
+
+
+
+
+
+
+
+
+
+
TO CART
+
+
+
+ IT000001 +
+
+ +
+
+ CR00007 +
+
+
+
+
+
+
+
TO CART
+
+
+
+ IT000003 +
+
+ +
+
+ CR00012 +
+
+
+
+
+
diff --git a/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs new file mode 100644 index 0000000..cc34ba7 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_MU_suggestions : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.designer.cs new file mode 100644 index 0000000..827bf22 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_MU_suggestions.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_MU_suggestions + { + } +} diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx similarity index 89% rename from NKC_WF/WebUserControls/cmp_svgViewer.ascx rename to NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx index dce4502..6696e5c 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_svgViewer.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_svgViewer" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_svgViewer.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_svgViewer" %>
diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs similarity index 94% rename from NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs rename to NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs index 8d0234c..b0b2b7b 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs @@ -10,7 +10,7 @@ using System.Web.UI.WebControls; namespace NKC_WF.WebUserControls { - public partial class cmp_svgViewer : System.Web.UI.UserControl + public partial class cmp_MU_svgViewer : System.Web.UI.UserControl { /// /// Batch corrente... @@ -37,6 +37,7 @@ namespace NKC_WF.WebUserControls string filename = ""; try { + // FORSE 5/5?!? var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5); if (sheetList.Count > 0) { diff --git a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs similarity index 96% rename from NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs rename to NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs index 24e6393..131f885 100644 --- a/NKC_WF/WebUserControls/cmp_svgViewer.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs @@ -11,7 +11,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_svgViewer + public partial class cmp_MU_svgViewer { /// diff --git a/NKC_WF/site/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx index b9f9c12..e6f488f 100644 --- a/NKC_WF/site/MachineUnload.aspx +++ b/NKC_WF/site/MachineUnload.aspx @@ -1,450 +1,37 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineUnload.aspx.cs" Inherits="NKC_WF.MachineUnload" %> -<%@ Register Src="~/WebUserControls/cmp_svgViewer.ascx" TagPrefix="uc1" TagName="cmp_svgViewer" %> +<%@ Register Src="~/WebUserControls/cmp_MU_svgViewer.ascx" TagPrefix="uc1" TagName="cmp_MU_svgViewer" %> +<%@ Register Src="~/WebUserControls/cmp_MU_stats.ascx" TagPrefix="uc1" TagName="cmp_MU_stats" %> +<%@ Register Src="~/WebUserControls/cmp_MU_suggestions.ascx" TagPrefix="uc1" TagName="cmp_MU_suggestions" %> +<%@ Register Src="~/WebUserControls/cmp_MU_bins.ascx" TagPrefix="uc1" TagName="cmp_MU_bins" %> +<%@ Register Src="~/WebUserControls/cmp_MU_carts.ascx" TagPrefix="uc1" TagName="cmp_MU_carts" %> + + + + - +

<%: traduci("MachineUnload") %>

-
-
-
-
BINS
-
- - - - - - - - - - - - - - - -
WAITWIPDONE
1235
-
-
-
-
-
-
SHEET SH00000123
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
52520%
-
-
-
-
-
-
-
-
BUNK ST00000A2
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
31225%
-
-
-
-
-
-
-
-
SHIFT B20190916.0
-
- - - - - - - - - - - - - - - -
DONETOTRATIO
2540%
-
-
-
-
-
-
CARTS
-
- - - - - - - - - - - - - - - -
WAITWIPDONE
2426
-
-
-
-
+
-
-
BINS
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CodD/T%
BIN0000750/50100%
BIN0000850/50100%
BIN0000950/50100%
BIN0001050/50100%
BIN0001150/50100%
BIN0001212/5024%
BIN0001310/5020%
BIN000141/502%
BIN000150/500%
BIN000160/500%
BIN000170/500%
BIN000180/500%
BIN000190/500%
BIN000200/500%
BIN000210/500%
BIN000220/500%
BIN000230/500%
BIN000240/500%
BIN000250/500%
BIN000260/500%
-
-
-
-
+
- - <%-- - --%> +
-
-
CARTS
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CodD/T%
CR0000650/50100%
CR0000750/50100%
CR0000850/50100%
CR0000950/50100%
CR0001050/50100%
CR0001150/50100%
CR0001212/5024%
CR0001310/5020%
CR000140/500%
CR000150/500%
CR000160/500%
CR000170/500%
CR000180/500%
CR000190/500%
CR000200/500%
CR000210/500%
CR000220/500%
CR000230/500%
CR000240/500%
CR000250/500%
-
-
-
-
-
-
-
-
-
-
TO BIN
-
-
-
- BIN00010 -
-
- -
-
- IT000002 -
-
-
-
-
-
-
-
-
-
-
-
-
-
TO CART
-
-
-
- IT000001 -
-
- -
-
- CR00007 -
-
-
-
-
-
-
-
TO CART
-
-
-
- IT000003 -
-
- -
-
- CR00012 -
-
-
-
+
+
diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index f0b0701..a097a87 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -36,7 +36,7 @@ namespace NKC_WF //!!!FIXME!!! fare calcolo del VERO batch corrente... BatchId = 242; // fixed x test! // aggiorno child - cmp_svgViewer.BatchId = BatchId; + cmp_MU_svgViewer.BatchId = BatchId; } } } \ No newline at end of file diff --git a/NKC_WF/site/MachineUnload.aspx.designer.cs b/NKC_WF/site/MachineUnload.aspx.designer.cs index 139ec91..14b0e32 100644 --- a/NKC_WF/site/MachineUnload.aspx.designer.cs +++ b/NKC_WF/site/MachineUnload.aspx.designer.cs @@ -33,12 +33,48 @@ namespace NKC_WF protected global::System.Web.UI.UpdatePanel upnlDrawings; /// - /// Controllo cmp_svgViewer. + /// Controllo cmp_MU_stats. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::NKC_WF.WebUserControls.cmp_svgViewer cmp_svgViewer; + protected global::NKC_WF.WebUserControls.cmp_MU_stats cmp_MU_stats; + + /// + /// Controllo cmp_MU_bins. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_bins cmp_MU_bins; + + /// + /// Controllo cmp_MU_svgViewer. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_svgViewer cmp_MU_svgViewer; + + /// + /// Controllo cmp_MU_carts. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_carts cmp_MU_carts; + + /// + /// Controllo cmp_MU_suggestions. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_MU_suggestions cmp_MU_suggestions; } }