From ff3de5559304d2f8b0e3a54bb9c7572c5e9c5c2a Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 31 Aug 2020 09:25:43 +0200 Subject: [PATCH] TracingDB/Enums.cs updated, Output/DB/ProductionTracing/Enums.cs removed --- .../Output/DB/ProductionTracing/Enums.cs | 48 ------------------- .../Output/DB/ProductionTracing/WMPart.cs | 9 ++-- TBF/TBF.csproj | 1 - TracingDB/Enums.cs | 45 +++++++++++++---- 4 files changed, 42 insertions(+), 61 deletions(-) delete mode 100644 TBF/BenchControl/Output/DB/ProductionTracing/Enums.cs diff --git a/TBF/BenchControl/Output/DB/ProductionTracing/Enums.cs b/TBF/BenchControl/Output/DB/ProductionTracing/Enums.cs deleted file mode 100644 index 734680e27..000000000 --- a/TBF/BenchControl/Output/DB/ProductionTracing/Enums.cs +++ /dev/null @@ -1,48 +0,0 @@ -/// -/// Copyright (c) 2018 Sensus Slovensko a.s. -/// -using System; - -namespace TBF.BenchControl.Output.DB.ProductionTracing -{ - public enum CodeType - { - UniqueNr, - FlowtubeNr, /// Prvé 3 znaky sa zhodujú s poslednými 3 znakmi názvu - FlowtubeNrLU, /// Začiatok kódu sa zhoduje s názvom - BatchNr, - BatchNrContainingPartName, - DateMMYY, - QualityCheck, - } - - public enum CodeForm - { - Barcode, - QRCode, - Keyboard, - OkNok, - } - - public enum CodeLocation - { - OnPart, - OnPallet, - } - - public enum LifetimeManagement - { - None, - OneYear, - Count, - } - - public enum ReleaseStatus - { - In_preparation, - Released, - ReleasedActive, - Deactivated, - Count, - } -} diff --git a/TBF/BenchControl/Output/DB/ProductionTracing/WMPart.cs b/TBF/BenchControl/Output/DB/ProductionTracing/WMPart.cs index cffa9b1de..d209755fc 100644 --- a/TBF/BenchControl/Output/DB/ProductionTracing/WMPart.cs +++ b/TBF/BenchControl/Output/DB/ProductionTracing/WMPart.cs @@ -1,9 +1,10 @@ /// -/// Copyright (c) 2018 Sensus Slovensko a.s. +/// Copyright (c) 2018-2020 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using MySql.Data.MySqlClient; +using TracingDB; namespace TBF.BenchControl.Output.DB.ProductionTracing { @@ -15,9 +16,9 @@ namespace TBF.BenchControl.Output.DB.ProductionTracing public string Description; public string Code; public DateTime TimeStamp; - public CodeType CodeType; - public CodeForm CodeForm; - public CodeLocation CodeLocation; + public TracingDB.CodeType CodeType; + public TracingDB.CodeForm CodeForm; + public TracingDB.CodeLocation CodeLocation; public string UserName; public string Workplace; diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index a2c7edb0a..473db90f2 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -884,7 +884,6 @@ - diff --git a/TracingDB/Enums.cs b/TracingDB/Enums.cs index 25e564c0b..0ae90ce50 100644 --- a/TracingDB/Enums.cs +++ b/TracingDB/Enums.cs @@ -1,4 +1,7 @@ -using System; +/// +/// Copyright (c) 2018-2020 Sensus Slovensko a.s. +/// +using System; using System.Reflection; @@ -58,7 +61,15 @@ namespace TracingDB [Description("4")] QualityCheck, - + + [Description("Obj.")] + PO, /// Purchase order from Oracle table VT_AUFTRAG_PD + + [Description("Silicon")] + Silicon, /// 1. change requires special password + /// 2. do not clear + /// 3. save locally + /// 4. carry over to other workflows Count } @@ -73,8 +84,8 @@ namespace TracingDB public enum CodeLocation { - OnPart, - OnPallet, + OnPallet, + OnPart, Count } @@ -110,8 +121,8 @@ namespace TracingDB { In_preparation, /// Process definition is not completed, cannot be used in production ToBeApproved, /// Process is completed, protected against changes and waits for an approval - Released, /// Process is ready for production (completed, protected, approved), but it is inactive ReleasedActive, /// Process is ready for production, it is active = enabled + Released, /// Process is ready for production (completed, protected, approved), but it is inactive Deactivated, /// Process was used in production but it was de-activated (should never be deleted as there are references to the process) Separator, /// 'Process' is only a named separator between other process items Count, @@ -119,9 +130,12 @@ namespace TracingDB public enum Mode { - Debug, // Debug mode - no Oracle database used - Test, // Test database used - Production, // Production database used + Production, /// Stara Tura production DB is used + Test, /// Stara Tura test DB is used + ProductionLU, /// Ludwigshafen production DB is used + TestLU, /// Ludwigshafen test DB is used + NoWritesToDB, /// Stara Tura production DB - no writes to the database + Debug, /// Debug mode - no database used at all Count, } @@ -162,6 +176,7 @@ namespace TracingDB TestBenchId, Process, + Result, } public enum ItemSpecCaps @@ -171,4 +186,18 @@ namespace TracingDB AssociatedRecord = 2, OracleQuery = 4, } + + public enum VerifState + { + Undefined = 0, /// Undefined (only used in OnActivity(..) when start/stop info message is issued) + SNisMissing, /// S/N is missing in the parsed record + SNisInvalid, /// S/N in the parsed record is invalid + NoRecordAtAll, /// No record with this S/N in tracing DB + VerificationIsDisabled, /// ... + NoVerificationForThisProcess, + VerificationPassed, /// Verification of a previous record passed + VerificationFailed, /// Verification of a previous record failed, no matching record found + TracingDBReadOrWriteFailed, + PrintingFailed, + } } \ No newline at end of file