|
|
@@ -285,8 +285,8 @@ namespace CNAS_DBSync |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
else |
|
|
@@ -312,7 +312,7 @@ namespace CNAS_DBSync |
|
|
|
// 使用LINQ查找匹配的数据 |
|
|
|
SyncInstrumentItemInfo matchedInstrument = lstSyncInstrument.FirstOrDefault(x => x.Code == strInstrumentCode); |
|
|
|
|
|
|
|
// InstrumentData instrumentData = InstrumentDataFact.CreateInstrumentDataSource(currentSyncItem.SyncInstrumentDSInfo, new object[] { "", "", "" }); |
|
|
|
InstrumentData instrumentDatas = InstrumentDataFact.CreateInstrumentDataSource(currentSyncItem.SyncInstrumentDSInfo, new object[] { "", "", "" }); |
|
|
|
|
|
|
|
DataTable dtTableType = null; |
|
|
|
string strTableName_Instru = cbxInstrument.Text.ToString(); |
|
|
@@ -341,12 +341,18 @@ namespace CNAS_DBSync |
|
|
|
break; |
|
|
|
default: |
|
|
|
strTableName_Instru = matchedInstrument.SyncInstrumentDSInfo.InstrumentDataSourceType.ToString(); |
|
|
|
|
|
|
|
|
|
|
|
strTableName_Instru = currentSyncItem.SyncInstrumentDSInfo.InstrumentDataSourceType.ToString(); |
|
|
|
|
|
|
|
InstrumentData instrumentData = InstrumentDataFact.CreateInstrumentDataSource(matchedInstrument.SyncInstrumentDSInfo, new object[] { "", "", "" }); |
|
|
|
dictInstruTables = instrumentData.GetInstrumentData(); |
|
|
|
dictInstruTables = instrumentDatas.GetInstrumentData(); |
|
|
|
if (dictInstruTables.ContainsKey(strTableName_Instru)) |
|
|
|
{ |
|
|
|
dtTableType = dictInstruTables[strTableName_Instru]; |
|
|
|
} |
|
|
|
|
|
|
|
if (dictInstruTables.ContainsKey(cbxInstrument.Text)) |
|
|
|
dtTableType = dictInstruTables[cbxInstrument.Text]; |
|
|
|
break; |
|
|
|
} |
|
|
|
DataTable dtInstruShow = new DataTable(); |
|
|
|