添加不良字段

PLCDataReader/CustomerControl/AutoDataGridControl/AutoDataGridControl.cs

@@ -2,6 +2,7 @@
 using System.Data;
 using DevExpress.XtraGrid;
 using UAS_PLCDataReader.DataOperate;
+using UAS_PLCDataReader.Entity;
 
 namespace UAS_PLCDataReader.CustomerControl.AutoDataGridControl
 {
@@ -18,7 +19,7 @@ namespace UAS_PLCDataReader.CustomerControl.AutoDataGridControl
 
         public event OnDataRefresh DataRefresh;
 
-        DataHelper dh = new DataHelper();
+        DataHelper dh = SystemInf.dh;
         //获取数据的SQL
         public string GetDataSQL
         {

PLCDataReader/DataOperate/DataHelper.cs

@@ -62,20 +62,7 @@ namespace UAS_PLCDataReader.DataOperate
             command = new OracleCommand(sql, connection);
             OracleDataAdapter ad = new OracleDataAdapter();
             ad.SelectCommand = command;
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception e)
-            {
-                LogManager.DoLog(e.StackTrace + e.Message);
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
+            ad.Fill(dt);
             ad.Dispose();
             command.Dispose();
             if (dt.Rows.Count > 0)
@@ -133,19 +120,7 @@ namespace UAS_PLCDataReader.DataOperate
             sql += " from " + TableName + " where " + Condition + " and rownum=1";
             command = new OracleCommand(sql, connection);
             OracleDataAdapter ad = new OracleDataAdapter(command);
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
+            ad.Fill(dt);
             ad.Dispose();
             command.Dispose();
             return dt;
@@ -225,14 +200,9 @@ namespace UAS_PLCDataReader.DataOperate
             {
                 ad.Fill(dt);
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
+                LogManager.DoLog(ex.StackTrace + sql);
             }
             ad.Dispose();
             command.Dispose();
@@ -512,12 +482,6 @@ namespace UAS_PLCDataReader.DataOperate
                     catch (Exception e)
                     {
                         LogManager.DoLog(e.StackTrace + e.Message + SQL);
-                        connection = new OracleConnection(DBConnectionString);
-                        connection.Open();
-                        command = new OracleCommand(SQL, connection);
-                        ad = new OracleDataAdapter();
-                        ad.SelectCommand = command;
-                        ad.Fill((DataTable)result);
                     }
                     break;
                 case "DELETE":
@@ -528,9 +492,6 @@ namespace UAS_PLCDataReader.DataOperate
                     catch (Exception e)
                     {
                         LogManager.DoLog(e.StackTrace + e.Message + SQL);
-                        command.Connection = new OracleConnection(DBConnectionString);
-                        command.Connection.Open();
-                        result = command.ExecuteNonQuery();
                     }
                     break;
                 case "UPDATE":
@@ -541,9 +502,6 @@ namespace UAS_PLCDataReader.DataOperate
                     catch (Exception e)
                     {
                         LogManager.DoLog(e.StackTrace + e.Message + SQL);
-                        command.Connection = new OracleConnection(DBConnectionString);
-                        command.Connection.Open();
-                        result = command.ExecuteNonQuery();
                     }
                     break;
                 case "INSERT":
@@ -554,9 +512,6 @@ namespace UAS_PLCDataReader.DataOperate
                     catch (Exception e)
                     {
                         LogManager.DoLog(e.StackTrace + e.Message + SQL);
-                        command.Connection = new OracleConnection(DBConnectionString);
-                        command.Connection.Open();
-                        result = command.ExecuteNonQuery();
                     }
                     break;
             }
@@ -795,16 +750,7 @@ namespace UAS_PLCDataReader.DataOperate
                     command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
                 }
             }
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (Exception)
-            {
-                command.Connection = new OracleConnection(DBConnectionString);
-                command.Connection.Open();
-                command.ExecuteNonQuery();
-            }
+            command.ExecuteNonQuery();
             command.Dispose();
         }
 
@@ -818,16 +764,7 @@ namespace UAS_PLCDataReader.DataOperate
             {
                 command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, param1[i], ParameterDirection.Input));
             }
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (Exception)
-            {
-                command.Connection = new OracleConnection(DBConnectionString);
-                command.Connection.Open();
-                command.ExecuteNonQuery();
-            }
+            command.ExecuteNonQuery();
             command.Dispose();
         }
 
