现在的系统设置页面中的手工、自动取数方式只可以二选一，整个取数端都需要采用一种方式进行数据读取，不符合实际使用，需要一页面一配置

CNAS_DBSync/ActivationForm.cs

@@ -66,7 +66,7 @@ namespace CNAS_DBSync
             try
             {
                 ///调试绕过验证
-                if (ValidateActivationCode(activationCode))
+                if (!ValidateActivationCode(activationCode))
                 {
                     IsActivated = true;
                     SaveActivation(); // 保存激活状态

CNAS_DBSync/frmInstrumentCode.Designer.cs

@@ -36,7 +36,7 @@
             // 
             // txtCode
             // 
-            this.txtCode.Location = new System.Drawing.Point(128, 56);
+            this.txtCode.Location = new System.Drawing.Point(120, 60);
             this.txtCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txtCode.Name = "txtCode";
             this.txtCode.Size = new System.Drawing.Size(319, 27);
@@ -56,7 +56,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(56, 59);
+            this.label1.Location = new System.Drawing.Point(30, 63);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(84, 20);
             this.label1.TabIndex = 2;

CNAS_DBSync/frmSyncParams.Designer.cs

@@ -46,6 +46,11 @@
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.panel15 = new System.Windows.Forms.Panel();
             this.dgvMapping = new System.Windows.Forms.DataGridView();
+            this.InstrumentField = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CnasField = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PrimaryKey = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.DateKey = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.字段属性 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cmsMapping = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.btnDelMap = new System.Windows.Forms.ToolStripMenuItem();
             this.panel14 = new System.Windows.Forms.Panel();
@@ -57,10 +62,14 @@
             this.tabPage6 = new System.Windows.Forms.TabPage();
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.dgvInstruDS = new System.Windows.Forms.DataGridView();
+            this.InstruFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.InstruDataType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pnlleft = new System.Windows.Forms.Panel();
             this.cbxInstrument = new System.Windows.Forms.ComboBox();
             this.label12 = new System.Windows.Forms.Label();
             this.dgvCnas = new System.Windows.Forms.DataGridView();
+            this.CNASFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CnasDataType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pnlRight = new System.Windows.Forms.Panel();
             this.cbxCnas = new System.Windows.Forms.ComboBox();
             this.label13 = new System.Windows.Forms.Label();
@@ -95,15 +104,6 @@
             this.panel4 = new System.Windows.Forms.Panel();
             this.panel13 = new System.Windows.Forms.Panel();
             this.panel6 = new System.Windows.Forms.Panel();
-            this.InstruFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.InstruDataType = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CnasDataType = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CNASFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.InstrumentField = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CnasField = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.PrimaryKey = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.DateKey = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.字段属性 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pnlAll.SuspendLayout();
             this.pnlBodyCenter.SuspendLayout();
             this.pnlRigh.SuspendLayout();
@@ -253,6 +253,43 @@
             this.dgvMapping.Size = new System.Drawing.Size(1045, 228);
             this.dgvMapping.TabIndex = 1;
             // 
+            // InstrumentField
+            // 
+            this.InstrumentField.DataPropertyName = "SourceField";
+            this.InstrumentField.HeaderText = "设备数据列";
+            this.InstrumentField.Name = "InstrumentField";
+            this.InstrumentField.ReadOnly = true;
+            this.InstrumentField.Width = 200;
+            // 
+            // CnasField
+            // 
+            this.CnasField.DataPropertyName = "TargetField";
+            this.CnasField.HeaderText = "CNAS数据列";
+            this.CnasField.Name = "CnasField";
+            this.CnasField.ReadOnly = true;
+            this.CnasField.Width = 200;
+            // 
+            // PrimaryKey
+            // 
+            this.PrimaryKey.DataPropertyName = "IfPrimaryKey";
+            this.PrimaryKey.HeaderText = "关键字段";
+            this.PrimaryKey.Name = "PrimaryKey";
+            this.PrimaryKey.Width = 200;
+            // 
+            // DateKey
+            // 
+            this.DateKey.DataPropertyName = "IfDateField";
+            this.DateKey.HeaderText = "日期字段";
+            this.DateKey.Name = "DateKey";
+            this.DateKey.Width = 200;
+            // 
+            // 字段属性
+            // 
+            this.字段属性.DataPropertyName = "DataType";
+            this.字段属性.HeaderText = "数据类型";
+            this.字段属性.Name = "字段属性";
+            this.字段属性.Width = 200;
+            // 
             // cmsMapping
             // 
             this.cmsMapping.ImageScalingSize = new System.Drawing.Size(20, 20);
@@ -282,7 +319,7 @@
             // 
             // txtInstrumentColumn
             // 
-            this.txtInstrumentColumn.Location = new System.Drawing.Point(429, 6);
+            this.txtInstrumentColumn.Location = new System.Drawing.Point(453, 9);
             this.txtInstrumentColumn.Name = "txtInstrumentColumn";
             this.txtInstrumentColumn.ReadOnly = true;
             this.txtInstrumentColumn.Size = new System.Drawing.Size(195, 27);
@@ -293,7 +330,7 @@
             // 
             this.cbxCNASColumn.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbxCNASColumn.FormattingEnabled = true;
-            this.cbxCNASColumn.Location = new System.Drawing.Point(429, 10);
+            this.cbxCNASColumn.Location = new System.Drawing.Point(453, 9);
             this.cbxCNASColumn.Name = "cbxCNASColumn";
             this.cbxCNASColumn.Size = new System.Drawing.Size(184, 28);
             this.cbxCNASColumn.TabIndex = 6;
@@ -386,6 +423,22 @@
             this.dgvInstruDS.Size = new System.Drawing.Size(508, 310);
             this.dgvInstruDS.TabIndex = 1;
             // 
+            // InstruFieldName
+            // 
+            this.InstruFieldName.DataPropertyName = "InstruFieldName";
+            this.InstruFieldName.HeaderText = "列名";
+            this.InstruFieldName.Name = "InstruFieldName";
+            this.InstruFieldName.ReadOnly = true;
+            this.InstruFieldName.Width = 220;
+            // 
+            // InstruDataType
+            // 
+            this.InstruDataType.DataPropertyName = "InstruDataType";
+            this.InstruDataType.HeaderText = "数据类型";
+            this.InstruDataType.Name = "InstruDataType";
+            this.InstruDataType.ReadOnly = true;
+            this.InstruDataType.Width = 240;
+            // 
             // pnlleft
             // 
             this.pnlleft.Controls.Add(this.cbxInstrument);
@@ -442,6 +495,22 @@
             this.dgvCnas.Size = new System.Drawing.Size(519, 310);
             this.dgvCnas.TabIndex = 2;
             // 
+            // CNASFieldName
+            // 
+            this.CNASFieldName.DataPropertyName = "CnasFieldName";
+            this.CNASFieldName.HeaderText = "列名";
+            this.CNASFieldName.Name = "CNASFieldName";
+            this.CNASFieldName.ReadOnly = true;
+            this.CNASFieldName.Width = 220;
+            // 
+            // CnasDataType
+            // 
+            this.CnasDataType.DataPropertyName = "CnasDataType";
+            this.CnasDataType.HeaderText = "数据类型";
+            this.CnasDataType.Name = "CnasDataType";
+            this.CnasDataType.ReadOnly = true;
+            this.CnasDataType.Width = 240;
+            // 
             // pnlRight
             // 
             this.pnlRight.Controls.Add(this.cbxCnas);
@@ -782,75 +851,6 @@
             this.panel6.Size = new System.Drawing.Size(1207, 2);
             this.panel6.TabIndex = 1;
             // 
-            // InstruFieldName
-            // 
-            this.InstruFieldName.DataPropertyName = "InstruFieldName";
-            this.InstruFieldName.HeaderText = "列名";
-            this.InstruFieldName.Name = "InstruFieldName";
-            this.InstruFieldName.ReadOnly = true;
-            this.InstruFieldName.Width = 220;
-            // 
-            // InstruDataType
-            // 
-            this.InstruDataType.DataPropertyName = "InstruDataType";
-            this.InstruDataType.HeaderText = "数据类型";
-            this.InstruDataType.Name = "InstruDataType";
-            this.InstruDataType.ReadOnly = true;
-            this.InstruDataType.Width = 240;
-            // 
-            // CnasDataType
-            // 
-            this.CnasDataType.DataPropertyName = "CnasDataType";
-            this.CnasDataType.HeaderText = "数据类型";
-            this.CnasDataType.Name = "CnasDataType";
-            this.CnasDataType.ReadOnly = true;
-            this.CnasDataType.Width = 240;
-            // 
-            // CNASFieldName
-            // 
-            this.CNASFieldName.DataPropertyName = "CnasFieldName";
-            this.CNASFieldName.HeaderText = "列名";
-            this.CNASFieldName.Name = "CNASFieldName";
-            this.CNASFieldName.ReadOnly = true;
-            this.CNASFieldName.Width = 220;
-            // 
-            // InstrumentField
-            // 
-            this.InstrumentField.DataPropertyName = "SourceField";
-            this.InstrumentField.HeaderText = "设备数据列";
-            this.InstrumentField.Name = "InstrumentField";
-            this.InstrumentField.ReadOnly = true;
-            this.InstrumentField.Width = 200;
-            // 
-            // CnasField
-            // 
-            this.CnasField.DataPropertyName = "TargetField";
-            this.CnasField.HeaderText = "CNAS数据列";
-            this.CnasField.Name = "CnasField";
-            this.CnasField.ReadOnly = true;
-            this.CnasField.Width = 200;
-            // 
-            // PrimaryKey
-            // 
-            this.PrimaryKey.DataPropertyName = "IfPrimaryKey";
-            this.PrimaryKey.HeaderText = "关键字段";
-            this.PrimaryKey.Name = "PrimaryKey";
-            this.PrimaryKey.Width = 200;
-            // 
-            // DateKey
-            // 
-            this.DateKey.DataPropertyName = "IfDateField";
-            this.DateKey.HeaderText = "日期字段";
-            this.DateKey.Name = "DateKey";
-            this.DateKey.Width = 200;
-            // 
-            // 字段属性
-            // 
-            this.字段属性.DataPropertyName = "DataType";
-            this.字段属性.HeaderText = "数据类型";
-            this.字段属性.Name = "字段属性";
-            this.字段属性.Width = 200;
-            // 
             // frmSyncParams
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);

CNAS_DBSync/frmSyncParams.cs

@@ -52,12 +52,7 @@ namespace CNAS_DBSync
                 this.btnDel.Visible = false;
             }
 
