diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index aab62ce8a..675e02c97 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.25.1422.0")] -[assembly: AssemblyFileVersion("2.25.1422.0")] +[assembly: AssemblyVersion("2.25.1428.0")] +[assembly: AssemblyFileVersion("2.25.1428.0")] diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs index d26fc860e..26271ad78 100644 --- a/ResultsBrowser/ResultsBrowserWnd.cs +++ b/ResultsBrowser/ResultsBrowserWnd.cs @@ -554,10 +554,10 @@ namespace ResultsBrowser try { bool queryOrders = true; /// true = query orders, false = query PCB numbers - //string[] queryStrings = new string[] { "3137303", "3137301", "3142304", "3137302", "3137300" }; /// 14.2.2020 queryOrders=true + //string[] queryStrings = new string[] { "3137300", "3137301", "3137302", "3137303" }; /// 14.2.2020 queryOrders=true 2500 meters //string[] queryStrings = new string[] { "505494150362", "505494151325", "505494150008", "505494150955", "505494152128" }; /// 18.2.2020 queryOrders=false - string[] queryStrings = new string[] { "3129109", "3129111", "3129113", "3129108", "3129110", "3129112", "3129114", "3129115", "3129107" }; /// 24.2.2020 queryOrders=true - //string[] queryStrings = new string[] { "332492620382" }; + string[] queryStrings = new string[] { "3129109", "3129111", "3129113", "3129108", "3129110", "3129112", "3129114", "3129115", "3129107" }; /// 24.2.2020 queryOrders=true + //string[] queryStrings = new string[] { "332491531667", "332491751060", "332491640866" }; IList oraDatas = new List(); /// List of water meters IList testBenches = new List(); /// List of test benches used to produce water meters @@ -628,13 +628,13 @@ namespace ResultsBrowser /// /// Read from VT_ZAEHLER_PINDEX_PD: TestId(ID_WZPRUEFREIHE)) /// - OracleCommand cmd = new OracleCommand("select ID_PRUEFSTAND, ID_WZPRUEFREIHE, WT_PLATZ_NR, HYDR_PRUEFUNG from VT_ZAEHLER_PINDEX_PD where VT_FERNUM = :1 AND ANBID = 4 AND WZGUT = 1", oracleConnection); + OracleCommand cmd = new OracleCommand("select ID_WZPRUEFREIHE, WT_PLATZ_NR, HYDR_PRUEFUNG from VT_ZAEHLER_PINDEX_PD where VT_FERNUM = :1 AND PRUEFINDEX = :2 AND ANBID = 4 AND WZGUT = 1", oracleConnection); cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Varchar2, Value = oraD.PcbNr }); + cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Int32, Value = oraD.MaxPruefIx + 100 * oraD.TestBenchId }); OracleDataReader dr = cmd.ExecuteReader(); while (dr.Read()) { int i = 0; - int testBenchId = dr.GetInt32(i++) % 100; oraD.BatchNr = dr.GetInt32(i++); oraD.WMPosition = dr.GetInt32(i++); oraD.HydrPruefung = dr.GetInt32(i++); @@ -651,8 +651,8 @@ namespace ResultsBrowser while (dr.Read()) { int i = 0; - int prfix = (dr.GetInt32(i++) % 100); - if (prfix == oraD.MaxPruefIx) + int pruefindex = (dr.GetInt32(i++) % 100); + if (pruefindex == oraD.MaxPruefIx) { oraD.Q2CorrectionDone = (dr.GetInt32(i++) != 0); oraD.Q2ErrBeforeCorrection = dr.GetDouble(i++); @@ -795,9 +795,11 @@ namespace ResultsBrowser Console.WriteLine("CSV data begin"); Console.WriteLine(string.Format("PO; prefix; S/N; PcbNr; Bench; Batch; Start; Start; End; End; Pos; AdjA0; AdjA4; Q3RL; Q3LR; CalF; CAlF_LNA; HP; Q2cRL; Q2cLR")); + //Console.WriteLine(string.Format("s/n;PCB nr.;bench;batch;position;Err. at 640 l/h;Err. LNA at 640 l/h;Err. Q3 RL;Err. Q3 LR;Cal.f.;Cal.f.LNA;Q2 corr.f. RL;Q2 corr.f. LR")); foreach (var oraD in oraDatas) { - Console.WriteLine(string.Format("{0}; {1}; {2}; =(\"{3}\"); {4}; {5}; {7}; {8}; {9}; {10}; {11}; {12}; {13}; {14}; {15}; {16}; {17}; {18}; {19}; {20}", + Console.WriteLine(string.Format("{0}; {1}; {2}; =(\"{3}\"); {4}; {5}; {7}; {8}; {9}; {10};{11};{12};{13};{14};{15};{16};{17};{18};{19};{20}", + //Console.WriteLine(string.Format("{2};=(\"{3}\"); {4};{5};{11};{12};{13};{14};{15};{16};{17};{19};{20}", /* 0 */ oraD.PO, /* 1 */ oraD.Prefix, /* 2 */ oraD.SN,