From ed92fcefc39c56cf74b783b84040d397c5889167 Mon Sep 17 00:00:00 2001
From: "DESKTOP-58BB7H3\\ZJH" <zhangjh@auseft.com>
Date: Thu, 27 Feb 2025 18:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=A0=E6=B3=95=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BDAcc=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CNAS_DBSync/frmSyncParams.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/CNAS_DBSync/frmSyncParams.cs b/CNAS_DBSync/frmSyncParams.cs
index 519817e..0d33674 100644
--- a/CNAS_DBSync/frmSyncParams.cs
+++ b/CNAS_DBSync/frmSyncParams.cs
@@ -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();