diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 7d6870f..1f9cf39 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -15432,6 +15432,10 @@ namespace AppData { private global::System.Data.DataColumn columnCartDtmx; + private global::System.Data.DataColumn columnOrderExtCode; + + private global::System.Data.DataColumn columnFamilyCode; + private global::System.Data.DataColumn columnStarted; private global::System.Data.DataColumn columnCompleted; @@ -15501,6 +15505,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OrderExtCodeColumn { + get { + return this.columnOrderExtCode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn FamilyCodeColumn { + get { + return this.columnFamilyCode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn StartedColumn { @@ -15554,13 +15574,15 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, int CartIndex, string CartDtmx, int Started, int Completed) { + public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, int CartIndex, string CartDtmx, string OrderExtCode, string FamilyCode, int Started, int Completed) { Pack2CartRow rowPack2CartRow = ((Pack2CartRow)(this.NewRow())); object[] columnValuesArray = new object[] { PackListID, CartID, CartIndex, CartDtmx, + OrderExtCode, + FamilyCode, Started, Completed}; rowPack2CartRow.ItemArray = columnValuesArray; @@ -15597,6 +15619,8 @@ namespace AppData { this.columnCartID = base.Columns["CartID"]; this.columnCartIndex = base.Columns["CartIndex"]; this.columnCartDtmx = base.Columns["CartDtmx"]; + this.columnOrderExtCode = base.Columns["OrderExtCode"]; + this.columnFamilyCode = base.Columns["FamilyCode"]; this.columnStarted = base.Columns["Started"]; this.columnCompleted = base.Columns["Completed"]; } @@ -15612,6 +15636,10 @@ namespace AppData { base.Columns.Add(this.columnCartIndex); this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartDtmx); + this.columnOrderExtCode = new global::System.Data.DataColumn("OrderExtCode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOrderExtCode); + this.columnFamilyCode = new global::System.Data.DataColumn("FamilyCode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnFamilyCode); this.columnStarted = new global::System.Data.DataColumn("Started", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnStarted); this.columnCompleted = new global::System.Data.DataColumn("Completed", typeof(int), null, global::System.Data.MappingType.Element); @@ -15624,6 +15652,10 @@ namespace AppData { this.columnCartIndex.AllowDBNull = false; this.columnCartDtmx.ReadOnly = true; this.columnCartDtmx.MaxLength = 10; + this.columnOrderExtCode.AllowDBNull = false; + this.columnOrderExtCode.MaxLength = 250; + this.columnFamilyCode.AllowDBNull = false; + this.columnFamilyCode.MaxLength = 250; this.columnStarted.ReadOnly = true; this.columnCompleted.ReadOnly = true; } @@ -22722,6 +22754,28 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string OrderExtCode { + get { + return ((string)(this[this.tablePack2Cart.OrderExtCodeColumn])); + } + set { + this[this.tablePack2Cart.OrderExtCodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string FamilyCode { + get { + return ((string)(this[this.tablePack2Cart.FamilyCodeColumn])); + } + set { + this[this.tablePack2Cart.FamilyCodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int Started { @@ -36452,6 +36506,8 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W tableMapping.ColumnMappings.Add("CartID", "CartID"); tableMapping.ColumnMappings.Add("CartIndex", "CartIndex"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); + tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode"); + tableMapping.ColumnMappings.Add("FamilyCode", "FamilyCode"); tableMapping.ColumnMappings.Add("Started", "Started"); tableMapping.ColumnMappings.Add("Completed", "Completed"); this._adapter.TableMappings.Add(tableMapping); @@ -36470,8 +36526,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT PackListID, CartID, CartIndex, CartDtmx, Started, Completed FROM v_Pack2Ca" + - "rt"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_Pack2Cart"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index a88cd83..6da694c 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -3030,8 +3030,9 @@ FROM v_OKIB - - SELECT PackListID, CartID, CartIndex, CartDtmx, Started, Completed FROM v_Pack2Cart + + SELECT * +FROM v_Pack2Cart @@ -3042,6 +3043,8 @@ FROM v_OKIB + + @@ -3067,7 +3070,7 @@ FROM v_OKIB - + @@ -3117,7 +3120,7 @@ FROM v_OKIB - + @@ -3142,7 +3145,7 @@ FROM v_OKIB - + @@ -3197,7 +3200,7 @@ FROM v_OKIB - + @@ -3270,7 +3273,7 @@ FROM v_OKIB - + @@ -3278,7 +3281,7 @@ FROM v_OKIB - + @@ -3347,7 +3350,7 @@ FROM v_OKIB - + @@ -3380,7 +3383,7 @@ FROM v_OKIB - + @@ -3421,7 +3424,7 @@ FROM v_OKIB - + @@ -3440,7 +3443,7 @@ FROM v_OKIB - + @@ -3471,7 +3474,7 @@ FROM v_OKIB - + @@ -3479,7 +3482,7 @@ FROM v_OKIB - + @@ -3496,7 +3499,7 @@ FROM v_OKIB - + @@ -3505,7 +3508,7 @@ FROM v_OKIB - + @@ -3536,7 +3539,7 @@ FROM v_OKIB - + @@ -3544,7 +3547,7 @@ FROM v_OKIB - + @@ -3560,7 +3563,7 @@ FROM v_OKIB - + @@ -3568,7 +3571,7 @@ FROM v_OKIB - + @@ -3596,7 +3599,7 @@ FROM v_OKIB - + @@ -3632,7 +3635,7 @@ FROM v_OKIB - + @@ -3648,7 +3651,7 @@ FROM v_OKIB - + @@ -3658,7 +3661,7 @@ FROM v_OKIB - + @@ -3675,7 +3678,7 @@ FROM v_OKIB - + @@ -3688,7 +3691,7 @@ FROM v_OKIB - + @@ -3737,7 +3740,7 @@ FROM v_OKIB - + @@ -3766,7 +3769,7 @@ FROM v_OKIB - + @@ -3808,7 +3811,7 @@ FROM v_OKIB - + @@ -3918,7 +3921,7 @@ FROM v_OKIB - + @@ -3981,7 +3984,7 @@ FROM v_OKIB - + @@ -4026,7 +4029,7 @@ FROM v_OKIB - + @@ -4052,7 +4055,7 @@ FROM v_OKIB - + @@ -4145,7 +4148,7 @@ FROM v_OKIB - + @@ -4208,7 +4211,7 @@ FROM v_OKIB - + @@ -4267,7 +4270,7 @@ FROM v_OKIB - + @@ -4316,7 +4319,7 @@ FROM v_OKIB - + @@ -4329,6 +4332,20 @@ FROM v_OKIB + + + + + + + + + + + + + + @@ -4475,18 +4492,18 @@ FROM v_OKIB - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 3bc1754..a2ffa5d 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -40,7 +40,7 @@ - + diff --git a/NKC_WF/WebUserControls/cmp_KR_cart.ascx b/NKC_WF/WebUserControls/cmp_KR_cart.ascx index 228c424..36efb9b 100644 --- a/NKC_WF/WebUserControls/cmp_KR_cart.ascx +++ b/NKC_WF/WebUserControls/cmp_KR_cart.ascx @@ -5,6 +5,8 @@ + + diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx index ae7f9d0..9e2d4a3 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx @@ -1,7 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kitReqRunning.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kitReqRunning" %> <%@ Register Src="~/WebUserControls/cmp_KR_cart.ascx" TagPrefix="uc1" TagName="cmp_KR_cart" %> -

<%: traduci("RunningKitReq") %>

+
+

<%: traduci("RunningKitReq") %>

+
+ @@ -11,15 +14,7 @@ <%# traduci("NoKitReqRunning") %> - - -
- - -
- - - +
@@ -31,6 +26,14 @@
+ + +
+ + +
+ + <%----%> @@ -54,12 +57,14 @@ - + - + + + diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs index 01eb838..1c1d46a 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs @@ -16,6 +16,7 @@ namespace NKC_WF.WebUserControls private void fixVisibility() { cmp_KR_cart.Visible = (grView.SelectedIndex >= 0); + divHeader.Visible = showTitle; } internal void doUpdate() @@ -25,6 +26,20 @@ namespace NKC_WF.WebUserControls cmp_KR_cart.doUpdate(); } + public bool showTitle + { + get + { + bool answ = false; + bool.TryParse(hfShowTitle.Value, out answ); + return answ; + } + set + { + hfShowTitle.Value = value.ToString(); + fixVisibility(); + } + } public bool showFull { get @@ -39,6 +54,20 @@ namespace NKC_WF.WebUserControls grView.DataBind(); } } + public bool enableSuspend + { + get + { + bool answ = false; + bool.TryParse(hfEnableSuspend.Value, out answ); + return answ; + } + set + { + hfEnableSuspend.Value = value.ToString(); + grView.DataBind(); + } + } protected void grView_SelectedIndexChanged(object sender, EventArgs e) { int PackListId = 0; diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.designer.cs index e6d9c6d..3f40066 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.designer.cs @@ -14,6 +14,24 @@ namespace NKC_WF.WebUserControls public partial class cmp_kitReqRunning { + /// + /// Controllo divHeader. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHeader; + + /// + /// Controllo hfShowTitle. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfShowTitle; + /// /// Controllo grView. /// @@ -32,15 +50,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.ObjectDataSource odsKit; - /// - /// Controllo cmp_KR_cart. - /// - /// - /// 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_KR_cart cmp_KR_cart; - /// /// Controllo hfShowFull. /// @@ -49,5 +58,23 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HiddenField hfShowFull; + + /// + /// Controllo hfEnableSuspend. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfEnableSuspend; + + /// + /// Controllo cmp_KR_cart. + /// + /// + /// 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_KR_cart cmp_KR_cart; } } diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx index 15f4ce7..210ada8 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx @@ -1,8 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kitReqSched.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kitReqSched" %> +<%@ Register Src="~/WebUserControls/cmp_KR_cart.ascx" TagPrefix="uc1" TagName="cmp_KR_cart" %> +

<%: traduci("ScheduledKitReq") %>

- + @@ -11,18 +13,31 @@ <%# traduci("NoKitReq") %> - + + +
+ +
+ + +
+ +
+ + + - - + - - - + + + + + @@ -51,3 +66,5 @@ + + diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs index ec91f34..2287bdf 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs @@ -13,9 +13,14 @@ namespace NKC_WF.WebUserControls if (!Page.IsPostBack) { fixSchedOrd(); + fixVisibility(); } } + private void fixVisibility() + { + cmp_KR_cart.Visible = (grView.SelectedIndex >= 0); + } protected int numRows { get @@ -46,8 +51,10 @@ namespace NKC_WF.WebUserControls internal void doUpdate() { - grView.SelectedIndex = -1; + fixSchedOrd(); grView.DataBind(); + fixVisibility(); + cmp_KR_cart.doUpdate(); lblTitle.Focus(); } @@ -153,5 +160,23 @@ namespace NKC_WF.WebUserControls return answ; } + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + int PackListId = 0; + int.TryParse(grView.SelectedValue.ToString(), out PackListId); + // mostra dettaglio CART + cmp_KR_cart.PackListID = PackListId; + cmp_KR_cart.Visible = true; + } + /// + /// comando reset + /// + /// + /// + protected void lbtReset_Click(object sender, EventArgs e) + { + grView.SelectedIndex = -1; + doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.designer.cs index 1123bb4..8364625 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.designer.cs @@ -58,5 +58,14 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HiddenField hfShowFull; + + /// + /// Controllo cmp_KR_cart. + /// + /// + /// 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_KR_cart cmp_KR_cart; } } diff --git a/NKC_WF/site/KitRequestSched.aspx b/NKC_WF/site/KitRequestSched.aspx index 4e9cf30..d37878c 100644 --- a/NKC_WF/site/KitRequestSched.aspx +++ b/NKC_WF/site/KitRequestSched.aspx @@ -15,7 +15,7 @@ - + diff --git a/NKC_WF/site/Kitting.aspx b/NKC_WF/site/Kitting.aspx index 087a444..5b39a2d 100644 --- a/NKC_WF/site/Kitting.aspx +++ b/NKC_WF/site/Kitting.aspx @@ -1,16 +1,14 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="Kitting.aspx.cs" Inherits="NKC_WF.site.Kitting" %> <%@ Register Src="~/WebUserControls/cmp_kitting.ascx" TagPrefix="uc1" TagName="cmp_kitting" %> -<%@ Register Src="~/WebUserControls/cmp_kitRunning.ascx" TagPrefix="uc1" TagName="cmp_kitRunning" %> - - +<%@ Register Src="~/WebUserControls/cmp_kitReqRunning.ascx" TagPrefix="uc1" TagName="cmp_kitReqRunning" %>
- +
diff --git a/NKC_WF/site/Kitting.aspx.cs b/NKC_WF/site/Kitting.aspx.cs index 4f91932..e593bb0 100644 --- a/NKC_WF/site/Kitting.aspx.cs +++ b/NKC_WF/site/Kitting.aspx.cs @@ -15,7 +15,7 @@ namespace NKC_WF.site protected void timerKitting_Tick(object sender, EventArgs e) { - cmp_kitRunning.doUpdate(); + cmp_kitReqRunning.doUpdate(); cmp_kitting.doUpdate(); } } diff --git a/NKC_WF/site/Kitting.aspx.designer.cs b/NKC_WF/site/Kitting.aspx.designer.cs index 4304ba1..4518a9c 100644 --- a/NKC_WF/site/Kitting.aspx.designer.cs +++ b/NKC_WF/site/Kitting.aspx.designer.cs @@ -33,13 +33,13 @@ namespace NKC_WF.site protected global::System.Web.UI.Timer timerKitting; /// - /// Controllo cmp_kitRunning. + /// Controllo cmp_kitReqRunning. /// /// /// 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_kitRunning cmp_kitRunning; + protected global::NKC_WF.WebUserControls.cmp_kitReqRunning cmp_kitReqRunning; /// /// Controllo cmp_kitting.