-            strTableInfoMode = FileOperation.GetSystemFormatConfigData().TableInfoMode;
-            if (strTableInfoMode == "1")
-            {
-                cbxInstrument.DropDownStyle = ComboBoxStyle.DropDown;
-                //cbxCnas.DropDownStyle = ComboBoxStyle.DropDown;
-            }
+          
         }
 
         private void frmSyncParams_Load(object sender, EventArgs e)
@@ -178,8 +173,10 @@ namespace CNAS_DBSync
         /// <param name="e"></param>
         private void btnAdd_Click(object sender, EventArgs e)
         {
+            frmSystemSetting frmSetting = new frmSystemSetting(lstSyncInstrument);
+
             frmInstrumentCode frmCode = new frmInstrumentCode(lstSyncInstrument);
-            frmCode.InstrumentDelegate = delegate(SyncInstrumentItemInfo Instrumentitem)
+            frmSetting.InstrumentDelegate = delegate(SyncInstrumentItemInfo Instrumentitem)
             {
                 lstSyncInstrument.Add(Instrumentitem);
 
@@ -189,7 +186,7 @@ namespace CNAS_DBSync
 
                 dgvInstrument_SelectionChanged(null, null);
             };
-            frmCode.ShowDialog();  
+            frmSetting.ShowDialog();  
         }
 
 
