Browse Source

update mysql script

pull/6/merge
Gavin 8 years ago
parent
commit
db859f6fca
  1. 224
      SCADA/Database/mysql.sql
  2. BIN
      SCADA/Program/SiemensPLCDriver/libnodave.net.dll
  3. 7
      SCADA/Program/TagConfig/TagConfig/Form1.cs
  4. BIN
      SCADA/dll/DataHelper.dll
  5. BIN
      SCADA/dll/DataService.dll

224
SCADA/Database/mysql.sql

File diff suppressed because one or more lines are too long

BIN
SCADA/Program/SiemensPLCDriver/libnodave.net.dll

Binary file not shown.

7
SCADA/Program/TagConfig/TagConfig/Form1.cs

@ -174,15 +174,14 @@ namespace TagConfig
}
}
var obj = DataHelper.Instance.ExecuteScalar("SELECT MAX(TypeID) FROM Meta_Condition");
if (obj != DBNull.Value) Program.MAXCONDITIONID = (int)obj;
if (obj != DBNull.Value) Program.MAXCONDITIONID =Convert.ToInt32(obj);
start = true;
}
private void Save()
{
dataGridView1.CurrentCell = null;
bindingSource1.EndEdit();
//dataGridView1.CurrentCell = null;
//bindingSource1.EndEdit();
TagDataReader reader = new TagDataReader(list);
ConditionReader condReader = new ConditionReader(conditions);
SubConditionReader subReader = new SubConditionReader(subConds);

BIN
SCADA/dll/DataHelper.dll

Binary file not shown.

BIN
SCADA/dll/DataService.dll

Binary file not shown.
Loading…
Cancel
Save