@@ -862,16 +799,7 @@ namespace UAS_PLCDataReader.DataOperate
         {
             string sql = "update " + TableName + " set " + update + " where " + condition;
             command = new OracleCommand(sql, connection);
-            try
-            {
-                command.ExecuteNonQuery();
-            }
-            catch (Exception)
-            {
-                command.Connection = new OracleConnection(DBConnectionString);
-                command.Connection.Open();
-                command.ExecuteNonQuery();
-            }
+            command.ExecuteNonQuery();
             command.Dispose();
             return sql;
         }
@@ -993,19 +921,7 @@ namespace UAS_PLCDataReader.DataOperate
             command = new OracleCommand(sql, connection);
             OracleDataAdapter ad = new OracleDataAdapter();
             ad.SelectCommand = command;
-            try
-            {
-                ad.Fill(dt);
-            }
-            catch (Exception)
-            {
-                connection = new OracleConnection(DBConnectionString);
-                connection.Open();
-                command = new OracleCommand(sql, connection);
-                ad = new OracleDataAdapter();
-                ad.SelectCommand = command;
-                ad.Fill(dt);
-            }
+            ad.Fill(dt);
             if (dt.Rows.Count > 0)
             {
                 ad.Dispose();

PLCDataReader/Device/Information/DeviceStatusInfo.cs

@@ -43,11 +43,11 @@ namespace UAS_PLCDataReader.Device.Infomation
             }
             //查询设备参数信息
             sql.Clear();
-            sql.Append("select dr_updatedate,case when dc_type='INQTY' then '投入' when dc_type='OUTQTY' then '产出'");
+            sql.Append("select dr_updatedate,case when dc_type='INQTY' then '投入' when dc_type='OUTQTY' then '产出' when dc_type='NGQTY' then '不良'");
             sql.Append("when dc_type='PARAM1' then de_item1 when dc_type='PARAM2' then de_item2 when dc_type='PARAM3' then de_item3 ");
             sql.Append("when dc_type='PARAM4' then de_item4 when dc_type='PARAM5' then de_item5 when dc_type='PARAM6' then de_item6 ");
             sql.Append("when dc_type='PARAM7' then de_item7 when dc_type='PARAM8' then de_item8 when dc_type='PARAM9' then de_item9 ");
-            sql.Append("when dc_type='PARAM10' then de_item10 end dc_name,case when dc_type='INQTY' then dr_qty when dc_type='OUTQTY' then dr_okqty ");
+            sql.Append("when dc_type='PARAM10' then de_item10 end dc_name,case when dc_type='INQTY' then dr_qty when dc_type='OUTQTY' then dr_okqty when dc_type='NGQTY' then dr_ngqty ");
             sql.Append("when dc_type='TEMPERATURE' then dr_TEMPERATURE when dc_type='PARAM1' then dr_value1 when dc_type='PARAM2' then dr_value2 ");
             sql.Append("when dc_type='PARAM3' then dr_value3 when dc_type='PARAM4' then dr_value4 when dc_type='PARAM5' then dr_value5 ");
             sql.Append("when dc_type='PARAM6' then dr_value6 when dc_type='PARAM7' then dr_value7 when dc_type='PARAM8' then dr_value8 ");

PLCDataReader/Main.cs

@@ -73,6 +73,9 @@ namespace UAS_PLCDataReader
             ComboBoxData cbd4 = new ComboBoxData();
             cbd4.Text = "产出";
             cbd4.Value = "OUTQTY";
+            ComboBoxData cbd16 = new ComboBoxData();
+            cbd16.Text = "不良";
+            cbd16.Value = "NGQTY";
             ComboBoxData cbd5 = new ComboBoxData();
             cbd5.Text = "温度";
             cbd5.Value = "TEMPERATURE";
@@ -108,6 +111,7 @@ namespace UAS_PLCDataReader
             cbd15.Value = "PARAM10";
             DataItemRepositoryItemComboBox1.Items.Add(cbd3);
             DataItemRepositoryItemComboBox1.Items.Add(cbd4);
+            DataItemRepositoryItemComboBox1.Items.Add(cbd16);
             DataItemRepositoryItemComboBox1.Items.Add(cbd5);
             DataItemRepositoryItemComboBox1.Items.Add(cbd6);
             DataItemRepositoryItemComboBox1.Items.Add(cbd7);
@@ -187,7 +191,7 @@ namespace UAS_PLCDataReader
             ButtonDeleteCommandSet.Grid = GridPollingSetting;
 
             //指令设置界面
