From 3f399a670ad6aeac9d9245842f1fa9392913287d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 16 Jun 2021 13:01:20 +0200 Subject: [PATCH 1/7] Fix check file path con log (maybe) --- NKC_WF/site/OrderManager.aspx.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs index 40245c7..4e76478 100644 --- a/NKC_WF/site/OrderManager.aspx.cs +++ b/NKC_WF/site/OrderManager.aspx.cs @@ -217,21 +217,30 @@ namespace NKC_WF { localPath = item.CadFilePath.Replace(cadBasePath, srvCadBasePath); } + // fix slash/backslash + localPath = localPath.Replace("/", "\\"); // verifico - fileOk = System.IO.File.Exists(localPath); + fileOk = File.Exists(localPath); if (!fileOk) { - DLMan.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", $"{traduci("ErrOrderDxfNotFound")} {localPath} | part {item.ItemExtCode} | {item.ItemDesc}"); + string errMsg = $"{traduci("ErrOrderDxfNotFound")} {localPath} | part {item.ItemExtCode} | {item.ItemDesc}"; + DLMan.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", errMsg); allOk = false; missingDxfList.Add(item.ItemExtCode); + logger.lg.scriviLog(errMsg); } } } } } - catch - { } - // cerco errori preesistenti + catch (Exception exc) + { + allOk = false; + string errMsg = $"Excetion on doValidations fot BatchId: {batchID}{Environment.NewLine}{exc}"; + logger.lg.scriviLog(errMsg); + DLMan.taEL.insertQuery(DateTime.Now, "I.2", $"B.{batchID}", "doValidations", errMsg); + } + // risultato return allOk; } From 40b6d19c79975ca1262bc477a9be79d340171515 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 16 Jun 2021 13:01:35 +0200 Subject: [PATCH 2/7] fix check/uncheck show split --- NKC_WF/Web.config | 457 ++++++++++--------- NKC_WF/WebUserControls/cmp_batchList.ascx | 2 +- NKC_WF/WebUserControls/cmp_batchList.ascx.cs | 6 + 3 files changed, 242 insertions(+), 223 deletions(-) diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index b6c9731..9944203 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -6,418 +6,428 @@ -
-
-
-
+
+
+
+
- - + + - + - + - + - + - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - + + + + + + - - - + + + - + - - - + + + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - + - - - - + + + + - - - - - + + + + + @@ -425,21 +435,21 @@ See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for more information on remote access and securing ELMAH. --> - - + + - + - + + + + + + + + + + + + + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs index de80bbf..12c8abf 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs @@ -2,6 +2,7 @@ using NKC_SDK; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Web; using System.Web.UI; @@ -217,10 +218,8 @@ namespace NKC_WF.WebUserControls // sistemazione ratio calcolata... DS_App.OrderListTreeDataTable tabNe01 = DLMan.taOLT.getByBatch(cmp_orderExtListNE01.BatchId); DS_App.OrderListTreeDataTable tabNe02 = DLMan.taOLT.getByBatch(cmp_orderExtListNE02.BatchId); - double totTime01 = tabNe01.Sum(x => x.EstProcTime); double totTime02 = tabNe02.Sum(x => x.EstProcTime); - // aggiorno valore ratio e ratio last... fullTime = totTime01 + totTime02; fullTime = fullTime > 0 ? fullTime : 1; @@ -237,26 +236,25 @@ namespace NKC_WF.WebUserControls // solo se variato il ratio... if (valRatio != lastValRatio) { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); // costruisco vettore durata ordini OrderSetSim FullSet = new OrderSetSim(); OrderSetSim SetNe01 = new OrderSetSim(); OrderSetSim SetNe02 = new OrderSetSim(); - // creo liste x i valori da processare... Dictionary RawList = new Dictionary(); Dictionary OrderedList = new Dictionary(); - foreach (var item in TabOrders) { RawList.Add(item.OrdID, item.EstProcTime); } - // ordino la lista x processing successivo OrderedList = RawList.OrderBy(x => x.Value).ToDictionary(t => t.Key, t => t.Value); - + // imposto maxDepth ... + int maxDepth = 5; // salvo i set FullSet.OrderSet = OrderedList; - // lavoro sull'ottimizzare il MINORE double ValRatioP = (double)valRatio / 100; // se uno è zero @@ -279,7 +277,7 @@ namespace NKC_WF.WebUserControls else if (valRatio <= 50) { SetNe01.TargetValue = FullSet.ActualValue * ValRatioP; - SetNe01.OrderSet = findLocalMin(OrderedList, SetNe01.TargetValue); + SetNe01.OrderSet = findLocalMin(OrderedList, SetNe01.TargetValue, maxDepth); // l'altro è la differenza SetNe02.OrderSet = OrderedList; foreach (var item in SetNe01.OrderSet) @@ -290,7 +288,7 @@ namespace NKC_WF.WebUserControls else { SetNe02.TargetValue = FullSet.ActualValue * (1 - ValRatioP); - SetNe02.OrderSet = findLocalMin(OrderedList, SetNe02.TargetValue); + SetNe02.OrderSet = findLocalMin(OrderedList, SetNe02.TargetValue, maxDepth); // l'altro è la differenza SetNe01.OrderSet = OrderedList; foreach (var item in SetNe02.OrderSet) @@ -298,7 +296,6 @@ namespace NKC_WF.WebUserControls SetNe01.OrderSet.Remove(item.Key); } } - // riorganizzo tabOrders... foreach (var orderItem in TabOrders) { @@ -317,9 +314,11 @@ namespace NKC_WF.WebUserControls } } } - // --> richiede salvataggio needSave = true; + // salvo tempo calcolo + stopWatch.Stop(); + Log.Instance.Info($"Rebalance executed | valRatio: {valRatio} | maxDepth: {maxDepth} | elapsed ms: {stopWatch.ElapsedMilliseconds}"); } fixRatio(); } @@ -341,14 +340,14 @@ namespace NKC_WF.WebUserControls /// Cerca il set con lo score migliore calcolando x subset della lista ordinata /// /// Lista ordinata oggetti (INT) + valore - /// Valore desiderato (comeSOMMA) + /// Valore desiderato (come SOMMA) + /// Massima profondità ricorsione accettata (x evitare loop infinito) /// - protected Dictionary findLocalMin(Dictionary OrderedList, double TargetVal) + protected Dictionary findLocalMin(Dictionary OrderedList, double TargetVal, int maxDepth) { Dictionary answ = new Dictionary(); List Candidates = new List(); OrderSetSim CurrSimSet = new OrderSetSim(); - // parte dal valore (singolo) più piccolo tra quelli maggiori del target... se c'è... var OrdSup = OrderedList.Where(x => x.Value > TargetVal).OrderBy(x => x.Value); if (OrdSup != null && OrdSup.Any()) @@ -359,7 +358,6 @@ namespace NKC_WF.WebUserControls CurrSimSet.OrderSet.Add(currOrder.Key, currOrder.Value); Candidates.Add(CurrSimSet); } - // ora guardo gli elementi restanti.. se ci sono var OrdInf = OrderedList.Where(x => x.Value <= TargetVal).OrderByDescending(x => x.Value).ToDictionary(t => t.Key, t => t.Value); if (OrdInf != null && OrdInf.Any()) @@ -369,30 +367,61 @@ namespace NKC_WF.WebUserControls CurrSimSet.TargetValue = TargetVal; CurrSimSet.OrderSet.Add(currOrder.Key, currOrder.Value); Candidates.Add(CurrSimSet); + // prendo i restanti tranne il primo OrdInf.Remove(currOrder.Key); - // se rimane qualcosa... - if (OrdInf != null && OrdInf.Any()) + + // guardo i successivi che NON superano + corrente... + Dictionary TestOrderSetMinDelta = findStepMin(OrdInf, TargetVal - currOrder.Value); + TestOrderSetMinDelta.Add(currOrder.Key, currOrder.Value); + // verifico se migliorativo... + if (TestOrderSetMinDelta.Count > 0) { - // calcolo il minimo locale nei 2 casi, da soli - Dictionary TestOrderSet01 = findLocalMin(OrdInf, TargetVal); - if (TestOrderSet01.Count > 0) + OrderSetSim CurrSet = new OrderSetSim(); + CurrSet.TargetValue = TargetVal - currOrder.Value; + CurrSet.OrderSet = TestOrderSetMinDelta; + Candidates.Add(CurrSet); + } + + // solo successivi che non superano + Dictionary TestOrderSetMin = findStepMin(OrdInf, TargetVal); + // verifico se migliorativo... + if (TestOrderSetMin.Count > 0) + { + OrderSetSim CurrSet = new OrderSetSim(); + CurrSet.TargetValue = TargetVal - currOrder.Value; + CurrSet.OrderSet = TestOrderSetMin; + Candidates.Add(CurrSet); + } + + // se posso fare ricorsioni + if (maxDepth > 0) + { + maxDepth--; + + // se rimane qualcosa... + if (OrdInf != null && OrdInf.Any()) { - OrderSetSim CurrSet = new OrderSetSim(); - CurrSet.TargetValue = TargetVal; - CurrSet.OrderSet = TestOrderSet01; - Candidates.Add(CurrSet); - } - // ...e con il primo valore... - Dictionary TestOrderSet02 = findLocalMin(OrdInf, TargetVal - currOrder.Value); - TestOrderSet02.Add(currOrder.Key, currOrder.Value); - // verifico se migliorativo... - if (TestOrderSet02.Count > 0) - { - OrderSetSim CurrSet = new OrderSetSim(); - CurrSet.TargetValue = TargetVal - currOrder.Value; - CurrSet.OrderSet = TestOrderSet02; - Candidates.Add(CurrSet); + // calcolo il minimo locale nei 2 casi, da soli + Dictionary TestOrderSet01 = findLocalMin(OrdInf, TargetVal, maxDepth); + if (TestOrderSet01.Count > 0) + { + OrderSetSim CurrSet = new OrderSetSim(); + CurrSet.TargetValue = TargetVal; + CurrSet.OrderSet = TestOrderSet01; + Candidates.Add(CurrSet); + } + // ...e con il primo valore... + Dictionary TestOrderSet02 = findLocalMin(OrdInf, TargetVal - currOrder.Value, maxDepth); + TestOrderSet02.Add(currOrder.Key, currOrder.Value); + // verifico se migliorativo... + if (TestOrderSet02.Count > 0) + { + OrderSetSim CurrSet = new OrderSetSim(); + CurrSet.TargetValue = TargetVal - currOrder.Value; + CurrSet.OrderSet = TestOrderSet02; + Candidates.Add(CurrSet); + } } } } @@ -401,11 +430,32 @@ namespace NKC_WF.WebUserControls { answ = Candidates.OrderBy(x => x.IndexScore).FirstOrDefault().OrderSet; } - // calcolo il minimo e lo restituisco... return answ; } + /// + /// Cerca il set della lista ordinata <= target val + /// + /// Lista ordinata oggetti (INT) + valore + /// Valore desiderato (come SOMMA) + /// + protected Dictionary findStepMin(Dictionary OrderedList, double TargetVal) + { + double CurrVal = 0; + Dictionary answ = new Dictionary(); + foreach (var item in OrderedList) + { + CurrVal += item.Value; + if (CurrVal <= TargetVal) + { + answ.Add(item.Key, item.Value); + } + } + // restituisco set minore... + return answ; + } + protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index 1a2db31..e719de2 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -26,6 +26,17 @@ namespace NKC_WF.WebUserControls } } + /// + /// Status corrente del batch + /// + protected BatchStatus CurrBatchStatus + { + get + { + return ComLib.BStatus(BatchIdSel); + } + } + protected int currSelRow { get @@ -166,13 +177,16 @@ namespace NKC_WF.WebUserControls private void fixDetails() { - divDetail.Visible = currSelRow >= 0; lastSelRow = currSelRow; - // recupero BatchId selezionato - cmp_batchDetail.BatchId = 0; - cmp_batchDetail.BatchId = BatchIdSel; - cmp_batchDetail.doUpdate(); - updPanelDetail.Update(); + divDetail.Visible = currSelRow >= 0; + if (divDetail.Visible) + { + // recupero BatchId selezionato + cmp_batchDetail.BatchId = 0; + cmp_batchDetail.BatchId = BatchIdSel; + cmp_batchDetail.doUpdate(); + updPanelDetail.Update(); + } } private void resetSelezione() @@ -365,7 +379,12 @@ namespace NKC_WF.WebUserControls checkFixOds(); grView.DataBind(); currSelRow = lastSelRow; - fixDetails(); + var currBStatus = CurrBatchStatus; + // solo se il batch è in fase di stima/nesting... + if (currBStatus == BatchStatus.NestRequested || currBStatus == BatchStatus.EstimationRequested) + { + fixDetails(); + } } /// diff --git a/NKC_WF/WebUserControls/cmp_orderExtList.ascx b/NKC_WF/WebUserControls/cmp_orderExtList.ascx index 8000f6f..dfc288a 100644 --- a/NKC_WF/WebUserControls/cmp_orderExtList.ascx +++ b/NKC_WF/WebUserControls/cmp_orderExtList.ascx @@ -12,7 +12,7 @@ - + From 0841aa558412980f54b00c5e504270f398fef863 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 16 Jun 2021 15:24:20 +0200 Subject: [PATCH 6/7] fix salvataggio stima ext iniziale --- NKC_WF/Controllers/BatchProcController.cs | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/NKC_WF/Controllers/BatchProcController.cs b/NKC_WF/Controllers/BatchProcController.cs index 1be91a2..90af590 100644 --- a/NKC_WF/Controllers/BatchProcController.cs +++ b/NKC_WF/Controllers/BatchProcController.cs @@ -402,26 +402,6 @@ namespace NKC_WF.Controllers } string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}{dxfFolder}/"; DLMan.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false); - // verifico IN CASO di validazione andata a buon fine --> valorizzo tabella! - if (bStatus > 7) - { - if (isValidation) - { - // recupero ordine da batch - if (tabOrd.Count > 0) - { - DLMan.taIV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime); - } - } - else if (isTesting) - { - // recupero ordine da batch - if (tabOrd.Count > 0) - { - DLMan.taFV.upsertQuery(tabOrd[0].OrderExtCode, rispStima.BatchID, bStatus, rispStima.EstimatedWorktime); - } - } - } // registro OK answ = "OK"; } From 00bf555add76199a8a3dd723aa98afd5880978de Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 16 Jun 2021 15:24:25 +0200 Subject: [PATCH 7/7] fix procedura rebalance --- AppData/ComLib.cs | 2 +- AppData/DS_App.Designer.cs | 41 ++++++++------ AppData/DS_App.xsd | 113 +++++++++++++++++++------------------ AppData/DS_App.xss | 4 +- 4 files changed, 84 insertions(+), 76 deletions(-) diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index fdcf5cb..e585209 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -2580,7 +2580,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, BatchId, currItem.OrderId, currItem.OrderExtCode, currItem.NumBin, currItem.NumCart, currItem.NumPart, (currItem.TotTime / 60)); } } diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 6f5dd19..1663e71 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -39379,6 +39379,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE 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("@BatchID", 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("@AncestBatchID", 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("@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].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrderExtCode", global::System.Data.SqlDbType.NVarChar, 250, 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("@EstNumBin", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -39525,7 +39526,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE [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")] - public virtual int insert(global::System.Nullable BatchID, global::System.Nullable OrdID, string OrderExtCode, global::System.Nullable EstNumBin, global::System.Nullable EstNumCart, global::System.Nullable EstNumPart, global::System.Nullable EstProcTime) { + public virtual int insert(global::System.Nullable BatchID, global::System.Nullable AncestBatchID, global::System.Nullable OrdID, string OrderExtCode, global::System.Nullable EstNumBin, global::System.Nullable EstNumCart, global::System.Nullable EstNumPart, global::System.Nullable EstProcTime) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((BatchID.HasValue == true)) { command.Parameters[1].Value = ((int)(BatchID.Value)); @@ -39533,42 +39534,48 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE else { command.Parameters[1].Value = global::System.DBNull.Value; } - if ((OrdID.HasValue == true)) { - command.Parameters[2].Value = ((int)(OrdID.Value)); + if ((AncestBatchID.HasValue == true)) { + command.Parameters[2].Value = ((int)(AncestBatchID.Value)); } else { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((OrderExtCode == null)) { + if ((OrdID.HasValue == true)) { + command.Parameters[3].Value = ((int)(OrdID.Value)); + } + else { command.Parameters[3].Value = global::System.DBNull.Value; } - else { - command.Parameters[3].Value = ((string)(OrderExtCode)); - } - if ((EstNumBin.HasValue == true)) { - command.Parameters[4].Value = ((int)(EstNumBin.Value)); - } - else { + if ((OrderExtCode == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } - if ((EstNumCart.HasValue == true)) { - command.Parameters[5].Value = ((int)(EstNumCart.Value)); + else { + command.Parameters[4].Value = ((string)(OrderExtCode)); + } + if ((EstNumBin.HasValue == true)) { + command.Parameters[5].Value = ((int)(EstNumBin.Value)); } else { command.Parameters[5].Value = global::System.DBNull.Value; } - if ((EstNumPart.HasValue == true)) { - command.Parameters[6].Value = ((int)(EstNumPart.Value)); + if ((EstNumCart.HasValue == true)) { + command.Parameters[6].Value = ((int)(EstNumCart.Value)); } else { command.Parameters[6].Value = global::System.DBNull.Value; } - if ((EstProcTime.HasValue == true)) { - command.Parameters[7].Value = ((double)(EstProcTime.Value)); + if ((EstNumPart.HasValue == true)) { + command.Parameters[7].Value = ((int)(EstNumPart.Value)); } else { command.Parameters[7].Value = global::System.DBNull.Value; } + if ((EstProcTime.HasValue == true)) { + command.Parameters[8].Value = ((double)(EstProcTime.Value)); + } + else { + command.Parameters[8].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index 98e3bf1..15dccc4 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -267,7 +267,7 @@ FROM v_BatchList - + dbo.stp_Batch_refuseNesting @@ -279,7 +279,7 @@ FROM v_BatchList - + dbo.stp_Batch_resetAllNesting @@ -290,7 +290,7 @@ FROM v_BatchList - + dbo.stp_Batch_resetPartUnValid @@ -300,7 +300,7 @@ FROM v_BatchList - + dbo.stp_zzz_resetProdCall @@ -310,7 +310,7 @@ FROM v_BatchList - + dbo.stp_Batch_resetTree @@ -321,7 +321,7 @@ FROM v_BatchList - + dbo.stp_Batch_updateSchedPrior @@ -333,7 +333,7 @@ FROM v_BatchList - + dbo.stp_Batch_updateStatus @@ -3331,6 +3331,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE + @@ -3376,7 +3377,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3434,7 +3435,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3459,7 +3460,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3514,7 +3515,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3587,7 +3588,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3656,7 +3657,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3689,7 +3690,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3761,7 +3762,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3780,7 +3781,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3811,7 +3812,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3819,7 +3820,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3836,7 +3837,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3845,7 +3846,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3876,7 +3877,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3884,7 +3885,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3900,7 +3901,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3908,7 +3909,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3936,7 +3937,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3972,7 +3973,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3988,7 +3989,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -3998,7 +3999,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4015,7 +4016,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4028,7 +4029,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4077,7 +4078,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4106,7 +4107,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4148,7 +4149,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4259,7 +4260,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4322,7 +4323,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4367,7 +4368,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4393,7 +4394,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4486,7 +4487,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4549,7 +4550,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4608,7 +4609,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4657,7 +4658,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4696,7 +4697,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4749,7 +4750,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4766,7 +4767,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4779,7 +4780,7 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - + @@ -4950,17 +4951,17 @@ SELECT ItemExtCode, BatchID, EvalDate, EstimTime, Status FROM FileValidation WHE - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 1ef0cd2..05a7ed4 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -41,9 +41,9 @@ - + - +