diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index a91e210..778d86a 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -2500,7 +2500,7 @@ namespace AppData foreach (var currItem in OrdExtList) { // tempo in sec --> divido 60 - DLMan.taOLT.insert(BatchId, currItem.OrderId, currItem.OrderExtCode, currItem.NumBin, currItem.NumCart, currItem.NumPart, currItem.TotTime / 60); + DLMan.taOLT.insert(BatchId, currItem.OrderId, currItem.OrderExtCode, currItem.NumBin, currItem.NumCart, currItem.NumPart, (currItem.TotTime / 60)); } } diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx b/NKC_WF/WebUserControls/cmp_batchDetail.ascx index 71151f8..9abdb60 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx @@ -106,17 +106,11 @@ NE02 % -
- -
-
+
-
- -
ORD LIST NE01 - summary diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index e7beb41..e5ef1c9 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -281,9 +281,9 @@ namespace NKC_WF.WebUserControls } if (BatchId > 0) { - fixChildBatch(); checkCreateDescendant(); showBatchDescendant(); + fixChildBatch(); } } get @@ -329,6 +329,8 @@ namespace NKC_WF.WebUserControls DS_App.BatchListDataTable TabBatch = TabBatchDesc; cmp_orderExtListNE01.BatchId = TabBatch.Rows.Count > 0 ? TabBatchDesc[0].BatchID : 0; cmp_orderExtListNE02.BatchId = TabBatch.Rows.Count > 0 ? TabBatchDesc[1].BatchID : 0; + cmp_orderExtListNE01.doUpdate(); + cmp_orderExtListNE02.doUpdate(); } private void fixRatio() @@ -433,8 +435,6 @@ namespace NKC_WF.WebUserControls { // suddivido rebalanceOrder(); - cmp_orderExtListNE01.doUpdate(); - cmp_orderExtListNE02.doUpdate(); } #endregion Private Methods @@ -517,14 +517,6 @@ namespace NKC_WF.WebUserControls raiseEvent(); } - protected void lbtCancel_Click(object sender, EventArgs e) - { - } - - protected void lbtSave_Click(object sender, EventArgs e) - { - } - protected void lbtSendEstim_Click(object sender, EventArgs e) { // invia a redis una richiesta... @@ -595,6 +587,7 @@ namespace NKC_WF.WebUserControls rebalanceOrder(); lblRatio01.Text = $"{valRatio}"; lblRatio02.Text = $"{100 - valRatio}"; + fixChildBatch(); } #endregion Protected Methods diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs index 0017d42..9229577 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs @@ -86,15 +86,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblRatio02; - /// - /// lbtSave control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtSave; - /// /// hfNeedSave control. /// @@ -122,15 +113,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.TextBox txtRatio; - /// - /// lbtCancel control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtCancel; - /// /// cmp_orderExtListNE01 control. /// diff --git a/NKC_WF/WebUserControls/cmp_orderExtList.ascx.cs b/NKC_WF/WebUserControls/cmp_orderExtList.ascx.cs index 27e9b5b..24866d1 100644 --- a/NKC_WF/WebUserControls/cmp_orderExtList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_orderExtList.ascx.cs @@ -34,6 +34,10 @@ namespace NKC_WF.WebUserControls protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + doUpdate(); + } } #endregion Protected Methods