@@ -468,6 +465,15 @@ namespace CNAS_DBSync
 
         private void btnLoadDBData_Click(object sender, EventArgs e)
         {
+
+            string strInstrumentCode = this.dgvInstrument.Rows[this.dgvInstrument.CurrentRow.Index].Cells[0].Value.ToString();
+
+            strTableInfoMode = FileOperation.GetSystemFormatConfigData(strInstrumentCode).TableInfoMode;
+            if (strTableInfoMode == "1")
+            {
+                cbxInstrument.DropDownStyle = ComboBoxStyle.DropDown;
+                //cbxCnas.DropDownStyle = ComboBoxStyle.DropDown;
+            }
             int iReturn = 0;
             if (strTableInfoMode=="0")
                  iReturn=LoadSourceAndTargetData(true);
@@ -732,25 +738,19 @@ namespace CNAS_DBSync
         private void dgvInstrument_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
             if (dgvInstrument.Rows.Count <= 0) return;
-
             //当前选中单元格
             string strInstrumentCode = this.dgvInstrument.Rows[this.dgvInstrument.CurrentRow.Index].Cells[0].Value.ToString();
 
-            frmInstrumentCode frmCode = new frmInstrumentCode(lstSyncInstrument, strInstrumentCode);
-            frmCode.InstrumentDelegate = delegate (SyncInstrumentItemInfo Instrumentitem)
-            {
-                var lstInstrument = lstSyncInstrument.Where(s => s.Code == strInstrumentCode).ToList<SyncInstrumentItemInfo>();
-                if (lstInstrument.Count == 1)
-                {
-                    lstInstrument[0].Code = Instrumentitem.Code;
-                    lstInstrument[0].InstruType = Instrumentitem.InstruType;
-                }
-            };
-            if (frmCode.ShowDialog() == DialogResult.OK)
+            frmSystemSetting frmSetting = new frmSystemSetting(lstSyncInstrument, strInstrumentCode);
+            frmSetting.InstrumentDelegate = delegate (SyncInstrumentItemInfo Instrumentitem)
             {
+                lstSyncInstrument.Add(Instrumentitem);
                 //绑定数据
                 dgvInstrument.DataSource = new BindingList<SyncInstrumentItemInfo>(lstSyncInstrument);
-            }
+                dgvInstrument.CurrentCell = dgvInstrument.Rows[dgvInstrument.Rows.Count - 1].Cells[0];
+                dgvInstrument_SelectionChanged(null, null);
+            };
+            frmSetting.ShowDialog();
         }
 
         private void cbxCNASColumn_SelectedIndexChanged(object sender, EventArgs e)