-            GridCommandSetting.GetDataSQL = "select 0 CHECKEDCOLUMN,dc_id,dc_code,dc_name,dc_type,case when dc_type='INQTY' then '投入' when dc_type='OUTQTY' then '产出' when dc_type='TEMPERATURE' then '温度' when dc_type='PARAM1' then '参数1' when dc_type='PARAM2' then '参数2' when dc_type='PARAM3' then '参数3' when dc_type='PARAM4' then '参数4' when dc_type='PARAM5' then '参数5' when dc_type='PARAM6' then '参数6' when dc_type='PARAM7' then '参数7' when dc_type='PARAM8' then '参数8' when dc_type='PARAM9' then '参数9' when dc_type='PARAM10' then '参数10' when dc_type='PARAM3' then '参数3'  end dc_typename,dc_value,dc_dataindex,dc_sendcoding,dc_receivecoding,db_name,dc_man,dc_date from devicecommand left join devicebrand on db_code=dc_debrand ".ToUpper();
+            GridCommandSetting.GetDataSQL = "select 0 CHECKEDCOLUMN,dc_id,dc_code,dc_name,dc_type,case when dc_type='INQTY' then '投入' when dc_type='NGQTY' then '不良' when dc_type='OUTQTY' then '产出' when dc_type='TEMPERATURE' then '温度' when dc_type='PARAM1' then '参数1' when dc_type='PARAM2' then '参数2' when dc_type='PARAM3' then '参数3' when dc_type='PARAM4' then '参数4' when dc_type='PARAM5' then '参数5' when dc_type='PARAM6' then '参数6' when dc_type='PARAM7' then '参数7' when dc_type='PARAM8' then '参数8' when dc_type='PARAM9' then '参数9' when dc_type='PARAM10' then '参数10' when dc_type='PARAM3' then '参数3'  end dc_typename,dc_value,dc_dataindex,dc_sendcoding,dc_receivecoding,db_name,dc_man,dc_date from devicecommand left join devicebrand on db_code=dc_debrand ".ToUpper();
             GridCommandSetting.TableName = "devicecommand";
             GridCommandSetting.ID = "dc_id";
             GridCommandSetting.InsertSQL = "insert into devicecommand(dc_id,dc_code,dc_name,dc_value,dc_debrand,dc_sendcoding,dc_receivecoding,dc_man,dc_date,dc_dataindex,dc_type) values(devicecommand_seq.nextval,:dc_code,:dc_name,:dc_value,'" + BaseUtil.GetComboxEditValue(Brand) + "',:dc_sendcoding,:dc_receivecoding,'" + User.UserName + "',sysdate,:dc_dataindex,:dc_type)";

PLCDataReader/PublicMethod/LogicHandler.cs

@@ -174,6 +174,7 @@ namespace UAS_PLCDataReader.PublicMethod
         {
             string INQTY = "";
             string OUTQTY = "";
+            string NGQTY = "";
             string TEMPERATURE = "";
             string PARAM1 = "";
             string PARAM2 = "";
@@ -197,6 +198,9 @@ namespace UAS_PLCDataReader.PublicMethod
                     case "OUTQTY":
                         OUTQTY = item.Value;
                         break;
+                    case "NGQTY":
+                        NGQTY = item.Value;
+                        break;
                     case "TEMPERATURE":
                         TEMPERATURE = item.Value;
                         break;
@@ -237,7 +241,7 @@ namespace UAS_PLCDataReader.PublicMethod
             StringBuilder sql = new StringBuilder();
             sql.Clear();
             sql.Append("update DeviceRunstatus set dr_qty='" + INQTY + "',dr_okqty='" + OUTQTY + "',dr_TEMPERATURE='" + TEMPERATURE + "',");
-            sql.Append("dr_value1='" + PARAM1 + "',dr_value2='" + PARAM2 + "',dr_value3='" + PARAM3 + "',dr_value4='" + PARAM4 + "',dr_value5='" + PARAM5 + "',dr_value6='" + PARAM6 + "',dr_value7='" + PARAM7 + "',dr_value8='" + PARAM8 + "',dr_value9='" + PARAM9 + "',dr_value10='" + PARAM10 + "',dr_updatedate=sysdate where dr_decode='" + Decode + "'");
+            sql.Append("dr_ngqty='"+NGQTY+"',dr_value1='" + PARAM1 + "',dr_value2='" + PARAM2 + "',dr_value3='" + PARAM3 + "',dr_value4='" + PARAM4 + "',dr_value5='" + PARAM5 + "',dr_value6='" + PARAM6 + "',dr_value7='" + PARAM7 + "',dr_value8='" + PARAM8 + "',dr_value9='" + PARAM9 + "',dr_value10='" + PARAM10 + "',dr_updatedate=sysdate where dr_decode='" + Decode + "'");
             Main.QueueUpdateDevice.Enqueue(sql.ToString());
         }