提交映射字段显示数据类型

CNAS_DBSync/ActivationForm.cs

@@ -65,6 +65,7 @@ namespace CNAS_DBSync
 
             try
             {
+                ///调试绕过验证
                 if (ValidateActivationCode(activationCode))
                 {
                     IsActivated = true;

CNAS_DBSync/frmSyncParams.Designer.cs

@@ -95,14 +95,15 @@
             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.InstruFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.InstruDataType = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CNASFieldName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CnasDataType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.字段属性 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pnlAll.SuspendLayout();
             this.pnlBodyCenter.SuspendLayout();
             this.pnlRigh.SuspendLayout();
@@ -237,7 +238,8 @@
             this.InstrumentField,
             this.CnasField,
             this.PrimaryKey,
-            this.DateKey});
+            this.DateKey,
+            this.字段属性});
             this.dgvMapping.ContextMenuStrip = this.cmsMapping;
             this.dgvMapping.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvMapping.Location = new System.Drawing.Point(0, 0);
@@ -780,13 +782,45 @@
             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 = 240;
+            this.InstrumentField.Width = 200;
             // 
             // CnasField
             // 
@@ -794,53 +828,28 @@
             this.CnasField.HeaderText = "CNAS数据列";
             this.CnasField.Name = "CnasField";
             this.CnasField.ReadOnly = true;
-            this.CnasField.Width = 240;
+            this.CnasField.Width = 200;
             // 
             // PrimaryKey
             // 
             this.PrimaryKey.DataPropertyName = "IfPrimaryKey";
             this.PrimaryKey.HeaderText = "关键字段";
             this.PrimaryKey.Name = "PrimaryKey";
-            this.PrimaryKey.Width = 240;
+            this.PrimaryKey.Width = 200;
             // 
             // DateKey
             // 
             this.DateKey.DataPropertyName = "IfDateField";
             this.DateKey.HeaderText = "日期字段";
             this.DateKey.Name = "DateKey";
-            this.DateKey.Width = 240;
-            // 
-            // InstruFieldName
-            // 
-            this.InstruFieldName.DataPropertyName = "InstruFieldName";
-            this.InstruFieldName.HeaderText = "列名";
-            this.InstruFieldName.Name = "InstruFieldName";
-            this.InstruFieldName.ReadOnly = true;
-            this.InstruFieldName.Width = 220;
-            // 
-            // InstruDataType
+            this.DateKey.Width = 200;
             // 
-            this.InstruDataType.DataPropertyName = "InstruDataType";
-            this.InstruDataType.HeaderText = "数据类型";
-            this.InstruDataType.Name = "InstruDataType";
-            this.InstruDataType.ReadOnly = true;
-            this.InstruDataType.Width = 240;
+            // 字段属性
             // 
-            // 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;
+            this.字段属性.DataPropertyName = "DataType";
+            this.字段属性.HeaderText = "数据类型";
+            this.字段属性.Name = "字段属性";
+            this.字段属性.Width = 200;
             // 
             // frmSyncParams
             // 
@@ -961,14 +970,15 @@
         private System.Windows.Forms.ToolStripMenuItem tsmHelper;
         private System.Windows.Forms.Panel pnlBodyCenter;
         private System.Windows.Forms.ToolStripMenuItem tsmServiceSetting;
-        private System.Windows.Forms.DataGridViewTextBoxColumn InstrumentField;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CnasField;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn PrimaryKey;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn DateKey;
         private System.Windows.Forms.DataGridViewTextBoxColumn InstruFieldName;
         private System.Windows.Forms.DataGridViewTextBoxColumn InstruDataType;
         private System.Windows.Forms.DataGridViewTextBoxColumn CNASFieldName;
         private System.Windows.Forms.DataGridViewTextBoxColumn CnasDataType;
+        private System.Windows.Forms.DataGridViewTextBoxColumn InstrumentField;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CnasField;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn PrimaryKey;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn DateKey;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 字段属性;
     }
 }
 

CNAS_DBSync/frmSyncParams.cs

@@ -385,7 +385,7 @@ namespace CNAS_DBSync
             //仪器表名和选中行
             syncParamas.SourceTable = cbxInstrument.Text.ToString().ToUpper();
             syncParamas.SourceField = dgvInstruDS.Rows[dgvInstruDS.CurrentCell.RowIndex].Cells[0].Value.ToString().ToUpper();
-
+            syncParamas.DataType = dgvInstruDS.Rows[dgvInstruDS.CurrentCell.RowIndex].Cells[1].Value.ToString().ToUpper();
             //CNAS表名和选中行
             syncParamas.TargetTable = cbxCnas.Text.ToString().ToUpper();
             syncParamas.TargetField = dgvCnas.Rows[dgvCnas.CurrentCell.RowIndex].Cells[0].Value.ToString().ToUpper();

CNAS_DBSync/frmSyncParams.resx

@@ -129,6 +129,9 @@
   <metadata name="DateKey.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="字段属性.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="cmsMapping.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

CnasSynchrousModel/SyncParamasInfo.cs

@@ -39,5 +39,10 @@ namespace CnasSynchrousModel
         /// 是否是关键日期字段
         /// </summary>
         public bool IfDateField { get; set; }
+
+        /// <summary>
+        /// 数据类型
+        /// </summary>
+        public string DataType { get; set; }
     }
 }

dll/activation.config

@@ -1 +1 @@
-BFEBFBFF000B06A2_7413EA0CEB72_7613EA0CEB71_7413EA0CEB71
+BFEBFBFF000A0652_B025AA3FD303_00FF7AB4C9BA_8C554AD3D7A5_8E554AD3D7A4_8C554AD3D7A4_8C554AD3D7A8