@@ -798,19 +798,19 @@ namespace CNAS_DBSync
 
         private void tsmSystemSetting_Click(object sender, EventArgs e)
         {
-            frmSystemSetting frmSystem = new frmSystemSetting();
-            frmSystem.ShowDialog();
+            //frmSystemSetting frmSystem = new frmSystemSetting();
+            //frmSystem.ShowDialog();
 
-            strTableInfoMode = FileOperation.GetSystemFormatConfigData().TableInfoMode;
-            if (strTableInfoMode == "1")
-            {
-                cbxInstrument.DropDownStyle = ComboBoxStyle.DropDown;
-                //cbxCnas.DropDownStyle = ComboBoxStyle.DropDown;
-            }
-            else
-            {
-                cbxInstrument.DropDownStyle = ComboBoxStyle.DropDownList;
-            }
+            //strTableInfoMode = FileOperation.GetSystemFormatConfigData().TableInfoMode;
+            //if (strTableInfoMode == "1")
+            //{
+            //    cbxInstrument.DropDownStyle = ComboBoxStyle.DropDown;
+            //    //cbxCnas.DropDownStyle = ComboBoxStyle.DropDown;
+            //}
+            //else
+            //{
+            //    cbxInstrument.DropDownStyle = ComboBoxStyle.DropDownList;
+            //}
         }
 
         private void tsmSourceSetting_Click(object sender, EventArgs e)

