diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 450b8b6..78e619f 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -9417,7 +9417,7 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\n FROM dbo.ItemList"; @@ -9430,55 +9430,61 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_IL_getByOfflineOrder"; + this._commandCollection[2].CommandText = "dbo.stp_IL_getByKey"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OffOrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_IL_getByOrder"; + this._commandCollection[3].CommandText = "dbo.stp_IL_getByOfflineOrder"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OffOrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_IL_getBySearch"; + this._commandCollection[4].CommandText = "dbo.stp_IL_getByOrder"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemDtmx", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maxStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_IL_getByStatus"; + this._commandCollection[5].CommandText = "dbo.stp_IL_getBySearch"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemDtmx", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maxStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_IL_updateSheetStatus"; + this._commandCollection[6].CommandText = "dbo.stp_IL_getByStatus"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatusID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maxStatus", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_IL_updateSheetStatusPU"; + this._commandCollection[7].CommandText = "dbo.stp_IL_updateSheetStatus"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatusID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "dbo.stp_IL_updateStatus"; + this._commandCollection[8].CommandText = "dbo.stp_IL_updateSheetStatusPU"; this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatusID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SheetID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[9].Connection = this.Connection; + this._commandCollection[9].CommandText = "dbo.stp_IL_updateStatus"; + this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ItemID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@StatusID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9509,8 +9515,25 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_App.ItemListDataTable getByOfflineOrder(global::System.Nullable OffOrdID) { + public virtual DS_App.ItemListDataTable getByKey(global::System.Nullable ItemID) { this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((ItemID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(ItemID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_App.ItemListDataTable dataTable = new DS_App.ItemListDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_App.ItemListDataTable getByOfflineOrder(global::System.Nullable OffOrdID) { + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((OffOrdID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(OffOrdID.Value)); } @@ -9527,7 +9550,7 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.ItemListDataTable getByOrder(global::System.Nullable OrdID) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((OrdID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(OrdID.Value)); } @@ -9544,7 +9567,7 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.ItemListDataTable getBySearch(global::System.Nullable ItemID, string ItemDtmx, global::System.Nullable minStatus, global::System.Nullable maxStatus) { - this.Adapter.SelectCommand = this.CommandCollection[4]; + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((ItemID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(ItemID.Value)); } @@ -9579,7 +9602,7 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.ItemListDataTable getByStatus(global::System.Nullable minStatus, global::System.Nullable maxStatus) { - this.Adapter.SelectCommand = this.CommandCollection[5]; + this.Adapter.SelectCommand = this.CommandCollection[6]; if ((minStatus.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(minStatus.Value)); } @@ -9999,7 +10022,7 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateSheetStatus(global::System.Nullable SheetID, global::System.Nullable StatusID, string PlaceCod) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((SheetID.HasValue == true)) { command.Parameters[1].Value = ((int)(SheetID.Value)); } @@ -10039,7 +10062,7 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateSheetStatusPU(global::System.Nullable SheetID, string PlaceCod) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; if ((SheetID.HasValue == true)) { command.Parameters[1].Value = ((int)(SheetID.Value)); } @@ -10073,7 +10096,7 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateStatus(global::System.Nullable ItemID, global::System.Nullable StatusID, string PlaceCod) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((ItemID.HasValue == true)) { command.Parameters[1].Value = ((int)(ItemID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index d5a252c..74da239 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -586,6 +586,17 @@ SELECT ItemID, ItemStatus, OrdID, ItemDtmx, ItemExtCode, ItemDesc, ItemNote, Ite + + + + dbo.stp_IL_getByKey + + + + + + + @@ -1066,7 +1077,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1098,7 +1109,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1120,7 +1131,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1175,7 +1186,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1247,7 +1258,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1255,7 +1266,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1316,7 +1327,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1349,7 +1360,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1365,7 +1376,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1381,7 +1392,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1405,7 +1416,7 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - + @@ -1464,10 +1475,10 @@ SELECT OrdID, ItemID FROM OffOrd2Item WHERE (ItemID = @ItemID) AND (OrdID = @Ord - - - - + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 31b8b4b..eaf66aa 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. --> - + diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index 76db822..3c805d5 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -204,12 +204,19 @@ namespace AppData { case tipoDocumento.docBinPre: break; + case tipoDocumento.docBinPost: + break; + case tipoDocumento.docCart: + break; case tipoDocumento.docPart: + int.TryParse(keyParam, out intIdx); + var tabPart = taIL.getByKey(intIdx); + answ = tabPart.Count > 0; break; case tipoDocumento.docStack: int.TryParse(keyParam, out intIdx); - var tabRes = taSTL.getByKey(intIdx); - answ = tabRes.Count > 0; + var tabStack = taSTL.getByKey(intIdx); + answ = tabStack.Count > 0; break; case tipoDocumento.docND: break; diff --git a/AppData/reportPrinter.cs b/AppData/reportPrinter.cs index 8d985fa..001ab76 100644 --- a/AppData/reportPrinter.cs +++ b/AppData/reportPrinter.cs @@ -144,14 +144,22 @@ namespace AppData DataTable tab = new DataTable(); switch (tipoReport) { + case reportRichiesto.cartLabel: + // int.TryParse(keyParam, out intIdx); + // tab = (DataTable)DataLayer.man.taRepStack.GetData(intIdx); + break; case reportRichiesto.paintLabelPre: // int.TryParse(keyParam, out intIdx); // tab = (DataTable)DataLayer.man.taRepStack.GetData(intIdx); break; - case reportRichiesto.partLabel: + case reportRichiesto.paintLabelPost: // int.TryParse(keyParam, out intIdx); // tab = (DataTable)DataLayer.man.taRepStack.GetData(intIdx); break; + case reportRichiesto.partLabel: + int.TryParse(keyParam, out intIdx); + tab = (DataTable)DataLayer.man.taIL.getByKey(intIdx); + break; case reportRichiesto.stackLabel: int.TryParse(keyParam, out intIdx); tab = (DataTable)DataLayer.man.taRepStack.GetData(intIdx); diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx index 65679a8..cb7f921 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx @@ -15,11 +15,11 @@
- MAKE CNC PROG + MAKE CNC PROG
PRINT LABELS - ITEM DONE + ITEM DONE
diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs index 8edb986..b3b51c5 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs @@ -6,7 +6,7 @@ using System.Web.UI.WebControls; namespace NKC_WF.WebUserControls { - public partial class cmp_offOrderDetail : System.Web.UI.UserControl + public partial class cmp_offOrderDetail : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { @@ -53,6 +53,7 @@ namespace NKC_WF.WebUserControls protected void lbtMakeCnc_Click(object sender, EventArgs e) { + bool allOk = true; /* ************************************************ * cerco su redis la richiesta corrente: * - se NON C'E' ricreo richiesta @@ -64,6 +65,16 @@ namespace NKC_WF.WebUserControls // ...x ora registro richiesta di CNC COME GIA' FATTA //DataLayer.man.taOffOL. + + + + if (allOk) + { + // registro che ho stampato... 2! + DataLayer.man.taOffOL.updateStatus(OffOrdId, 1); + } + frmView.DataBind(); + raiseEvent(); } protected void lbtPrintLabels_Click(object sender, EventArgs e) @@ -83,12 +94,15 @@ namespace NKC_WF.WebUserControls // registro che ho stampato... 2! DataLayer.man.taOffOL.updateStatus(OffOrdId, 2); } + frmView.DataBind(); + raiseEvent(); } protected void lblDone_Click(object sender, EventArgs e) { // registro che ho COMPLETATO... 3! DataLayer.man.taOffOL.updateStatus(OffOrdId, 3); + raiseReset(); } } diff --git a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs index fc2f164..856e4f6 100644 --- a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs @@ -13,6 +13,18 @@ namespace NKC_WF.WebUserControls cmp_offOrderDetail.Visible = false; } mod_righePag.eh_newNum += Mod_righePag_eh_newNum; + cmp_offOrderDetail.eh_doRefresh += Cmp_offOrderDetail_eh_doRefresh; + cmp_offOrderDetail.eh_doReset += Cmp_offOrderDetail_eh_doReset; + } + + private void Cmp_offOrderDetail_eh_doReset(object sender, EventArgs e) + { + forceReset(); + } + + private void Cmp_offOrderDetail_eh_doRefresh(object sender, EventArgs e) + { + doUpdate(); } private void Mod_righePag_eh_newNum(object sender, EventArgs e) @@ -25,8 +37,14 @@ namespace NKC_WF.WebUserControls } protected void lbtReset_Click(object sender, EventArgs e) + { + forceReset(); + } + + private void forceReset() { grView.SelectedIndex = -1; + grView.DataBind(); cmp_offOrderDetail.Visible = false; }