diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 1fbb5e4..58a0df6 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -1439,7 +1439,7 @@ namespace AppData // salvo in redis cachedCurrBunkTab = tabBunk; } - if (tabBunk.Count > 0) + if (tabBunk != null && tabBunk.Count > 0) { answ = tabBunk[0]; } @@ -1901,66 +1901,80 @@ namespace AppData // solo se sheet > 0... if (sheetID > 0) { - // elenco items da foglio!!! - var tabItems = DataLayer.man.taIL.getBySheet(sheetID); - List itemsAll = new List(); - List itemsDepo = new List(); - List itemsCart = new List(); - List itemsBin = new List(); - List itemsSecOp = new List(); - - //se ho items... - if (tabItems.Count > 0) + try { - // ciclo! - foreach (var item in tabItems) + // elenco items da foglio!!! + var tabItems = DataLayer.man.taIL.getBySheet(sheetID); + List itemsAll = new List(); + List itemsDepo = new List(); + List itemsCart = new List(); + List itemsBin = new List(); + List itemsSecOp = new List(); + List itemsScrap = new List(); + + //se ho items... + if (tabItems.Count > 0) { - // aggiungoncomunque a lista generale... - itemsAll.Add(item.ItemDtmx); - // controllo SE sia stato depositato... check status 3/4 - if (item.StatusID == 3 || item.StatusID == 4) + // ciclo! + foreach (var item in tabItems) { - itemsDepo.Add(item.ItemDtmx); - } - else if (item.ProcessesReq.Contains("PaintFlag")) - { - itemsBin.Add(item.ItemDtmx); - } - else - { - itemsCart.Add(item.ItemDtmx); - } - // controllo ANCHE postprocessing - if (item.PostProcList != "") - { - itemsSecOp.Add(item.ItemDtmx); + // aggiungoncomunque a lista generale... + itemsAll.Add(item.ItemDtmx); + // controllo se sia SCRAP + if (item.StatusID >= 990) + { + itemsScrap.Add(item.ItemDtmx); + } + // controllo SE sia stato depositato... check status 3/4 + else if (item.StatusID == 3 || item.StatusID == 4) + { + itemsDepo.Add(item.ItemDtmx); + } + else if (item.ProcessesReq.Contains("PaintFlag")) + { + itemsBin.Add(item.ItemDtmx); + } + else + { + itemsCart.Add(item.ItemDtmx); + } + // controllo ANCHE postprocessing + if (item.PostProcList != "") + { + itemsSecOp.Add(item.ItemDtmx); + } } } + + + // FIX BIN + answ = updateCssByItemList(answ, redKeyBase, "ItemsBin", itemsBin, dataCacheTTL); + + // FIX CART + answ = updateCssByItemList(answ, redKeyBase, "ItemsCart", itemsCart, dataCacheTTL); + + // FIX Scaricati + answ = updateCssByItemList(answ, redKeyBase, "ItemsDepo", itemsDepo, dataCacheTTL); + + // FIX SEC-OP + answ = updateCssByItemList(answ, redKeyBase, "ItemsSecOp", itemsSecOp, dataCacheTTL); + + // FIX SCRAP + answ = updateCssByItemList(answ, redKeyBase, "ItemsScrap", itemsScrap, dataCacheTTL); + + // FIXED SEL da array oggetti selezionati... + answ = updateCssByPickedItems(answ, redKeyBase, "ItemsSel", dataCacheTTL); + + + // INFINE serializzo e salvo tutti gli items trovati... + string serVal = JsonConvert.SerializeObject(itemsAll); + memLayer.ML.setRSV($"{redKeyBase}:ItemsAll", serVal, dataCacheTTL); + + // salvo redis css! + memLayer.ML.setRSV($"{redKeyBase}:Css", answ, dataCacheTTL); } - - - // FIX BIN - answ = updateCssByItemList(answ, redKeyBase, "ItemsBin", itemsBin, dataCacheTTL); - - // FIX CART - answ = updateCssByItemList(answ, redKeyBase, "ItemsCart", itemsCart, dataCacheTTL); - - // FIX Scaricati - answ = updateCssByItemList(answ, redKeyBase, "ItemsDepo", itemsDepo, dataCacheTTL); - - // FIX SEC-OP - answ = updateCssByItemList(answ, redKeyBase, "ItemsSecOp", itemsSecOp, dataCacheTTL); - - // FIXED SEL da array oggetti selezionati... - answ = updateCssByPickedItems(answ, redKeyBase, "ItemsSel", dataCacheTTL); - - - // INFINE serializzo e salvo tutti gli items trovati... - string serVal = JsonConvert.SerializeObject(itemsAll); - memLayer.ML.setRSV($"{redKeyBase}:ItemsAll", serVal, dataCacheTTL); - - // salvo redis css! - memLayer.ML.setRSV($"{redKeyBase}:Css", answ, dataCacheTTL); + catch + { } } return answ; diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 2089b0e..521fad3 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -34632,7 +34632,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [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[6]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "select * from PackLog"; @@ -34647,36 +34647,45 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_PL_acquireOtherItems"; + this._commandCollection[2].CommandText = "dbo.stp_PL_acquireItems"; 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("@OtherItemID", 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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", 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("@MaxNum", 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("@Device", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_PL_acquirePaint"; + this._commandCollection[3].CommandText = "dbo.stp_PL_acquireOtherItems"; 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("@BinID", 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("@OtherItemID", 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("@CartID", 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("@MaxNum", 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("@Device", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_PL_closeCart"; + this._commandCollection[4].CommandText = "dbo.stp_PL_acquirePaint"; 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("@BinID", 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("@CartID", 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("@MaxNum", 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("@Device", 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("@UserName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_PLog_getByCart"; + this._commandCollection[5].CommandText = "dbo.stp_PL_closeCart"; 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("@CartID", 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_PLog_getByCart"; + 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("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -34708,7 +34717,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_App.PackLogDataTable getByCartId(global::System.Nullable CartID) { - this.Adapter.SelectCommand = this.CommandCollection[5]; + this.Adapter.SelectCommand = this.CommandCollection[6]; if ((CartID.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartID.Value)); } @@ -34763,8 +34772,54 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [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 acquireOtherItems(global::System.Nullable OtherItemID, global::System.Nullable CartID, global::System.Nullable MaxNum, string Device, string UserName) { + public virtual int acquireItems(global::System.Nullable ItemID, global::System.Nullable CartID, string Device, string UserName) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((ItemID.HasValue == true)) { + command.Parameters[1].Value = ((int)(ItemID.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((CartID.HasValue == true)) { + command.Parameters[2].Value = ((int)(CartID.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((Device == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(Device)); + } + if ((UserName == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(UserName)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [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 acquireOtherItems(global::System.Nullable OtherItemID, global::System.Nullable CartID, global::System.Nullable MaxNum, string Device, string UserName) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((OtherItemID.HasValue == true)) { command.Parameters[1].Value = ((int)(OtherItemID.Value)); } @@ -34816,7 +34871,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int acquirePaint(global::System.Nullable BinID, global::System.Nullable CartID, global::System.Nullable MaxNum, string Device, string UserName) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((BinID.HasValue == true)) { command.Parameters[1].Value = ((int)(BinID.Value)); } @@ -34868,7 +34923,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int closeCart(global::System.Nullable CartID) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((CartID.HasValue == true)) { command.Parameters[1].Value = ((int)(CartID.Value)); } diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index e1d9d37..8f21041 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -2620,6 +2620,20 @@ FROM v_PackListDet + + + + dbo.stp_PL_acquireItems + + + + + + + + + + @@ -2974,7 +2988,7 @@ FROM v_OKIB - + @@ -3024,7 +3038,7 @@ FROM v_OKIB - + @@ -3049,7 +3063,7 @@ FROM v_OKIB - + @@ -3104,7 +3118,7 @@ FROM v_OKIB - + @@ -3177,7 +3191,7 @@ FROM v_OKIB - + @@ -3185,7 +3199,7 @@ FROM v_OKIB - + @@ -3254,7 +3268,7 @@ FROM v_OKIB - + @@ -3287,7 +3301,7 @@ FROM v_OKIB - + @@ -3328,7 +3342,7 @@ FROM v_OKIB - + @@ -3347,7 +3361,7 @@ FROM v_OKIB - + @@ -3371,7 +3385,7 @@ FROM v_OKIB - + @@ -3379,7 +3393,7 @@ FROM v_OKIB - + @@ -3396,7 +3410,7 @@ FROM v_OKIB - + @@ -3405,7 +3419,7 @@ FROM v_OKIB - + @@ -3436,7 +3450,7 @@ FROM v_OKIB - + @@ -3444,7 +3458,7 @@ FROM v_OKIB - + @@ -3460,7 +3474,7 @@ FROM v_OKIB - + @@ -3468,7 +3482,7 @@ FROM v_OKIB - + @@ -3496,7 +3510,7 @@ FROM v_OKIB - + @@ -3532,7 +3546,7 @@ FROM v_OKIB - + @@ -3548,7 +3562,7 @@ FROM v_OKIB - + @@ -3558,7 +3572,7 @@ FROM v_OKIB - + @@ -3575,7 +3589,7 @@ FROM v_OKIB - + @@ -3588,7 +3602,7 @@ FROM v_OKIB - + @@ -3637,7 +3651,7 @@ FROM v_OKIB - + @@ -3666,7 +3680,7 @@ FROM v_OKIB - + @@ -3708,7 +3722,7 @@ FROM v_OKIB - + @@ -3817,7 +3831,7 @@ FROM v_OKIB - + @@ -3880,7 +3894,7 @@ FROM v_OKIB - + @@ -3925,7 +3939,7 @@ FROM v_OKIB - + @@ -3951,7 +3965,7 @@ FROM v_OKIB - + @@ -4044,7 +4058,7 @@ FROM v_OKIB - + @@ -4107,7 +4121,7 @@ FROM v_OKIB - + @@ -4166,7 +4180,7 @@ FROM v_OKIB - + @@ -4215,7 +4229,7 @@ FROM v_OKIB - + @@ -4373,18 +4387,18 @@ FROM v_OKIB - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 1ba117b..09adb00 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/DB/SqlSchemaCompare_All.scmp b/DB/SqlSchemaCompare_All.scmp new file mode 100644 index 0000000..9551b9e --- /dev/null +++ b/DB/SqlSchemaCompare_All.scmp @@ -0,0 +1,935 @@ + + + 10 + + + Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Pooling=False + + + + + Data Source=WIN2016-SQL\PROD;Initial Catalog=Sauder_NKC_Prod;Persist Security Info=True;User ID=sa;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=False + + + + + + Version + 1 + + + + + PlanGenerationType + SqlDeploymentOptions + + + AllowExistingModelErrors + False + + + AllowIncompatiblePlatform + False + + + BackupDatabaseBeforeChanges + False + + + BlockOnPossibleDataLoss + True + + + BlockWhenDriftDetected + False + + + CompareUsingTargetCollation + False + + + CommentOutSetVarDeclarations + False + + + CreateNewDatabase + False + + + DeployDatabaseInSingleUserMode + False + + + DisableAndReenableDdlTriggers + True + + + DoNotAlterChangeDataCaptureObjects + True + + + DoNotAlterReplicatedObjects + True + + + DropConstraintsNotInSource + True + + + DropDmlTriggersNotInSource + True + + + DropExtendedPropertiesNotInSource + True + + + DropIndexesNotInSource + True + + + DropPermissionsNotInSource + False + + + DropObjectsNotInSource + True + + + DropRoleMembersNotInSource + False + + + DropStatisticsNotInSource + True + + + GenerateSmartDefaults + False + + + IgnoreDdlTriggerOrder + False + + + IgnoreDdlTriggerState + False + + + IgnoreObjectPlacementOnPartitionScheme + True + + + IgnoreAuthorizer + False + + + IgnoreDefaultSchema + False + + + IgnoreRouteLifetime + True + + + IgnoreCryptographicProviderFilePath + True + + + IgnoreComments + False + + + IgnoreWhitespace + True + + + IgnoreKeywordCasing + True + + + IgnoreSemicolonBetweenStatements + True + + + IgnorePartitionSchemes + False + + + IgnoreTablePartitionOptions + False + + + IgnoreWithNocheckOnCheckConstraints + False + + + IgnoreWithNocheckOnForeignKeys + False + + + IgnoreIdentitySeed + False + + + IgnoreIncrement + False + + + IgnoreFillFactor + True + + + IgnoreIndexPadding + True + + + IgnoreColumnCollation + False + + + IgnoreColumnOrder + False + + + IgnoreLockHintsOnIndexes + False + + + IgnoreTableOptions + False + + + IgnoreIndexOptions + False + + + IgnoreDmlTriggerOrder + False + + + IgnoreDmlTriggerState + False + + + IgnoreAnsiNulls + True + + + IgnoreQuotedIdentifiers + True + + + IgnoreUserSettingsObjects + False + + + IgnoreFilegroupPlacement + True + + + IgnoreFullTextCatalogFilePath + True + + + IgnoreFileAndLogFilePath + True + + + IgnoreLoginSids + True + + + IgnoreNotForReplication + False + + + IgnoreFileSize + True + + + AllowUnsafeRowLevelSecurityDataMovement + False + + + IncludeCompositeObjects + False + + + IncludeTransactionalScripts + False + + + NoAlterStatementsToChangeCLRTypes + False + + + PopulateFilesOnFileGroups + True + + + RegisterDataTierApplication + False + + + ScriptDatabaseCollation + False + + + ScriptDatabaseCompatibility + False + + + ScriptDatabaseOptions + False + + + ScriptDeployStateChecks + False + + + ScriptFileSize + False + + + ScriptNewConstraintValidation + True + + + ScriptRefreshModule + True + + + TargetDatabaseName + Sauder_NKC_Prod + + + TargetConnectionString + Data Source=WIN2016-SQL\PROD;Initial Catalog=Sauder_NKC_Prod;Persist Security Info=True;User ID=sa;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=False;Application Name="Microsoft SQL Server Data Tools, Schema Compare" + + + TreatVerificationErrorsAsWarnings + False + + + UnmodifiableObjectWarnings + True + + + VerifyCollationCompatibility + True + + + VerifyDeployment + True + + + RunDeploymentPlanExecutors + False + + + AllowDropBlockingAssemblies + False + + + DoNotDropAggregates + False + + + DoNotDropApplicationRoles + False + + + DoNotDropAssemblies + False + + + DoNotDropAsymmetricKeys + False + + + DoNotDropAudits + False + + + DoNotDropBrokerPriorities + False + + + DoNotDropCertificates + False + + + DoNotDropClrUserDefinedTypes + False + + + DoNotDropColumnEncryptionKeys + False + + + DoNotDropColumnMasterKeys + False + + + DoNotDropContracts + False + + + DoNotDropCredentials + False + + + DoNotDropDatabaseScopedCredentials + False + + + DoNotDropCryptographicProviders + False + + + DoNotDropDatabaseAuditSpecifications + False + + + DoNotDropDatabaseRoles + False + + + DoNotDropDatabaseTriggers + False + + + DoNotDropDefaults + False + + + DoNotDropEndpoints + False + + + DoNotDropErrorMessages + False + + + DoNotDropEventNotifications + False + + + DoNotDropEventSessions + False + + + DoNotDropExtendedProperties + False + + + DoNotDropExternalDataSources + False + + + DoNotDropExternalFileFormats + False + + + DoNotDropExternalTables + False + + + DoNotDropFilegroups + False + + + DoNotDropFiles + False + + + DoNotDropFileTables + False + + + DoNotDropFullTextCatalogs + False + + + DoNotDropFullTextStoplists + False + + + DoNotDropTableValuedFunctions + False + + + DoNotDropLinkedServerLogins + False + + + DoNotDropLinkedServers + False + + + DoNotDropLogins + False + + + DoNotDropMessageTypes + False + + + DoNotDropPartitionFunctions + False + + + DoNotDropPartitionSchemes + False + + + DoNotDropPermissions + False + + + DoNotDropQueues + False + + + DoNotDropRemoteServiceBindings + False + + + DoNotDropRoleMembership + False + + + DoNotDropRoutes + False + + + DoNotDropRules + False + + + DoNotDropScalarValuedFunctions + False + + + DoNotDropSearchPropertyLists + False + + + DoNotDropSecurityPolicies + False + + + DoNotDropSequences + False + + + DoNotDropServerAuditSpecifications + False + + + DoNotDropServerRoleMembership + False + + + DoNotDropServerRoles + False + + + DoNotDropServerTriggers + False + + + DoNotDropServices + False + + + DoNotDropSignatures + False + + + DoNotDropStoredProcedures + False + + + DoNotDropSymmetricKeys + False + + + DoNotDropSynonyms + False + + + DoNotDropTables + False + + + DoNotDropUserDefinedDataTypes + False + + + DoNotDropUserDefinedTableTypes + False + + + DoNotDropUsers + False + + + DoNotDropViews + False + + + DoNotDropXmlSchemaCollections + False + + + ExcludeAggregates + False + + + ExcludeApplicationRoles + False + + + ExcludeAssemblies + False + + + ExcludeAsymmetricKeys + False + + + ExcludeAudits + True + + + ExcludeBrokerPriorities + False + + + ExcludeCertificates + False + + + ExcludeClrUserDefinedTypes + False + + + ExcludeColumnEncryptionKeys + False + + + ExcludeColumnMasterKeys + False + + + ExcludeContracts + False + + + ExcludeCredentials + True + + + ExcludeDatabaseScopedCredentials + True + + + ExcludeCryptographicProviders + True + + + ExcludeDatabaseAuditSpecifications + True + + + ExcludeDatabaseRoles + False + + + ExcludeDatabaseTriggers + False + + + ExcludeDefaults + False + + + ExcludeEndpoints + True + + + ExcludeErrorMessages + True + + + ExcludeEventNotifications + False + + + ExcludeExternalDataSources + False + + + ExcludeExternalFileFormats + False + + + ExcludeExternalTables + False + + + ExcludeEventSessions + True + + + ExcludeFilegroups + False + + + ExcludeFiles + True + + + ExcludeFileTables + False + + + ExcludeFullTextCatalogs + False + + + ExcludeFullTextStoplists + False + + + ExcludeTableValuedFunctions + False + + + ExcludeLinkedServerLogins + True + + + ExcludeLinkedServers + True + + + ExcludeLogins + True + + + ExcludeMessageTypes + False + + + ExcludePartitionFunctions + False + + + ExcludePartitionSchemes + False + + + ExcludeQueues + False + + + ExcludeRemoteServiceBindings + False + + + ExcludeRoutes + True + + + ExcludeRules + False + + + ExcludeScalarValuedFunctions + False + + + ExcludeSearchPropertyLists + False + + + ExcludeSecurityPolicies + False + + + ExcludeSequences + False + + + ExcludeServerAuditSpecifications + True + + + ExcludeServerRoleMembership + True + + + ExcludeServerRoles + True + + + ExcludeServerTriggers + True + + + ExcludeServices + False + + + ExcludeSignatures + False + + + ExcludeStoredProcedures + False + + + ExcludeSymmetricKeys + False + + + ExcludeSynonyms + False + + + ExcludeTables + False + + + ExcludeUserDefinedDataTypes + False + + + ExcludeUserDefinedTableTypes + False + + + ExcludeUsers + False + + + ExcludeViews + False + + + ExcludeXmlSchemaCollections + False + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerDdlTrigger + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlRoute + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLinkedServerLogin + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlEndpoint + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlErrorMessage + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlFile + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLogin + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlLinkedServer + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlCredential + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseCredential + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseEncryptionKey + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlMasterKey + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseAuditSpecification + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerAudit + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerAuditSpecification + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlCryptographicProvider + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlUserDefinedServerRole + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlEventSession + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseOptions + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlEventNotification + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlServerRoleMembership + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlDatabaseEventSession + ExcludedType + + + Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlAssemblyFile + ExcludedType + + + + + 2 + 100 + Equals_Objects,Not_Supported_Deploy + + + + conn_NKC + + + + + conn_NKC + + + \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index c6549c6..3c31a73 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=319']) { + withEnv(['NEXT_BUILD_NUMBER=320']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF.sln b/NKC_WF.sln index 67e5634..466bd7d 100644 --- a/NKC_WF.sln +++ b/NKC_WF.sln @@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig DB\SqlDataCompare_Vocab.dcmp = DB\SqlDataCompare_Vocab.dcmp + DB\SqlSchemaCompare_All.scmp = DB\SqlSchemaCompare_All.scmp EndProjectSection EndProject Global diff --git a/NKC_WF/Content/SheetColor.css b/NKC_WF/Content/SheetColor.css index 045cfa6..6dc29a8 100644 --- a/NKC_WF/Content/SheetColor.css +++ b/NKC_WF/Content/SheetColor.css @@ -105,4 +105,7 @@ stroke-dasharray: 30; stroke-linecap: round; stroke: #FF0000; +} +#ItemsScrap { + fill: red; } \ No newline at end of file diff --git a/NKC_WF/Content/SheetColor.less b/NKC_WF/Content/SheetColor.less index b7c9359..42ae877 100644 --- a/NKC_WF/Content/SheetColor.less +++ b/NKC_WF/Content/SheetColor.less @@ -2,100 +2,116 @@ @borderThick: 15px; .strokeThick { - stroke-width: @borderThick !important; + stroke-width: @borderThick !important; } /* Animazione per richiamo attenzione*/ .flashStroke { - stroke: yellow; - /* Safari 4.0 - 8.0 */ - -webkit-animation-name: doFlash; - -webkit-animation-duration: 0.8s; - -webkit-animation-timing-function: linear; - -webkit-animation-delay: 0s; - -webkit-animation-iteration-count: infinite; - -webkit-animation-direction: alternate; - /* Standard syntax */ - animation-name: doFlash; - animation-duration: 0.8s; - animation-timing-function: linear; - animation-delay: 0s; - animation-iteration-count: infinite; - animation-direction: alternate; + stroke: yellow; + /* Safari 4.0 - 8.0 */ + -webkit-animation-name: doFlash; + -webkit-animation-duration: 0.8s; + -webkit-animation-timing-function: linear; + -webkit-animation-delay: 0s; + -webkit-animation-iteration-count: infinite; + -webkit-animation-direction: alternate; + /* Standard syntax */ + animation-name: doFlash; + animation-duration: 0.8s; + animation-timing-function: linear; + animation-delay: 0s; + animation-iteration-count: infinite; + animation-direction: alternate; } /* Safari 4.0 - 8.0 */ @-webkit-keyframes doFlash { - 0% { - stroke: #f8fbff; - } + 0% { + stroke: #f8fbff; + } - 25% { - stroke: #ff0; - } + 25% { + stroke: #ff0; + } - 50% { - stroke: #f2f200; - } + 50% { + stroke: #f2f200; + } - 75% { - stroke: #d8d800; - } + 75% { + stroke: #d8d800; + } - 100% { - stroke: #bebe00; - } + 100% { + stroke: #bebe00; + } } /* COLORI */ .GRIGIO { - fill: #ACACAC; + fill: #ACACAC; } + .VERDE { - fill: #21CD39; + fill: #21CD39; } + .BLU { - fill: #0000FF; + fill: #0000FF; } + .ARANCIO { - fill: orange; + fill: orange; } + .GIALLO { - fill: yellow; + fill: yellow; } + .PURPLE { - fill: purple; + fill: purple; } + .ROSSO { - fill: red; + fill: red; } + .TESTO { - fill: white; + fill: white; } + .NERO { - fill: black; + fill: black; } .BORDOROSSO { - .strokeThick; - stroke-dasharray: 30; - stroke-linecap: round; - stroke: #FF0000; + .strokeThick; + stroke-dasharray: 30; + stroke-linecap: round; + stroke: #FF0000; } /* Classi da sostituire dinamicamente*/ #ItemsDepo { - .GRIGIO; + .GRIGIO; } + #ItemsSel { - .flashStroke; - .strokeThick; + .flashStroke; + .strokeThick; } + #ItemsBin { - .BLU; + .BLU; } + #ItemsCart { - .VERDE; + .VERDE; } + #ItemsSecOp { - .BORDOROSSO; + .BORDOROSSO; +} + +#ItemsScrap { + .ROSSO; } diff --git a/NKC_WF/Content/SheetColor.min.css b/NKC_WF/Content/SheetColor.min.css index 414f455..687cfc4 100644 --- a/NKC_WF/Content/SheetColor.min.css +++ b/NKC_WF/Content/SheetColor.min.css @@ -1 +1 @@ -.strokeThick{stroke-width:15px !important;}.flashStroke{stroke:yellow;-webkit-animation-name:doFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:doFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes doFlash{0%{stroke:#f8fbff;}25%{stroke:#ff0;}50%{stroke:#f2f200;}75%{stroke:#d8d800;}100%{stroke:#bebe00;}}.GRIGIO{fill:#acacac;}.VERDE{fill:#21cd39;}.BLU{fill:#00f;}.ARANCIO{fill:orange;}.GIALLO{fill:yellow;}.PURPLE{fill:purple;}.ROSSO{fill:red;}.TESTO{fill:white;}.NERO{fill:black;}.BORDOROSSO{stroke-width:15px !important;stroke-dasharray:30;stroke-linecap:round;stroke:#f00;}#ItemsDepo{fill:#acacac;}#ItemsSel{stroke:yellow;-webkit-animation-name:doFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:doFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;stroke-width:15px !important;}#ItemsBin{fill:#00f;}#ItemsCart{fill:#21cd39;}#ItemsSecOp{stroke-width:15px !important;stroke-dasharray:30;stroke-linecap:round;stroke:#f00;} \ No newline at end of file +.strokeThick{stroke-width:15px !important;}.flashStroke{stroke:yellow;-webkit-animation-name:doFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:doFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes doFlash{0%{stroke:#f8fbff;}25%{stroke:#ff0;}50%{stroke:#f2f200;}75%{stroke:#d8d800;}100%{stroke:#bebe00;}}.GRIGIO{fill:#acacac;}.VERDE{fill:#21cd39;}.BLU{fill:#00f;}.ARANCIO{fill:orange;}.GIALLO{fill:yellow;}.PURPLE{fill:purple;}.ROSSO{fill:red;}.TESTO{fill:white;}.NERO{fill:black;}.BORDOROSSO{stroke-width:15px !important;stroke-dasharray:30;stroke-linecap:round;stroke:#f00;}#ItemsDepo{fill:#acacac;}#ItemsSel{stroke:yellow;-webkit-animation-name:doFlash;-webkit-animation-duration:.8s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:doFlash;animation-duration:.8s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;stroke-width:15px !important;}#ItemsBin{fill:#00f;}#ItemsCart{fill:#21cd39;}#ItemsSecOp{stroke-width:15px !important;stroke-dasharray:30;stroke-linecap:round;stroke:#f00;}#ItemsScrap{fill:red;} \ No newline at end of file diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index e0d6297..f3c164f 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -453,6 +453,7 @@ + @@ -1114,6 +1115,13 @@ cmp_KS_currCart.ascx + + cmp_KS_currItm.ascx + ASPXCodeBehind + + + cmp_KS_currItm.ascx + cmp_KS_currOI.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_KS_Items.ascx b/NKC_WF/WebUserControls/cmp_KS_Items.ascx index 099e924..ccd5eef 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Items.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_Items.ascx @@ -1,20 +1,38 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_Items.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_Items" %> - - - +<%@ Register Src="~/WebUserControls/cmp_KS_currCart.ascx" TagPrefix="uc1" TagName="cmp_KS_currCart" %> +<%@ Register Src="~/WebUserControls/cmp_KS_currItm.ascx" TagPrefix="uc1" TagName="cmp_KS_currItm" %> + -
-
- <%: traduci("ItemNeedsSecOp") %> - <%: traduci("ItemNeedsPaint") %> + +
+
+
-
- <%: traduci("ConfirmItemKitOk") %> +
+
+
+ <%: traduci("ItemNeedsSecOp") %> +
+
+ <%: traduci("ItemNeedsPaint") %> +
+
+ <%: traduci("ConfirmItemKitOk") %> +
+
+ <%: traduci("CancelItemKitOk") %> +
+
+
+
+ <%: traduci("AddItem") %> +
+
-
- <%: traduci("CancelItemKitOk") %> +
+
diff --git a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs index 6eedb5a..7976b89 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.cs @@ -1,4 +1,6 @@ -using System; +using AppData; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -16,13 +18,11 @@ namespace NKC_WF.WebUserControls { get { - int answ = 0; - int.TryParse(hfCartID.Value, out answ); - return answ; + return cmp_KS_currCart.CurrId; } set { - hfCartID.Value = value.ToString(); + cmp_KS_currCart.CurrId = value; } } /// @@ -32,31 +32,43 @@ namespace NKC_WF.WebUserControls { get { - return hdCartDtmx.Value; + return cmp_KS_currCart.Dtmx; } set { - hdCartDtmx.Value = value; + cmp_KS_currCart.Dtmx = value; } } public int ItemID { get { - int answ = 0; - int.TryParse(hfItemID.Value, out answ); - return answ; + return cmp_KS_currItm.CurrId; } set { - hfItemID.Value = value.ToString(); + cmp_KS_currItm.CurrId = value; // se 0 --> annullo validità - if(value == 0) + if (value == 0) { ItemValid = false; } } } + /// + /// Matrix Bin selezionato + /// + public string ItemDtmx + { + get + { + return cmp_KS_currItm.Dtmx; + } + set + { + cmp_KS_currItm.Dtmx = value; + } + } protected bool ItemValid { get @@ -70,6 +82,27 @@ namespace NKC_WF.WebUserControls hfItemValid.Value = value.ToString(); } } + protected bool itemOk + { + get + { + return ItemID > 0; + } + } + protected bool cartOk + { + get + { + return CartID > 0; + } + } + protected bool showBtns + { + get + { + return itemOk && cartOk; + } + } public bool NeedSecOp { get @@ -98,7 +131,10 @@ namespace NKC_WF.WebUserControls } protected void Page_Load(object sender, EventArgs e) { - + if (!Page.IsPostBack) + { + doUpdate(); + } } /// /// Veriofico item sia valido... @@ -116,22 +152,56 @@ namespace NKC_WF.WebUserControls lblNeedSecOp.Visible = NeedSecOp; lblNeedPaint.Visible = NeedPaint; } - + private void fixVisibility() + { + // controllo visualizazione in base ai dati presenti + cmp_KS_currItm.Visible = itemOk; + cmp_KS_currCart.Visible = showBtns; + // se ho item e cart --> mostro buttons calcolati! + lbtAddItem.Visible = false; + if (showBtns && ItemValid) + { + // verifico SE item e cart corrispondono x mostrare button + var tabCarts = DataLayer.man.taCR.getByItemID(ItemID); + if (tabCarts != null) + { + if (tabCarts.Count == 1) + { + if (tabCarts[0].CartID == CartID) + { + lbtAddItem.Visible = true; + } + } + } + } + } public void doUpdate() { + fixVisibility(); // effettua controlli vari - checkItemValidated(); } protected void lbtConfItemValid_Click(object sender, EventArgs e) { ItemValid = true; + checkItemValidated(); } protected void lbtCancelItemValid_Click(object sender, EventArgs e) { ItemValid = false; + checkItemValidated(); + } + + protected void lbtAddItem_Click(object sender, EventArgs e) + { + DataLayer.man.taPLog.acquireItems(ItemID, CartID, currIpAddress(), user_std.UtSn.userNameAD); + // resetto + CartID = 0; + ItemID = 0; + // sollevo evento + raiseEvent(); } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.designer.cs index c5310d3..26bea5a 100644 --- a/NKC_WF/WebUserControls/cmp_KS_Items.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_KS_Items.ascx.designer.cs @@ -14,33 +14,6 @@ namespace NKC_WF.WebUserControls public partial class cmp_KS_Items { - /// - /// Controllo hfCartID. - /// - /// - /// 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 hfCartID; - - /// - /// Controllo hdCartDtmx. - /// - /// - /// 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 hdCartDtmx; - - /// - /// Controllo hfItemID. - /// - /// - /// 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 hfItemID; - /// /// Controllo hfNeedSecOp. /// @@ -68,6 +41,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfItemValid; + /// + /// Controllo cmp_KS_currItm. + /// + /// + /// 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_KS_currItm cmp_KS_currItm; + /// /// Controllo divItemValid. /// @@ -112,5 +94,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.LinkButton lbtCancelItemValid; + + /// + /// Controllo lbtAddItem. + /// + /// + /// 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.LinkButton lbtAddItem; + + /// + /// Controllo cmp_KS_currCart. + /// + /// + /// 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_KS_currCart cmp_KS_currCart; } } diff --git a/NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx b/NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx index 5ce0ce5..6df9b19 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx @@ -15,11 +15,12 @@
- Picked: + # <%: traduci("Picked") %> +
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx b/NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx index 91edfa9..1a58eaa 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx @@ -16,11 +16,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx b/NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx index dd92441..4dac19f 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx @@ -13,11 +13,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx index b9a519f..c9341f4 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx @@ -16,11 +16,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx index 1efd1b8..0385b6f 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx @@ -15,11 +15,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx b/NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx index f46f7e0..f6f1ea0 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx @@ -13,11 +13,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_currItm.ascx b/NKC_WF/WebUserControls/cmp_KS_currItm.ascx new file mode 100644 index 0000000..0fe45fa --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_KS_currItm.ascx @@ -0,0 +1,6 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_currItm.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_currItm" %> +
+
PARTS
+ + +
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_KS_currItm.ascx.cs b/NKC_WF/WebUserControls/cmp_KS_currItm.ascx.cs new file mode 100644 index 0000000..4e4b25c --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_KS_currItm.ascx.cs @@ -0,0 +1,42 @@ +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_KS_currItm : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + + public int CurrId + { + get + { + int answ = 0; + int.TryParse(hfValue.Value, out answ); + return answ; + } + set + { + hfValue.Value = value.ToString(); + } + } + public string Dtmx + { + get + { + return lblDtmx.Text; + } + set + { + lblDtmx.Text = value; + } + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_KS_currItm.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KS_currItm.ascx.designer.cs new file mode 100644 index 0000000..e652527 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_KS_currItm.ascx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// 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_KS_currItm + { + + /// + /// Controllo hfValue. + /// + /// + /// 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 hfValue; + + /// + /// Controllo lblDtmx. + /// + /// + /// 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.Label lblDtmx; + } +} diff --git a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx index 1c41ad0..014e858 100644 --- a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx +++ b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx @@ -16,14 +16,16 @@
- stack: + # <%: traduci("Stack") %> +
- sheet: + # <%: traduci("Sheet") %> +
diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx b/NKC_WF/WebUserControls/cmp_MU_bins.ascx index 34f24ea..af33047 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx @@ -11,7 +11,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx b/NKC_WF/WebUserControls/cmp_MU_carts.ascx index 32aa808..74fae2a 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx @@ -11,7 +11,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx index fe7f3d6..b0a65ed 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_svgViewer.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_svgViewer" %>
- +
@@ -9,36 +9,36 @@ diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs index 145d3e3..70faaaa 100644 --- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs @@ -15,8 +15,11 @@ namespace NKC_WF.WebUserControls { set { - hfBatchId.Value = value.ToString(); - doUpdate(); + if (hfBatchId.Value != value.ToString()) + { + hfBatchId.Value = value.ToString(); + //doUpdate(); + } } get { @@ -32,8 +35,11 @@ namespace NKC_WF.WebUserControls { set { - hfSheetId.Value = value.ToString(); - doUpdate(); + if (hfSheetId.Value != value.ToString()) + { + hfSheetId.Value = value.ToString(); + doUpdate(); + } } get { diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index d4a5bc9..d97befa 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -12,7 +12,7 @@
-

Call List

+

# <%: traduci("CallList") %>

# <%: traduci("FilterStatus") %> diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx index 981591e..03d83ac 100644 --- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx +++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx @@ -15,7 +15,7 @@
- Last Action
+ # <%: traduci("LastAction") %>
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx index 870c5e5..8134dbf 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx @@ -25,6 +25,7 @@ +
@@ -41,7 +42,6 @@
-
diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index e1d9dc4..3ce18a0 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -517,6 +517,19 @@ namespace NKC_WF.WebUserControls + } + /// + /// Imposta il codice Item sugli oggetti dipendenti + /// + /// + /// + private void setItem(string rawData, int codeInt) + { + itemIdSelected = codeInt; + cmp_KS_Items.ItemID = codeInt; + cmp_KS_Items.ItemDtmx = rawData; + cmp_KS_Items.doUpdate(); + fixVisibility(); } /// /// Imposta il codice OtherItem sugli oggetti dipendenti @@ -661,7 +674,7 @@ namespace NKC_WF.WebUserControls lblItemCode.Text = itemRow.ItemExtCode; lblItemDesc.Text = itemRow.ItemDesc; lblItemDtmx.Text = itemRow.ItemDtmx; - itemIdSelected = itemRow.ItemID; + setItem(itemRow.ItemDtmx, itemRow.ItemID); // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked... switch (itemRow.StatusID) { @@ -716,6 +729,7 @@ namespace NKC_WF.WebUserControls } } + private void resetIcons() { lblDestination.CssClass = "text-secondary"; diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs index 18eaf57..f6cfcd6 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.designer.cs @@ -104,6 +104,15 @@ namespace NKC_WF.WebUserControls /// protected global::NKC_WF.WebUserControls.cmp_KS_Cart cmp_KS_Cart; + /// + /// Controllo cmp_KS_Items. + /// + /// + /// 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_KS_Items cmp_KS_Items; + /// /// Controllo divItemDet. /// @@ -149,15 +158,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblItemDtmx; - /// - /// Controllo cmp_KS_Items. - /// - /// - /// 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_KS_Items cmp_KS_Items; - /// /// Controllo divError. /// diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx index 1c88ba5..6190021 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx @@ -24,8 +24,9 @@ MAKE CNC PROG
- PRINT LABELS - ITEM DONE + <%-- 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 9df63d6..45d5931 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs @@ -67,6 +67,7 @@ namespace NKC_WF.WebUserControls protected void lbtPrintLabels_Click(object sender, EventArgs e) { bool allOk = true; +#if false // chiamo procedura stampa report x etichette dei pezzi lavorati offline string printer = DataLayer.man.getPrinter("PC-MACHINE-OFFLINE"); // ciclo tra TUTTI gli item compresi in questo Offline Order @@ -75,7 +76,8 @@ namespace NKC_WF.WebUserControls { // lancio stampa allOk = allOk && DataLayer.man.stampaDoc(item.ItemID.ToString(), printer, tipoDocumento.docPart, Request.UserHostName); - } + } +#endif if (allOk) { // registro che ho stampato... 2! diff --git a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx index d2db403..8ad74c1 100644 --- a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx +++ b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx @@ -6,14 +6,14 @@
-

Offline Orders

+

# <%: traduci("OfflineOrders") %>

- No Data Available + # <%: traduci("NoDataAvaible") %> diff --git a/NKC_WF/WebUserControls/cmp_paint_bins.ascx b/NKC_WF/WebUserControls/cmp_paint_bins.ascx index 571a5fc..dd28ef9 100644 --- a/NKC_WF/WebUserControls/cmp_paint_bins.ascx +++ b/NKC_WF/WebUserControls/cmp_paint_bins.ascx @@ -16,7 +16,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_scrapList.ascx b/NKC_WF/WebUserControls/cmp_scrapList.ascx index 8221bf4..8d75674 100644 --- a/NKC_WF/WebUserControls/cmp_scrapList.ascx +++ b/NKC_WF/WebUserControls/cmp_scrapList.ascx @@ -4,7 +4,7 @@
-

Scrap List (Items to process)

+

#<%: traduci("ScrapList") %>

diff --git a/NKC_WF/WebUserControls/cmp_searchItems.ascx b/NKC_WF/WebUserControls/cmp_searchItems.ascx index 857bf82..c8f5f77 100644 --- a/NKC_WF/WebUserControls/cmp_searchItems.ascx +++ b/NKC_WF/WebUserControls/cmp_searchItems.ascx @@ -29,19 +29,19 @@
- Ord: + # <%: traduci("Order") %>
- Kit: + # <%: traduci("Kit") %>
- Cart: + # <%: traduci("Cart") %>
- Bin: + # <%: traduci("Bin") %>
diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx index 3263614..8139630 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx @@ -6,7 +6,7 @@
-

BUNK BUILDING

+

# <%: traduci("BunkBuilding") %>

@@ -29,4 +29,4 @@
-
+
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_stackList.ascx b/NKC_WF/WebUserControls/cmp_stackList.ascx index bda5b84..7d1aaec 100644 --- a/NKC_WF/WebUserControls/cmp_stackList.ascx +++ b/NKC_WF/WebUserControls/cmp_stackList.ascx @@ -4,7 +4,7 @@
- BUNK List + # <%: traduci("BunkList") %>
@@ -19,7 +19,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx b/NKC_WF/WebUserControls/cmp_stackLoading.ascx index 23e3d90..07b32b2 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx @@ -3,53 +3,53 @@ <%@ Register Src="~/WebUserControls/cmp_stackNextloading.ascx" TagPrefix="uc1" TagName="cmp_stackNextloading" %>
-
-
-
-

PROD simul

-
-
- ADVANCE prod -
-
-
-
- - - - <%: traduci("StackLoaded") %> - - -
-
- BATCH: - -
- TOT BUNK: - -
-
- <%: traduci("BatchCurrent") %> -
- TOT SHEETS: - -
-
- Due Date: - -
- TOT ITEMS: - -
+
+
+
+

# <%: traduci("ProdSimul") %>

+
+
+ ADVANCE prod +
- - - -
-
- -
-
- -
+
+
+ + + + <%: traduci("StackLoaded") %> + + +
+
+ # <%: traduci("Batch") %> + +
+ # <%: traduci("TotBunk") %> + +
+
+ <%: traduci("BatchCurrent") %> +
+ # <%: traduci("TotSheets") %> + +
+
+ # <%: traduci("DueDate") %> + +
+ # <%: traduci("TotItems") %> + +
+
+ + + +
+
+ +
+
+ +
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx index 6c43c1d..9d858c5 100644 --- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx @@ -6,10 +6,10 @@
- NO CURRENT BUNK + # <%: traduci("NoCurrentBunk") %>
- ...waiting + # <%: traduci("Waiting") %>
@@ -18,40 +18,40 @@
- PREVIOUS BUNK: + # <%: traduci("Previous") %> # <%: traduci("Bunk") %> ()
- CURRENT BUNK: + # <%: traduci("Current") %># <%: traduci("Bunk") %> ()
- sheets: + # <%: traduci("Sheets") %>
- printed: + # <%: traduci("Printed") %>
- worked: + # <%: traduci("Worked") %>
- To Redo: + # <%: traduci("ToRedo") %>
- Items: + # <%: traduci("Items") %>
- Items: + # <%: traduci("Items") %>
@@ -68,17 +68,17 @@
- NEXT BUNK: + # <%: traduci("Next") %> # <%: traduci("Bunk") %> ()
- sheets: | printed: + # <%: traduci("Sheets") %> | printed: | worked:
- Items: + # <%: traduci("Items") %>
@@ -86,10 +86,10 @@
- NO NEXT BUNK + # <%: traduci("NoNextBunk") %>
- BATCH complete + # <%: traduci("BatchComplete") %>
@@ -99,8 +99,7 @@ - - +
<%: traduci("CollectRedoOnEnd") %> diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx b/NKC_WF/WebUserControls/cmp_taktList.ascx index 86c28f0..cd747fa 100644 --- a/NKC_WF/WebUserControls/cmp_taktList.ascx +++ b/NKC_WF/WebUserControls/cmp_taktList.ascx @@ -5,7 +5,7 @@
- BATCH List + # <%: traduci("BatchList") %>
@@ -20,7 +20,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx b/NKC_WF/WebUserControls/cmp_validationSummary.ascx index 605f330..91acab9 100644 --- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx +++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_validationSummary.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_validationSummary" %>
-

Validation Summary

+

# <%: traduci("ValidationSummary") %>

FORCE REVALIDATE diff --git a/NKC_WF/WebUserControls/tpl_WIP.ascx b/NKC_WF/WebUserControls/tpl_WIP.ascx index f11d17a..1ab200c 100644 --- a/NKC_WF/WebUserControls/tpl_WIP.ascx +++ b/NKC_WF/WebUserControls/tpl_WIP.ascx @@ -2,7 +2,7 @@
-

Work In Progress

+

# <%: traduci("WorkInProgress") %>

diff --git a/NKC_WF/site/MachineOffline.aspx b/NKC_WF/site/MachineOffline.aspx index e04e0c8..921c3ec 100644 --- a/NKC_WF/site/MachineOffline.aspx +++ b/NKC_WF/site/MachineOffline.aspx @@ -6,7 +6,7 @@ - +
diff --git a/NKC_WF/site/MachineUnload.aspx b/NKC_WF/site/MachineUnload.aspx index 907077e..2fc76c2 100644 --- a/NKC_WF/site/MachineUnload.aspx +++ b/NKC_WF/site/MachineUnload.aspx @@ -8,48 +8,47 @@ - - - - - -
-
-

<%: traduci("MachineUnload") %> (<%: hfBatchID.Value %>)

-
- +
+
+

<%: traduci("MachineUnload") %> (<%: hfBatchID.Value %>)

+
+ + + + + + + + +
+
+ - - + + + +
+
+ + + + + +
+
+ + + -
-
- - - - - -
-
- - - - - -
-
- - - - - -
-
-
+ <%-- + + + + --%>
- - +
+
diff --git a/NKC_WF/site/MachineUnload.aspx.cs b/NKC_WF/site/MachineUnload.aspx.cs index 2b09799..1b959cd 100644 --- a/NKC_WF/site/MachineUnload.aspx.cs +++ b/NKC_WF/site/MachineUnload.aspx.cs @@ -1,4 +1,5 @@ using AppData; +using SteamWare; using System; namespace NKC_WF @@ -13,6 +14,7 @@ namespace NKC_WF doUpdate(); } } + /// /// BatchId corrente... /// @@ -51,46 +53,99 @@ namespace NKC_WF private void doUpdate() { // imposto dati correnti - setCurrData(); - // aggiorno child - cmp_MU_stats.BatchId = BatchId; - cmp_MU_bins.BatchId = BatchId; - cmp_MU_carts.BatchId = BatchId; - cmp_MU_svgViewer.BatchId = BatchId; - cmp_MU_svgViewer.SheetId = SheetId; + bool doUpdate = setCurrData(); + if (doUpdate) + { + // aggiorno child + cmp_MU_stats.BatchId = BatchId; + cmp_MU_bins.BatchId = BatchId; + cmp_MU_carts.BatchId = BatchId; + cmp_MU_svgViewer.BatchId = BatchId; + cmp_MU_svgViewer.SheetId = SheetId; + } } /// - /// Imposta dati correnti (Bunk / Sheet) + /// Imposta dati correnti (Bunk / Sheet) indicando SE fare update /// - private void setCurrData() + private bool setCurrData() { + bool needUpdate = false; // recupero bunk corrente... DS_App.StackListRow currBunk = ComLib.getCurrBunk(); if (currBunk != null) { - BatchId = currBunk.BatchID; + if (BatchId != currBunk.BatchID) + { + BatchId = currBunk.BatchID; + needUpdate = true; + } + DS_App.SheetListRow currSheet = ComLib.getCurrSheet(BatchId); if (currSheet != null) { - SheetId = currSheet.SheetID; + if (SheetId != currSheet.SheetID) + { + SheetId = currSheet.SheetID; + needUpdate = true; + } } } else { BatchId = 0; } - } - - protected void timerStats_Tick(object sender, EventArgs e) - { - cmp_MU_stats.doUpdate(); - cmp_MU_bins.doUpdate(); - cmp_MU_carts.doUpdate(); + return needUpdate; } protected void timerSvg_Tick(object sender, EventArgs e) { + // in base al num di sec dell'ora decido cosa aggiornare... + int counter = numWaitSvg; doUpdate(); + // ogni x cicli + if (counter % 10 == 0) + { + cmp_MU_stats.doUpdate(); + upnlStats.DataBind(); + } + if (counter % 2 == 0) + { + cmp_MU_carts.doUpdate(); + upnlCarts.DataBind(); + cmp_MU_bins.doUpdate(); + upnlCarts.DataBind(); + } + incrNumWait(); + } + /// + /// stringa x contatore refresh redis... + /// + protected string redProdReq + { + get + { + return $"NKC:SERV:MACH_UNLOAD:COUNT:{Session.SessionID}"; + } + } + + protected int numWaitSvg + { + get + { + return memLayer.ML.getRCnt(redProdReq); + } + } + /// + /// Incrementa counter redis + /// + protected void incrNumWait() + { + if (numWaitSvg > 30) + { + memLayer.ML.resetRCnt(redProdReq); + Response.Redirect(Request.RawUrl); + } + memLayer.ML.setRCntI(redProdReq); } } } \ 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 52e51c4..dbdbd7b 100644 --- a/NKC_WF/site/MachineUnload.aspx.designer.cs +++ b/NKC_WF/site/MachineUnload.aspx.designer.cs @@ -15,13 +15,22 @@ namespace NKC_WF { /// - /// Controllo UpdatePanel2. + /// Controllo upnlStats. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.UpdatePanel UpdatePanel2; + protected global::System.Web.UI.UpdatePanel upnlStats; + + /// + /// Controllo timerSvg. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer timerSvg; /// /// Controllo hfBatchID. @@ -41,24 +50,6 @@ namespace NKC_WF /// protected global::System.Web.UI.WebControls.HiddenField hfSheetID; - /// - /// Controllo timerSvg. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.Timer timerSvg; - - /// - /// Controllo upnlStats. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.UpdatePanel upnlStats; - /// /// Controllo cmp_MU_stats. /// @@ -68,15 +59,6 @@ namespace NKC_WF /// protected global::NKC_WF.WebUserControls.cmp_MU_stats cmp_MU_stats; - /// - /// Controllo timerStats. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.Timer timerStats; - /// /// Controllo upnlBins. /// @@ -130,14 +112,5 @@ namespace NKC_WF /// 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; } }