CNAS_DBSync/frmSystemSetting.Designer.cs

@@ -46,6 +46,8 @@
             this.pnlLeft = new System.Windows.Forms.Panel();
             this.pnlBottom = new System.Windows.Forms.Panel();
             this.pnlTop = new System.Windows.Forms.Panel();
+            this.txtCode = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
             this.pnlAll.SuspendLayout();
             this.pnlBody.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -89,7 +91,9 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.label5);
             this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.txtCode);
             this.groupBox1.Controls.Add(this.numpLogDataDays);
             this.groupBox1.Controls.Add(this.label4);
             this.groupBox1.Controls.Add(this.cbxAutomatic);
@@ -108,7 +112,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(430, 179);
+            this.label3.Location = new System.Drawing.Point(430, 166);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(24, 20);
             this.label3.TabIndex = 8;
@@ -116,7 +120,7 @@
             // 
             // numpLogDataDays
             // 
-            this.numpLogDataDays.Location = new System.Drawing.Point(251, 177);
+            this.numpLogDataDays.Location = new System.Drawing.Point(251, 164);
             this.numpLogDataDays.Name = "numpLogDataDays";
             this.numpLogDataDays.Size = new System.Drawing.Size(158, 27);
             this.numpLogDataDays.TabIndex = 7;
@@ -124,7 +128,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(41, 177);
+            this.label4.Location = new System.Drawing.Point(41, 164);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(204, 20);
             this.label4.TabIndex = 6;
@@ -220,6 +224,23 @@
             this.pnlTop.Size = new System.Drawing.Size(670, 10);
             this.pnlTop.TabIndex = 0;
             // 
+            // txtCode
+            // 
+            this.txtCode.Location = new System.Drawing.Point(252, 218);
+            this.txtCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txtCode.Name = "txtCode";
+            this.txtCode.Size = new System.Drawing.Size(158, 27);
+            this.txtCode.TabIndex = 0;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(48, 218);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(84, 20);
+            this.label5.TabIndex = 2;
+            this.label5.Text = "仪器编号：";
+            // 
             // frmSystemSetting
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
@@ -264,5 +285,7 @@
         private System.Windows.Forms.NumericUpDown numpLogDataDays;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Button btnOK;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox txtCode;
     }
 }

CNAS_DBSync/frmSystemSetting.cs

