michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SharedDatabase.Entities.Part.OraDBType removed, CodeType/CodeForm descriptions updated.

Browse Source
This commit is contained in:
Milan Hanajik
2023-05-25 14:54:28 +02:00
parent 130b59fc91
commit bebb83f6fc
14 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SharedDatabase/Entities/Part.cs
-3
View File
@@ -7,7 +7,6 @@ namespace SharedDatabase.Entities
{ {
public virtual int Id { get; protected set; } public virtual int Id { get; protected set; }
public virtual string Name { get; set; } public virtual string Name { get; set; }
public virtual string OraDBType { get; set; }
public virtual string Description { get; set; } public virtual string Description { get; set; }
public virtual sbyte CodeType { get; set; } public virtual sbyte CodeType { get; set; }
public virtual sbyte CodeForm { get; set; } public virtual sbyte CodeForm { get; set; }
@@ -29,7 +28,6 @@ namespace SharedDatabase.Entities
Part rslt = new Part(); Part rslt = new Part();
rslt.Name = Name; rslt.Name = Name;
rslt.OraDBType = OraDBType;
rslt.Description = Description; rslt.Description = Description;
rslt.CodeType = CodeType; rslt.CodeType = CodeType;
rslt.CodeForm = CodeForm; rslt.CodeForm = CodeForm;
@@ -69,7 +67,6 @@ namespace SharedDatabase.Entities
public Part(string name, Process workflow, CodeType codeType, CodeForm codeForm, CodeLocation codeLocation) public Part(string name, Process workflow, CodeType codeType, CodeForm codeForm, CodeLocation codeLocation)
{ {
Name = name; Name = name;
OraDBType = string.Empty;
Description = string.Empty; Description = string.Empty;
CodeType = (sbyte)codeType; CodeType = (sbyte)codeType;
CodeForm = (sbyte)codeForm; CodeForm = (sbyte)codeForm;
SharedDatabase/Enums.cs
+20 -20
View File
@@ -15,15 +15,15 @@ namespace SharedDatabase
public enum CodeType public enum CodeType
{ {
[Description("")] UniqueNr = 0, [Description("No check")] UniqueNr = 0,
[Description("Sap6-8")] FlowtubeNr = 1, /// prvé 3 znaky sa zhodujú s poslednými 3 znakmi názvu [Description("8-chars, first 3 ch = last 3 ch of SAP nr")] FlowtubeNr = 1, /// prvé 3 znaky sa zhodujú s poslednými 3 znakmi názvu
[Description("FT-20")] FlowtubeNrLU = 2, /// začiatok kódu sa zhoduje s názvom [Description("20-chars, first 8 ch = SAP nr")] FlowtubeNrLU = 2, /// začiatok kódu sa zhoduje s názvom
[Description("1")] BatchNr = 3, [Description("Batch number")] BatchNr = 3,
[Description("2")] BatchNrContainingPartName = 4, [Description("Batch number containing part SAP nr")] BatchNrContainingPartName = 4,
[Description("3")] DateMMYY = 5, [Description("Month in form MMYY, 4 digits")] DateMMYY = 5,
[Description("4")] QualityCheck = 6, [Description("Quality check")] QualityCheck = 6,
[Description("Obj.")] PO = 7, /// Purchase order from Oracle table VT_AUFTRAG_PD [Description("Valid purchase order from a DB")] PO = 7, /// Purchase order from OrderInfo table of MySQL DB or from VT_AUFTRAG_PD table of Oracle DB
[Description("Silicon")] Silicon = 8, [Description("Silicon")] Silicon = 8,
/// 1. change requires special password /// 1. change requires special password
/// 2. do not clear /// 2. do not clear
/// 3. save locally /// 3. save locally
@@ -33,17 +33,17 @@ namespace SharedDatabase
public enum CodeForm public enum CodeForm
{ {
Barcode = 0, /// Barcode [Description("Barcode scanner")] Barcode = 0, /// Barcode
QRCode = 1, /// QR code [Description("QR code scanner")] QRCode = 1, /// QR code
Keyboard = 2, /// Data entered by a keyboard [Description("Keyboard")] Keyboard = 2, /// Data entered by a keyboard
OkNok = 3, /// OK/NOK or Yes/No data entered by a keyboard or a mouse [Description("OK/NOK manual entry")] OkNok = 3, /// OK/NOK or Yes/No data entered by a keyboard or a mouse
SerialNr = 4, /// Complete serial number of iPERL (follows PcbNumber which is a reference part) [Description("Complete S/N from DB")] SerialNr = 4, /// Complete serial number of iPERL (follows PcbNumber which is a reference part)
Camera = 5, [Description("Camera")] Camera = 5,
Scale = 6, [Description("Scale (mass)")] Scale = 6,
SNGenerator = 7, [Description("S/N generator/printer")] SNGenerator = 7,
DataStream = 8, [Description("S640 datastream")] DataStream = 8,
Spare2 = 9, [Description("(spare 2)")] Spare2 = 9,
Spare3 = 10, [Description("(spare 3)")] Spare3 = 10,
Count Count
} }
SharedDatabase/Mappings/PartMap.cs
-1
View File
@@ -8,7 +8,6 @@ namespace SharedDatabase.Mappings
{ {
Id(x => x.Id); Id(x => x.Id);
Map(x => x.Name); Map(x => x.Name);
Map(x => x.OraDBType);
Map(x => x.Description); Map(x => x.Description);
Map(x => x.CodeType); Map(x => x.CodeType);
Map(x => x.CodeForm); Map(x => x.CodeForm);
TBF/Rig/DataEntry/S620/CheckItems/Barcode.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace TBF.Rig.DataEntry.S620.CheckItems
{ {
public override string ToString() public override string ToString()
{ {
return string.Format(": {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("Barcode: {0} {1}", IxPolozky, Part.Name);
} }
FormForMechanicalMetersWithTracing parent; FormForMechanicalMetersWithTracing parent;
TBF/Rig/DataEntry/S620/CheckItems/Keyboard.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace TBF.Rig.DataEntry.S620.CheckItems
{ {
public override string ToString() public override string ToString()
{ {
return string.Format("Kbd: {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("Kbd: {0} {1}", IxPolozky, Part.Name);
} }
FormForMechanicalMetersWithTracing parent; FormForMechanicalMetersWithTracing parent;
TBF/Rig/DataEntry/S620/CheckItems/OkNok.cs
+1 -1
View File
@@ -13,7 +13,7 @@ namespace TBF.Rig.DataEntry.S620.CheckItems
{ {
public override string ToString() public override string ToString()
{ {
return string.Format("Ok/Nok: {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("Ok/Nok: {0} {1}", IxPolozky, Part.Name);
} }
FormForMechanicalMetersWithTracing parent; FormForMechanicalMetersWithTracing parent;
Workplace/CheckItems/Barcode.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace Workplace.CheckItems
{ {
public override string ToString() public override string ToString()
{ {
return string.Format(": {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("Barcode: {0} {1}", IxPolozky, Part.Name);
} }
WorkplaceDlg parent; WorkplaceDlg parent;
Workplace/CheckItems/BarcodeAndOraDBQuery.cs
+1 -1
View File
@@ -19,7 +19,7 @@ namespace Workplace.CheckItems
{ {
public override string ToString() public override string ToString()
{ {
return string.Format(": {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("Barcode+DBquery: {0} {1}", IxPolozky, Part.Name);
} }
WorkplaceDlg parent; WorkplaceDlg parent;
Workplace/CheckItems/Keyboard.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace Workplace.CheckItems
{ {
public override string ToString() public override string ToString()
{ {
return string.Format("Kbd: {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("Kbd: {0} {1}", IxPolozky, Part.Name);
} }
WorkplaceDlg parent; WorkplaceDlg parent;
Workplace/CheckItems/OkNok.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace Workplace.CheckItems
{ {
public override string ToString() public override string ToString()
{ {
return string.Format("Ok/Nok: {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("Ok/Nok: {0} {1}", IxPolozky, Part.Name);
} }
WorkplaceDlg parent; WorkplaceDlg parent;
Workplace/CheckItems/S640Stream.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Workplace.CheckItems
public override string ToString() public override string ToString()
{ {
return string.Format("S640Stream: {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("S640Stream: {0} {1}", IxPolozky, Part.Name);
} }
/// ///
Workplace/CheckItems/SNGeneratorPrinter.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Workplace.CheckItems
public override string ToString() public override string ToString()
{ {
return string.Format("SNGeneratorPrinter: {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("S/N-generator: {0} {1}", IxPolozky, Part.Name);
} }
WorkplaceDlg parent; WorkplaceDlg parent;
Workplace/CheckItems/Scale.cs
+1 -1
View File
@@ -22,7 +22,7 @@ namespace Workplace.CheckItems
public override string ToString() public override string ToString()
{ {
return string.Format("Scale: {0} {1}({2})", IxPolozky, Part.Name, string.IsNullOrEmpty(Part.OraDBType) ? string.Empty : Part.OraDBType); return string.Format("Scale: {0} {1}", IxPolozky, Part.Name);
} }
public string ClassName { get { return "Scale"; } } public string ClassName { get { return "Scale"; } }
Workplace/WorkplaceDlg.cs
+2 -4
View File
@@ -1349,15 +1349,13 @@ namespace Workplace
} }
else else
{ {
records.Add(new Record(refRecord, stepRecord, komponenty[i].Part.Name, komponenty[i].ScannedCode, records.Add(new Record(refRecord, stepRecord, komponenty[i].Part.Name, komponenty[i].ScannedCode, result));
result, komponenty[i].Part.OraDBType));
} }
} }
for (int i = 0; i < palety.Count; i++) for (int i = 0; i < palety.Count; i++)
{ {
records.Add(new Record(refRecord, stepRecord, palety[i].Part.Name, palety[i].ScannedCode, records.Add(new Record(refRecord, stepRecord, palety[i].Part.Name, palety[i].ScannedCode, result));
result, komponenty[i].Part.OraDBType));
} }
return stepRecord; return stepRecord;