浏览代码

修改文件加载问题

final
DESKTOP-58BB7H3\ZJH 4 个月前
父节点
当前提交
cea542f94f
共有 1 个文件被更改,包括 14 次插入6 次删除
  1. +14
    -6
      CNAS_DBSync/frmSyncParams.cs

+ 14
- 6
CNAS_DBSync/frmSyncParams.cs 查看文件

@@ -266,9 +266,12 @@ namespace CNAS_DBSync


if (currentSyncItem.SyncInstrumentDSInfo != null && currentSyncItem.SyncInstrumentDSInfo.InstrumentDataSourceType != DataSourceType.None) if (currentSyncItem.SyncInstrumentDSInfo != null && currentSyncItem.SyncInstrumentDSInfo.InstrumentDataSourceType != DataSourceType.None)
{ {
dgvMapping.DataSource = new BindingList<SyncParamasInfo>(currentSyncItem.LstSyncPramas);

if (currentSyncItem.LstSyncPramas != null)
dgvMapping.DataSource = new BindingList<SyncParamasInfo>(currentSyncItem.LstSyncPramas);
if (currentSyncItem.SyncInstrumentDSInfo.ServerName != "") if (currentSyncItem.SyncInstrumentDSInfo.ServerName != "")
btnLoadDBData_Click(sender, e); btnLoadDBData_Click(sender, e);

} }
else else
{ {
@@ -288,13 +291,17 @@ namespace CNAS_DBSync
private void cbxInstrument_SelectedIndexChanged(object sender, EventArgs e) private void cbxInstrument_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (cbxInstrument.Text == null) return; if (cbxInstrument.Text == null) return;
string strInstrumentCode = this.dgvInstrument.Rows[this.dgvInstrument.CurrentRow.Index].Cells[0].Value.ToString();

// 使用LINQ查找匹配的数据
SyncInstrumentItemInfo matchedInstrument = lstSyncInstrument.FirstOrDefault(x => x.Code == strInstrumentCode);


InstrumentData instrumentData = InstrumentDataFact.CreateInstrumentDataSource(currentSyncItem.SyncInstrumentDSInfo, new object[] { "", "", "" }); InstrumentData instrumentData = InstrumentDataFact.CreateInstrumentDataSource(currentSyncItem.SyncInstrumentDSInfo, new object[] { "", "", "" });


DataTable dtTableType = null; DataTable dtTableType = null;
string strTableName_Instru = cbxInstrument.Text.ToString(); string strTableName_Instru = cbxInstrument.Text.ToString();
switch (currentSyncItem.SyncInstrumentDSInfo.InstrumentDataSourceType)
switch (matchedInstrument.SyncInstrumentDSInfo.InstrumentDataSourceType)
{ {
case DataSourceType.MySQL: case DataSourceType.MySQL:
dtTableType = SelectTableType.MySqlsec(strTableName_Instru); dtTableType = SelectTableType.MySqlsec(strTableName_Instru);
@@ -315,6 +322,7 @@ namespace CNAS_DBSync
dtTableType = SelectTableType.KingSql(strTableName_Instru); dtTableType = SelectTableType.KingSql(strTableName_Instru);
break; break;
default: default:
strTableName_Instru= matchedInstrument.SyncInstrumentDSInfo.InstrumentDataSourceType.ToString();
if (dictInstruTables.ContainsKey(strTableName_Instru)) if (dictInstruTables.ContainsKey(strTableName_Instru))
{ {
dtTableType = dictInstruTables[strTableName_Instru]; dtTableType = dictInstruTables[strTableName_Instru];
@@ -657,7 +665,7 @@ namespace CNAS_DBSync
SqlServerFormat = FileOperation.GetFormatConfigData<SqlServerFormatConfig>("SqlServerFormatConfig.xml"); SqlServerFormat = FileOperation.GetFormatConfigData<SqlServerFormatConfig>("SqlServerFormatConfig.xml");
OracleFormat = FileOperation.GetFormatConfigData<OracleFormatConfig>("OracleFormatConfig.xml"); OracleFormat = FileOperation.GetFormatConfigData<OracleFormatConfig>("OracleFormatConfig.xml");
NormalFileFormat = FileOperation.GetFormatConfigData<NormalFileFormatConfig>("NormalFileFormatConfig.xml"); NormalFileFormat = FileOperation.GetFormatConfigData<NormalFileFormatConfig>("NormalFileFormatConfig.xml");
switch (currentSyncItem.SyncInstrumentDSInfo.InstrumentDataSourceType) switch (currentSyncItem.SyncInstrumentDSInfo.InstrumentDataSourceType)
{ {
case DataSourceType.MySQL: case DataSourceType.MySQL:
@@ -729,9 +737,9 @@ namespace CNAS_DBSync
dataTableStruct = SelectTableType.SqlserversecSD(sql, currentSyncItem); dataTableStruct = SelectTableType.SqlserversecSD(sql, currentSyncItem);
break; break;
case DataSourceType.Kingbase: case DataSourceType.Kingbase:
if(cbxInstrument.Text.Contains('.'))
if (cbxInstrument.Text.Contains('.'))
cbxInstrument.Text = cbxInstrument.Text.Split('.')[1]; cbxInstrument.Text = cbxInstrument.Text.Split('.')[1];
dataTableStruct = SelectTableType.KingSql(sql); dataTableStruct = SelectTableType.KingSql(sql);
break; break;
default: default:


正在加载...
取消
保存