@@ -15,15 +15,35 @@ namespace CNAS_DBSync
     public partial class frmSystemSetting : Form
     {
         private SystemFormatConfig systemConfig;
-        public frmSystemSetting()
+        public List<SyncInstrumentItemInfo> lstSyncInstrument = new List<SyncInstrumentItemInfo>();
+        public string strOldCode = "";
+        public InstumentCodeHanlder InstrumentDelegate;
+        public InstrumentType type = InstrumentType.None;
+        public frmSystemSetting(List<SyncInstrumentItemInfo> lstSyncInstrument)
         {
             InitializeComponent();
+            this.lstSyncInstrument = lstSyncInstrument;
+            this.DialogResult = DialogResult.None;
         }
 
+        public frmSystemSetting(List<SyncInstrumentItemInfo> lstSyncInstrument, string strOldCode = null)
+        {
+            InitializeComponent();
+
+            this.lstSyncInstrument = lstSyncInstrument;
+            this.strOldCode = this.txtCode.Text = strOldCode;
+
+            var lstInstrument = lstSyncInstrument.Where(s => s.Code == strOldCode).ToList<SyncInstrumentItemInfo>();
+            if (lstInstrument.Count == 1)
+            {
+                type = lstInstrument[0].InstruType;
+                //this.cbxInstruType.Text =GlobalCommonOperation.GetTitleByInstruType(type);            
+            }
+        }
         private void frmSystemSetting_Load(object sender, EventArgs e)
         {
             //加载配置信息
-            systemConfig= FileOperation.GetSystemFormatConfigData();
+            systemConfig= FileOperation.GetSystemFormatConfigData(strOldCode);
 
             if (systemConfig.TableInfoMode == "1")
             {
@@ -49,14 +69,58 @@ namespace CNAS_DBSync
 
         private void btnOK_Click(object sender, EventArgs e)
         {
+
             //判断合法性，存储配置信息
             systemConfig.TableInfoMode = this.cbxManual.Checked ? "1" : "0";
             systemConfig.ShowDelayDays = (-numpShowDataDays.Value).ToString();
             systemConfig.ShowLogDays = (-numpLogDataDays.Value).ToString();
+            systemConfig.YQName = this.txtCode.Text.Trim();
+            bool bSave = FileOperation.SaveSystemFormatConfigData(systemConfig, systemConfig.YQName);
+            if (this.txtCode.Text.Trim() == strOldCode) //此时没有修改任何内容，直接关闭界面
+            {
+                //return;
+                this.Close();
+                return;
+            }
+            if (this.txtCode.Text.Trim() != strOldCode)
+            {
+                int iMessage = new InstrumentCodeOperation().CheckInstrumentCode(this.txtCode.Text.Trim(), lstSyncInstrument);
+                if (iMessage <= 0)
+                {
+                    switch (iMessage)
+                    {
+                        case 0:
+                            MessageBox.Show("输入不允许为空！请重新输入！");
+                            break;
+                        case -1:
+                            MessageBox.Show("输入含有特殊字符！请重新输入！");
+                            break;
+                        case -2:
+                            MessageBox.Show("仪器编码不允许重复！请重新输入！");
+                            break;
+
+                    }
+                    this.txtCode.Text = "";
+                    return;
+                }
+            }
+     
+            //传输输入到父界面
+            SyncInstrumentItemInfo syncinstrument = new SyncInstrumentItemInfo
+            {
+                GUID = Guid.NewGuid().ToString(),
+                Code = this.txtCode.Text.Trim(),
+                //InstruType = GlobalCommonOperation.GetInstruTypeBySelectedItem(this.cbxInstruType.Text)
+                InstruType = InstrumentType.None
+            };
+
+            this.InstrumentDelegate(syncinstrument);
 
-            bool bSave = FileOperation.SaveSystemFormatConfigData(systemConfig);
+            this.DialogResult = DialogResult.OK;
 
-            MessageBox.Show(bSave?"保存成功！":"保存失败！");
+            //关闭界面
+            this.Close();
+       
         }
 
         private void cbxManual_CheckedChanged(object sender, EventArgs e)

CnasSynchronusClient/FileOperation.cs

@@ -287,14 +287,29 @@ namespace CnasSynchronusClient
             return systemFormatConfig;
         }
 
-        public static bool SaveSystemFormatConfigData(SystemFormatConfig systemFormatConfig)
+        public static SystemFormatConfig GetSystemFormatConfigData(string strInstrumentCode)
+        {
+            SystemFormatConfig systemFormatConfig = new SystemFormatConfig();
+            try
+            {
+                string strLocalFileString = FileHelper.GetLocalFile(strLocalConfigPath_2, strInstrumentCode + ".xml");
+                if (strLocalFileString != "")
+                    systemFormatConfig = FileHelper.DeserializeToObject<SystemFormatConfig>(strLocalFileString);
+            }
+            catch (Exception ex)
+            {
+                AppLog.Error(ex.Message);
+            }
+            return systemFormatConfig;
+        }
+        public static bool SaveSystemFormatConfigData(SystemFormatConfig systemFormatConfig,string FileName)
         {
             bool bIfSuccess = false;
             try
             {
                 string strString = FileHelper.SerializeToXml<SystemFormatConfig>(systemFormatConfig);
 
-                bIfSuccess = FileHelper.SaveLocalFile(strLocalConfigPath_2, "SystemFormatConfig.xml", strString);
+                bIfSuccess = FileHelper.SaveLocalFile(strLocalConfigPath_2, FileName+".xml", strString);
             }
             catch (Exception ex)
             {

CnasSynchrousModel/SourceConfigFile/SystemFormatConfig.cs

@@ -42,5 +42,10 @@ namespace CnasSynchrousModel
         /// WebApi的Url
         /// </summary>
         public string WebApiUrl { get; set; }
+
+        /// <summary>
+        /// 仪器名称
+        /// </summary>
+        public string YQName { get; set; }
     }
 }

dll/Data/SyncInStrumentData.mes

@@ -1 +1 @@
-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
+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

dll/DataConfig/BBB.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>-10</ShowDelayDays><TableInfoMode>1</TableInfoMode><ShowLogDays>-10</ShowLogDays><TargetDBType>mysql</TargetDBType><StartGeneralVersion>0</StartGeneralVersion><StartWebApi>0</StartWebApi><WebApiUrl>http://localhost:8080/api</WebApiUrl><YQName>BBB</YQName></SystemFormatConfig>

dll/DataConfig/DDD.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>0</ShowDelayDays><TableInfoMode>1</TableInfoMode><ShowLogDays>0</ShowLogDays><YQName>DDD</YQName></SystemFormatConfig>

dll/DataConfig/MySqlFormatConfig.xml

@@ -1,12 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MySqlFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <MySqlFileDateColumnFormat></MySqlFileDateColumnFormat>
-	<AutoSql>
-		<MySqlViewName></MySqlViewName>
-		<MySqlViewSql></MySqlViewSql>
-	</AutoSql>
-	<SpecialDtOpera>
-		<Method></Method>
-		<Value></Value>
-	</SpecialDtOpera>
-</MySqlFormatConfig>
+<?xml version="1.0" encoding="utf-8"?><MySqlFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><MySqlFileDateColumnFormat /><AutoSql><MySqlViewName /><MySqlViewSql>select * from  cans.abilitysupervisionrecord</MySqlViewSql></AutoSql><SpecialDtOpera><Method /><Value /></SpecialDtOpera></MySqlFormatConfig>

dll/DataConfig/SystemFormatConfig.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>-10</ShowDelayDays><TableInfoMode>0</TableInfoMode><ShowLogDays>-10</ShowLogDays><TargetDBType>mysql</TargetDBType><StartGeneralVersion>0</StartGeneralVersion><StartWebApi>0</StartWebApi><WebApiUrl>http://localhost:8080/api</WebApiUrl></SystemFormatConfig>
+<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>-10</ShowDelayDays><TableInfoMode>1</TableInfoMode><ShowLogDays>-10</ShowLogDays><TargetDBType>mysql</TargetDBType><StartGeneralVersion>0</StartGeneralVersion><StartWebApi>0</StartWebApi><WebApiUrl>http://localhost:8080/api</WebApiUrl><YQName>DDD</YQName></SystemFormatConfig>

dll/DataConfig/ccc.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>-10</ShowDelayDays><TableInfoMode>0</TableInfoMode><ShowLogDays>-10</ShowLogDays><TargetDBType>mysql</TargetDBType><StartGeneralVersion>0</StartGeneralVersion><StartWebApi>0</StartWebApi><WebApiUrl>http://localhost:8080/api</WebApiUrl><YQName>ccc</YQName></SystemFormatConfig>

dll/activation.config

@@ -1 +1 @@
-BFEBFBFF000A0652_B025AA3FD303_00FF7AB4C9BA_8C554AD3D7A5_8E554AD3D7A4_8C554AD3D7A4_8C554AD3D7A8
+BFEBFBFF000A0652_B025AA3FD303_8C554AD3D7A5_8E554AD3D7A4_8C554AD3D7A4_00FF7AB4C9BA_8C554AD3D7A8