modify:修改代码及修改npoi的依赖

lqnet.sln

@@ -5,8 +5,6 @@ VisualStudioVersion = 17.5.33414.496
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lqnet", "lqnet\Lqnet.csproj", "{98F57028-AF22-4FE1-8A58-F52A626D4D50}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "LqnetSetup", "..\LqnetSetup\LqnetSetup.vdproj", "{73A3F8D5-B9D3-4123-A13B-59DDC8A818B5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,8 +15,6 @@ Global
 		{98F57028-AF22-4FE1-8A58-F52A626D4D50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98F57028-AF22-4FE1-8A58-F52A626D4D50}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{98F57028-AF22-4FE1-8A58-F52A626D4D50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73A3F8D5-B9D3-4123-A13B-59DDC8A818B5}.Debug|Any CPU.ActiveCfg = Debug
-		{73A3F8D5-B9D3-4123-A13B-59DDC8A818B5}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

lqnet/Entities/Dto/DeviceQueryDTO.cs

@@ -27,5 +27,17 @@ namespace lqnet.Entities.Dto
         /// 资产编号
         /// </summary>
         public string propertyCode { set; get; }
+        /// <summary>
+        /// 管理编号
+        /// </summary>
+        public string manageEquitCode { set; get; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string equitName { set; get; }
+        /// <summary>
+        /// 生产厂家
+        /// </summary>
+        public string prodeFactory { set; get; }
     }
 }

lqnet/Entities/Dto/TaskSelectDTO.cs

@@ -13,7 +13,13 @@ namespace lqnet.Entities.Dto
         /// <summary>
         /// 适用产品信息
         /// </summary>
+        [JsonProperty(PropertyName = "prodtCodes")]
         public string ProdtCodes { get; set; }
+        /// <summary>
+        /// 资产编号
+        /// </summary>
+        [JsonProperty(PropertyName = "assetNo")]
+        public string AssetNo { get; set; }
 
         [JsonProperty(PropertyName = "pageNum")]
         public int PageNum { get; set; }

lqnet/Forms/BaseForm.cs

@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace lqnet.Forms
+{
+    public  class BaseForm : Form
+    {
+        #region 控件缩放
+        double formWidth;//窗体原始宽度
+        double formHeight;//窗体原始高度
+        double scaleX;//水平缩放比例
+        double scaleY;//垂直缩放比例
+        Dictionary<string, string> controlInfo = new Dictionary<string, string>();
+        //控件中心Left,Top,控件Width,控件Height,控件字体Size
+        /// <summary>
+        /// 获取所有原始数据
+        /// </summary>
+        protected void GetAllInitInfo(Control CrlContainer)
+        {
+            if (CrlContainer.Parent == this)
+            {
+                formWidth = Convert.ToDouble(CrlContainer.Width);
+                formHeight = Convert.ToDouble(CrlContainer.Height);
+            }
+            foreach (Control item in CrlContainer.Controls)
+            {
+                if (item.Name.Trim() != "")
+                    controlInfo.Add(item.Name, (item.Left + item.Width / 2) + "," + (item.Top + item.Height / 2) + "," + item.Width + "," + item.Height + "," + item.Font.Size);
+                if ((item as UserControl) == null && item.Controls.Count > 0)
+                    GetAllInitInfo(item);
+            }
+        }
+
+        private void ControlsChangeInit(Control CrlContainer)
+        {
+            scaleX = (Convert.ToDouble(CrlContainer.Width) / formWidth);
+            scaleY = (Convert.ToDouble(CrlContainer.Height) / formHeight);
+        }
+
+        /// <summary>
+        /// 设置控件大小以及样式
+        /// </summary>
+        /// <param name="CrlContainer"></param>
+        private void ControlsChange(Control CrlContainer)
+        {
+            double[] pos = new double[5];//pos数组保存当前控件中心Left,Top,控件Width,控件Height,控件字体Size
+            foreach (Control item in CrlContainer.Controls)
+            {
+                //判断有此控件
+                if (item.Name.Trim() != "")
+                {
+                    if ((item as UserControl) == null && item.Controls.Count > 0)
+                        ControlsChange(item);
+                    //获取窗体改变前的控件信息
+                    string[] strs = controlInfo[item.Name].Split(',');
+                    for (int j = 0; j < 5; j++)
+                    {
+                        pos[j] = Convert.ToDouble(strs[j]);
+                    }
+                    //设置窗体改变之后的控件信息
+                    double itemWidth = pos[2] * scaleX;
+                    double itemHeight = pos[3] * scaleY;
+                    //左边距
+                    item.Left = Convert.ToInt32(pos[0] * scaleX - itemWidth / 2);
+                    //上边距
+                    item.Top = Convert.ToInt32(pos[1] * scaleY - itemHeight / 2);
+                    //控件宽度
+                    item.Width = Convert.ToInt32(itemWidth);
+                    //控件高度
+                    item.Height = Convert.ToInt32(itemHeight);
+                    try
+                    {
+                        //字体大小  可更具自己需要选择是否调整
+                        item.Font = new Font(item.Font.Name, float.Parse((pos[4] * Math.Min(scaleX, scaleY)).ToString()));
+                    }
+                    catch
+                    {
+
+                    }
+                }
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 窗体改变大小
+        /// </summary>    
+        protected override void OnSizeChanged(EventArgs e)
+        {
+            base.OnSizeChanged(e);
+            if (controlInfo.Count > 0)
+            {
+                ControlsChangeInit(this.Controls[0]);
+                //获取Controls实例
+                ControlsChange(this.Controls[0]);
+            }
+        }
+
+    }
+}

lqnet/Forms/DevicePopupForm.cs

@@ -41,6 +41,12 @@ namespace lqnet.Forms
         private DataGridViewTextBoxColumn manageEquitCodeDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn equitParameterDataGridViewTextBoxColumn;
         private System.Windows.Forms.Button resetBtn;
+        private System.Windows.Forms.TextBox deviceNameTb;
+        private Label deviceNameLabel;
+        private System.Windows.Forms.TextBox prodtFactoryTb;
+        private Label prodtFactoryLabel;
+        private System.Windows.Forms.TextBox manageCodeTb;
+        private Label mangeCodeLabel;
         private BindingSource deviceListBindingSource;
 
         public DevicePopupForm()
@@ -52,9 +58,9 @@ namespace lqnet.Forms
             this.components = new System.ComponentModel.Container();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
             this.indexDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.equitChildTypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.propertyCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.equitNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.equitChildTypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.manageEquitCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.equitParameterDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.deviceListBindingSource = new System.Windows.Forms.BindingSource(this.components);
@@ -66,6 +72,12 @@ namespace lqnet.Forms
             this.deviceNoTb = new System.Windows.Forms.TextBox();
             this.searchBtn = new System.Windows.Forms.Button();
             this.resetBtn = new System.Windows.Forms.Button();
+            this.deviceNameTb = new System.Windows.Forms.TextBox();
+            this.deviceNameLabel = new System.Windows.Forms.Label();
+            this.prodtFactoryTb = new System.Windows.Forms.TextBox();
+            this.prodtFactoryLabel = new System.Windows.Forms.Label();
+            this.manageCodeTb = new System.Windows.Forms.TextBox();
+            this.mangeCodeLabel = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.deviceListBindingSource)).BeginInit();
             this.SuspendLayout();
@@ -82,7 +94,7 @@ namespace lqnet.Forms
             this.manageEquitCodeDataGridViewTextBoxColumn,
             this.equitParameterDataGridViewTextBoxColumn});
             this.dataGridView1.DataSource = this.deviceListBindingSource;
-            this.dataGridView1.Location = new System.Drawing.Point(13, 84);
+            this.dataGridView1.Location = new System.Drawing.Point(13, 121);
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.RowHeadersWidth = 62;
             this.dataGridView1.RowTemplate.Height = 30;
@@ -98,14 +110,6 @@ namespace lqnet.Forms
             this.indexDataGridViewTextBoxColumn.Name = "indexDataGridViewTextBoxColumn";
             this.indexDataGridViewTextBoxColumn.Width = 150;
             // 
-            // equitChildTypeDataGridViewTextBoxColumn
-            // 
-            this.equitChildTypeDataGridViewTextBoxColumn.DataPropertyName = "equitChildType";
-            this.equitChildTypeDataGridViewTextBoxColumn.HeaderText = "设备类型";
-            this.equitChildTypeDataGridViewTextBoxColumn.MinimumWidth = 8;
-            this.equitChildTypeDataGridViewTextBoxColumn.Name = "equitChildTypeDataGridViewTextBoxColumn";
-            this.equitChildTypeDataGridViewTextBoxColumn.Width = 150;
-            // 
             // propertyCodeDataGridViewTextBoxColumn
             // 
             this.propertyCodeDataGridViewTextBoxColumn.DataPropertyName = "propertyCode";
@@ -122,6 +126,14 @@ namespace lqnet.Forms
             this.equitNameDataGridViewTextBoxColumn.Name = "equitNameDataGridViewTextBoxColumn";
             this.equitNameDataGridViewTextBoxColumn.Width = 150;
             // 
+            // equitChildTypeDataGridViewTextBoxColumn
+            // 
+            this.equitChildTypeDataGridViewTextBoxColumn.DataPropertyName = "equitChildType";
+            this.equitChildTypeDataGridViewTextBoxColumn.HeaderText = "设备类型";
+            this.equitChildTypeDataGridViewTextBoxColumn.MinimumWidth = 8;
+            this.equitChildTypeDataGridViewTextBoxColumn.Name = "equitChildTypeDataGridViewTextBoxColumn";
+            this.equitChildTypeDataGridViewTextBoxColumn.Width = 150;
+            // 
             // manageEquitCodeDataGridViewTextBoxColumn
             // 
             this.manageEquitCodeDataGridViewTextBoxColumn.DataPropertyName = "manageEquitCode";
@@ -145,7 +157,7 @@ namespace lqnet.Forms
             // pageHelper2
             // 
             this.pageHelper2.AllPage = 1;
-            this.pageHelper2.Location = new System.Drawing.Point(-46, 374);
+            this.pageHelper2.Location = new System.Drawing.Point(-46, 414);
             this.pageHelper2.Margin = new System.Windows.Forms.Padding(2);
             this.pageHelper2.Name = "pageHelper2";
             this.pageHelper2.NowPage = 1;
@@ -163,7 +175,7 @@ namespace lqnet.Forms
             this.okBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
             this.okBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.okBtn.ForeColor = System.Drawing.Color.White;
-            this.okBtn.Location = new System.Drawing.Point(630, 466);
+            this.okBtn.Location = new System.Drawing.Point(630, 481);
             this.okBtn.Name = "okBtn";
             this.okBtn.Size = new System.Drawing.Size(131, 46);
             this.okBtn.TabIndex = 22;
@@ -179,7 +191,7 @@ namespace lqnet.Forms
             this.cancelBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
             this.cancelBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cancelBtn.ForeColor = System.Drawing.Color.White;
-            this.cancelBtn.Location = new System.Drawing.Point(797, 466);
+            this.cancelBtn.Location = new System.Drawing.Point(797, 481);
             this.cancelBtn.Name = "cancelBtn";
             this.cancelBtn.Size = new System.Drawing.Size(125, 46);
             this.cancelBtn.TabIndex = 23;
@@ -212,7 +224,7 @@ namespace lqnet.Forms
             this.searchBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
             this.searchBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.searchBtn.ForeColor = System.Drawing.Color.White;
-            this.searchBtn.Location = new System.Drawing.Point(450, 22);
+            this.searchBtn.Location = new System.Drawing.Point(781, 67);
             this.searchBtn.Name = "searchBtn";
             this.searchBtn.Size = new System.Drawing.Size(112, 39);
             this.searchBtn.TabIndex = 26;
@@ -227,7 +239,7 @@ namespace lqnet.Forms
             this.resetBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
             this.resetBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.resetBtn.ForeColor = System.Drawing.Color.Blue;
-            this.resetBtn.Location = new System.Drawing.Point(318, 22);
+            this.resetBtn.Location = new System.Drawing.Point(649, 67);
             this.resetBtn.Name = "resetBtn";
             this.resetBtn.Size = new System.Drawing.Size(112, 39);
             this.resetBtn.TabIndex = 27;
@@ -235,9 +247,69 @@ namespace lqnet.Forms
             this.resetBtn.UseVisualStyleBackColor = false;
             this.resetBtn.Click += new System.EventHandler(this.resetBtn_Click);
             // 
+            // deviceNameTb
+            // 
+            this.deviceNameTb.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.deviceNameTb.Location = new System.Drawing.Point(439, 31);
+            this.deviceNameTb.Name = "deviceNameTb";
+            this.deviceNameTb.Size = new System.Drawing.Size(173, 24);
+            this.deviceNameTb.TabIndex = 29;
+            // 
+            // deviceNameLabel
+            // 
+            this.deviceNameLabel.AutoSize = true;
+            this.deviceNameLabel.Location = new System.Drawing.Point(339, 34);
+            this.deviceNameLabel.Name = "deviceNameLabel";
+            this.deviceNameLabel.Size = new System.Drawing.Size(94, 21);
+            this.deviceNameLabel.TabIndex = 28;
+            this.deviceNameLabel.Text = "设备名称";
+            // 
+            // prodtFactoryTb
+            // 
+            this.prodtFactoryTb.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.prodtFactoryTb.Location = new System.Drawing.Point(439, 73);
+            this.prodtFactoryTb.Name = "prodtFactoryTb";
+            this.prodtFactoryTb.Size = new System.Drawing.Size(173, 24);
+            this.prodtFactoryTb.TabIndex = 33;
+            // 
+            // prodtFactoryLabel
+            // 
+            this.prodtFactoryLabel.AutoSize = true;
+            this.prodtFactoryLabel.Location = new System.Drawing.Point(339, 76);
+            this.prodtFactoryLabel.Name = "prodtFactoryLabel";
+            this.prodtFactoryLabel.Size = new System.Drawing.Size(94, 21);
+            this.prodtFactoryLabel.TabIndex = 32;
+            this.prodtFactoryLabel.Text = "生产厂家";
+            // 
+            // manageCodeTb
+            // 
+            this.manageCodeTb.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.manageCodeTb.Location = new System.Drawing.Point(125, 73);
+            this.manageCodeTb.Name = "manageCodeTb";
+            this.manageCodeTb.Size = new System.Drawing.Size(173, 24);
+            this.manageCodeTb.TabIndex = 31;
+            // 
+            // mangeCodeLabel
+            // 
+            this.mangeCodeLabel.AutoSize = true;
+            this.mangeCodeLabel.Location = new System.Drawing.Point(25, 76);
+            this.mangeCodeLabel.Name = "mangeCodeLabel";
+            this.mangeCodeLabel.Size = new System.Drawing.Size(94, 21);
+            this.mangeCodeLabel.TabIndex = 30;
+            this.mangeCodeLabel.Text = "管理编号";
+            // 
             // DevicePopupForm
             // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScroll = true;
             this.ClientSize = new System.Drawing.Size(961, 536);
+            this.Controls.Add(this.prodtFactoryTb);
+            this.Controls.Add(this.prodtFactoryLabel);
+            this.Controls.Add(this.manageCodeTb);
+            this.Controls.Add(this.mangeCodeLabel);
+            this.Controls.Add(this.deviceNameTb);
+            this.Controls.Add(this.deviceNameLabel);
             this.Controls.Add(this.resetBtn);
             this.Controls.Add(this.searchBtn);
             this.Controls.Add(this.deviceNoTb);
@@ -352,15 +424,32 @@ namespace lqnet.Forms
         private void searchDevice()
         {
             string deviceNo = this.deviceNoTb.Text;
+            this.pageHelper2.PageSize = 10;
             DeviceQueryDTO dto = new DeviceQueryDTO()
             {
                 pageNum = this.pageHelper2.NowPage,
                 pageSize = this.pageHelper2.PageSize
             };
-            if(!string.IsNullOrEmpty(deviceNo))
+            if(!string.IsNullOrEmpty(deviceNo) && string.IsNullOrWhiteSpace(deviceNo))
             {
                 dto.propertyCode = deviceNo;
             }
+            string manageCode = this.manageCodeTb.Text;
+            if (!string.IsNullOrEmpty(manageCode) && !string.IsNullOrWhiteSpace(manageCode)) 
+            {
+                dto.manageEquitCode = manageCode;
+            }
+            string deviceName = this.deviceNameTb.Text;
+            if (!string.IsNullOrEmpty(deviceName) && !string.IsNullOrWhiteSpace(deviceName))
+            {
+                dto.equitName = deviceName;
+            }
+            string prodtFactory = this.prodtFactoryTb.Text;
+            if (!string.IsNullOrEmpty(prodtFactory) && !string.IsNullOrWhiteSpace(prodtFactory))
+            {
+                dto.prodeFactory = prodtFactory;
+            }
+
             R rs = CallApi.queryDeviceList(dto);
             if (rs.Code == MyConstants.CODE_SUCCESS_200)
             {

lqnet/Forms/DevicePopupForm.resx

@@ -117,24 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="propertyCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="equitName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="equitChildType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="manageEquitCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="equitParameter.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="deviceListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

lqnet/Forms/LoginForm.Designer.cs

@@ -66,6 +66,9 @@ namespace lqnet
             // 
             // pwd_textBox
             // 
+            this.pwd_textBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.pwd_textBox.BackColor = System.Drawing.SystemColors.Window;
             this.pwd_textBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.pwd_textBox.Font = new System.Drawing.Font("宋体", 12F);
@@ -78,6 +81,9 @@ namespace lqnet
             // 
             // mindPwd
             // 
+            this.mindPwd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.mindPwd.AutoSize = true;
             this.mindPwd.BackColor = System.Drawing.Color.Transparent;
             this.mindPwd.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F);
@@ -92,6 +98,9 @@ namespace lqnet
             // 
             // userName
             // 
+            this.userName.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.userName.AutoSize = true;
             this.userName.BackColor = System.Drawing.Color.Transparent;
             this.userName.Font = new System.Drawing.Font("Microsoft YaHei UI", 11F);
@@ -104,6 +113,9 @@ namespace lqnet
             // 
             // userName_textBox
             // 
+            this.userName_textBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.userName_textBox.BackColor = System.Drawing.SystemColors.Window;
             this.userName_textBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.userName_textBox.Font = new System.Drawing.Font("宋体", 12F);
@@ -116,6 +128,9 @@ namespace lqnet
             // 
             // login_button
             // 
+            this.login_button.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.login_button.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.login_button.FlatAppearance.BorderSize = 0;
             this.login_button.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -145,6 +160,9 @@ namespace lqnet
             // 
             // Ip_set
             // 
+            this.Ip_set.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.Ip_set.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.Ip_set.FlatAppearance.BorderSize = 0;
             this.Ip_set.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -161,6 +179,9 @@ namespace lqnet
             // 
             // deviceLabel
             // 
+            this.deviceLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.deviceLabel.AutoSize = true;
             this.deviceLabel.BackColor = System.Drawing.Color.Transparent;
             this.deviceLabel.Font = new System.Drawing.Font("Microsoft YaHei UI", 11F);
@@ -173,6 +194,9 @@ namespace lqnet
             // 
             // deviceListCombox
             // 
+            this.deviceListCombox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.deviceListCombox.Enabled = false;
             this.deviceListCombox.Font = new System.Drawing.Font("宋体", 12F);
             this.deviceListCombox.FormattingEnabled = true;
@@ -185,6 +209,9 @@ namespace lqnet
             // 
             // chooseDeviceBtn
             // 
+            this.chooseDeviceBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.chooseDeviceBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.chooseDeviceBtn.FlatAppearance.BorderSize = 0;
             this.chooseDeviceBtn.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -202,6 +229,9 @@ namespace lqnet
             // 
             // ipLabel
             // 
+            this.ipLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.ipLabel.AutoSize = true;
             this.ipLabel.BackColor = System.Drawing.Color.Transparent;
             this.ipLabel.Font = new System.Drawing.Font("Microsoft YaHei UI", 11F);
@@ -214,6 +244,9 @@ namespace lqnet
             // 
             // addressShowLabel
             // 
+            this.addressShowLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.addressShowLabel.BackColor = System.Drawing.Color.Transparent;
             this.addressShowLabel.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.addressShowLabel.ForeColor = System.Drawing.Color.Black;
@@ -237,7 +270,9 @@ namespace lqnet
             // 
             // LoginForm
             // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoSize = true;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.ClientSize = new System.Drawing.Size(594, 395);
             this.Controls.Add(this.label1);
@@ -260,9 +295,9 @@ namespace lqnet
             this.MaximizeBox = false;
             this.Name = "LoginForm";
             this.Text = "TDM测试台数据传输终端";
-            this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Login_KeyUp);
             this.Load += new System.EventHandler(this.Login_Load);
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.Boder_Paint);
+            this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Login_KeyUp);
             this.ResumeLayout(false);
             this.PerformLayout();
 

lqnet/Forms/MainForm.Designer.cs

@@ -51,20 +51,12 @@ namespace lqnet.Forms
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             this.prodtDesig_sel = new System.Windows.Forms.TextBox();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
             this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.prodtDesigDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.numDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.groupOrderCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.proceNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.prodtBatchDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.groupProceIdDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.groupProceCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.taskListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.CheckItemComboBox = new System.Windows.Forms.ComboBox();
             this.slectBt = new System.Windows.Forms.Button();
             this.selectFileBt = new System.Windows.Forms.Button();
@@ -76,12 +68,7 @@ namespace lqnet.Forms
             this.mergeCountTextbox = new System.Windows.Forms.NumericUpDown();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.dataGridView2 = new System.Windows.Forms.DataGridView();
-            this.indexDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.importColLabelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lineColLabelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewComboBoxColumn();
-            this.reportColListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.parseReportBtn = new System.Windows.Forms.Button();
-            this.pageHelper2 = new lqnet.Utils.PageHelper2();
             this.label1 = new System.Windows.Forms.Label();
             this.currentFilePath = new System.Windows.Forms.Label();
             this.choosedFileLabel = new System.Windows.Forms.Label();
@@ -91,15 +78,31 @@ namespace lqnet.Forms
             this.linkLabel1 = new System.Windows.Forms.LinkLabel();
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.pageHelper2 = new lqnet.Utils.PageHelper2();
+            this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtDesigDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.numDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupOrderCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.proceNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtBatchDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupProceIdDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupProceCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.taskListBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.indexDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.importColLabelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lineColLabelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewComboBoxColumn();
+            this.reportColListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.mergeCountTextbox)).BeginInit();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.reportColListBindingSource)).BeginInit();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.reportColListBindingSource)).BeginInit();
             this.SuspendLayout();
             // 
             // prodtDesig_sel
@@ -117,8 +120,8 @@ namespace lqnet.Forms
             this.dataGridView1.AutoGenerateColumns = false;
             this.dataGridView1.BackgroundColor = System.Drawing.Color.SkyBlue;
             this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F);
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F);
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Index,
@@ -131,6 +134,14 @@ namespace lqnet.Forms
             this.groupProceIdDataGridViewTextBoxColumn,
             this.groupProceCodeDataGridViewTextBoxColumn});
             this.dataGridView1.DataSource = this.taskListBindingSource;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 14F);
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle5;
             this.dataGridView1.Location = new System.Drawing.Point(8, 81);
             this.dataGridView1.MultiSelect = false;
             this.dataGridView1.Name = "dataGridView1";
@@ -152,85 +163,6 @@ namespace lqnet.Forms
             this.Index.ReadOnly = true;
             this.Index.Width = 110;
             // 
-            // idDataGridViewTextBoxColumn
-            // 
-            this.idDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderId";
-            this.idDataGridViewTextBoxColumn.HeaderText = "调度单id";
-            this.idDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.idDataGridViewTextBoxColumn.Name = "idDataGridViewTextBoxColumn";
-            this.idDataGridViewTextBoxColumn.ReadOnly = true;
-            this.idDataGridViewTextBoxColumn.Visible = false;
-            this.idDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // prodtDesigDataGridViewTextBoxColumn
-            // 
-            this.prodtDesigDataGridViewTextBoxColumn.DataPropertyName = "ProdtDesig";
-            this.prodtDesigDataGridViewTextBoxColumn.HeaderText = "产品代号";
-            this.prodtDesigDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.prodtDesigDataGridViewTextBoxColumn.Name = "prodtDesigDataGridViewTextBoxColumn";
-            this.prodtDesigDataGridViewTextBoxColumn.ReadOnly = true;
-            this.prodtDesigDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // numDataGridViewTextBoxColumn
-            // 
-            this.numDataGridViewTextBoxColumn.DataPropertyName = "PlanAmt";
-            this.numDataGridViewTextBoxColumn.HeaderText = "数量";
-            this.numDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.numDataGridViewTextBoxColumn.Name = "numDataGridViewTextBoxColumn";
-            this.numDataGridViewTextBoxColumn.ReadOnly = true;
-            this.numDataGridViewTextBoxColumn.Width = 110;
-            // 
-            // groupOrderCodeDataGridViewTextBoxColumn
-            // 
-            this.groupOrderCodeDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderCode";
-            this.groupOrderCodeDataGridViewTextBoxColumn.HeaderText = "调度单号";
-            this.groupOrderCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.groupOrderCodeDataGridViewTextBoxColumn.Name = "groupOrderCodeDataGridViewTextBoxColumn";
-            this.groupOrderCodeDataGridViewTextBoxColumn.ReadOnly = true;
-            this.groupOrderCodeDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // proceNameDataGridViewTextBoxColumn
-            // 
-            this.proceNameDataGridViewTextBoxColumn.DataPropertyName = "ProceName";
-            this.proceNameDataGridViewTextBoxColumn.HeaderText = "工序名称";
-            this.proceNameDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.proceNameDataGridViewTextBoxColumn.Name = "proceNameDataGridViewTextBoxColumn";
-            this.proceNameDataGridViewTextBoxColumn.ReadOnly = true;
-            this.proceNameDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // prodtBatchDataGridViewTextBoxColumn
-            // 
-            this.prodtBatchDataGridViewTextBoxColumn.DataPropertyName = "ProdtBatch";
-            this.prodtBatchDataGridViewTextBoxColumn.HeaderText = "生产批次";
-            this.prodtBatchDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.prodtBatchDataGridViewTextBoxColumn.Name = "prodtBatchDataGridViewTextBoxColumn";
-            this.prodtBatchDataGridViewTextBoxColumn.ReadOnly = true;
-            this.prodtBatchDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // groupProceIdDataGridViewTextBoxColumn
-            // 
-            this.groupProceIdDataGridViewTextBoxColumn.DataPropertyName = "GroupProceId";
-            this.groupProceIdDataGridViewTextBoxColumn.HeaderText = "工序id";
-            this.groupProceIdDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.groupProceIdDataGridViewTextBoxColumn.Name = "groupProceIdDataGridViewTextBoxColumn";
-            this.groupProceIdDataGridViewTextBoxColumn.ReadOnly = true;
-            this.groupProceIdDataGridViewTextBoxColumn.Visible = false;
-            this.groupProceIdDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // groupProceCodeDataGridViewTextBoxColumn
-            // 
-            this.groupProceCodeDataGridViewTextBoxColumn.DataPropertyName = "ProceCode";
-            this.groupProceCodeDataGridViewTextBoxColumn.HeaderText = "工序编号";
-            this.groupProceCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.groupProceCodeDataGridViewTextBoxColumn.Name = "groupProceCodeDataGridViewTextBoxColumn";
-            this.groupProceCodeDataGridViewTextBoxColumn.ReadOnly = true;
-            this.groupProceCodeDataGridViewTextBoxColumn.Visible = false;
-            this.groupProceCodeDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // taskListBindingSource
-            // 
-            this.taskListBindingSource.DataSource = typeof(lqnet.Entities.Tasks);
-            // 
             // CheckItemComboBox
             // 
             this.CheckItemComboBox.DisplayMember = "checkName";
@@ -368,8 +300,8 @@ namespace lqnet.Forms
             this.dataGridView2.AutoGenerateColumns = false;
             this.dataGridView2.BackgroundColor = System.Drawing.Color.SkyBlue;
             this.dataGridView2.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
-            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 14F);
+            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
             this.dataGridView2.ColumnHeadersHeight = 40;
             this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.indexDataGridViewTextBoxColumn,
@@ -377,50 +309,17 @@ namespace lqnet.Forms
             this.lineColLabelDataGridViewTextBoxColumn});
             this.dataGridView2.DataSource = this.reportColListBindingSource;
             this.dataGridView2.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.dataGridView2.Font = new System.Drawing.Font("宋体", 14F);
             this.dataGridView2.Location = new System.Drawing.Point(10, 23);
             this.dataGridView2.MultiSelect = false;
             this.dataGridView2.Name = "dataGridView2";
             this.dataGridView2.RowHeadersVisible = false;
             this.dataGridView2.RowHeadersWidth = 82;
             this.dataGridView2.RowTemplate.Height = 50;
-            this.dataGridView2.Font = new Font("宋体", 14); // 设置单元格的文字大小
             this.dataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dataGridView2.ShowCellToolTips = false;
             this.dataGridView2.Size = new System.Drawing.Size(781, 391);
             this.dataGridView2.TabIndex = 34;
-            // 设置单元格的文字大小
-            dataGridView1.DefaultCellStyle.Font = new Font("宋体", 14); // 设置单元格的文字大小
-            // 
-            // indexDataGridViewTextBoxColumn
-            // 
-            this.indexDataGridViewTextBoxColumn.DataPropertyName = "Index";
-            this.indexDataGridViewTextBoxColumn.HeaderText = "序号";
-            this.indexDataGridViewTextBoxColumn.MinimumWidth = 8;
-            this.indexDataGridViewTextBoxColumn.Name = "indexDataGridViewTextBoxColumn";
-            this.indexDataGridViewTextBoxColumn.ReadOnly = true;
-            this.indexDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // importColLabelDataGridViewTextBoxColumn
-            // 
-            this.importColLabelDataGridViewTextBoxColumn.DataPropertyName = "importColLabel";
-            this.importColLabelDataGridViewTextBoxColumn.HeaderText = "导入报告列标签";
-            this.importColLabelDataGridViewTextBoxColumn.MinimumWidth = 8;
-            this.importColLabelDataGridViewTextBoxColumn.Name = "importColLabelDataGridViewTextBoxColumn";
-            this.importColLabelDataGridViewTextBoxColumn.ReadOnly = true;
-            this.importColLabelDataGridViewTextBoxColumn.Width = 250;
-            // 
-            // lineColLabelDataGridViewTextBoxColumn
-            // 
-            this.lineColLabelDataGridViewTextBoxColumn.DataPropertyName = "cellEn";
-            this.lineColLabelDataGridViewTextBoxColumn.HeaderText = "线上指标名称";
-            this.lineColLabelDataGridViewTextBoxColumn.MinimumWidth = 8;
-            this.lineColLabelDataGridViewTextBoxColumn.Name = "lineColLabelDataGridViewTextBoxColumn";
-            this.lineColLabelDataGridViewTextBoxColumn.Width = 250;
-            this.lineColLabelDataGridViewTextBoxColumn.DefaultCellStyle.Padding = new Padding(0, (dataGridView1.RowTemplate.Height - 21) / 2, 0, 0); // 设置单元格内边距
-            // 
-            // reportColListBindingSource
-            // 
-            this.reportColListBindingSource.DataSource = typeof(lqnet.Entities.ReportCol);
             // 
             // parseReportBtn
             // 
@@ -439,19 +338,6 @@ namespace lqnet.Forms
             this.parseReportBtn.UseVisualStyleBackColor = false;
             this.parseReportBtn.Click += new System.EventHandler(this.parseReportBtn_Click);
             // 
-            // pageHelper2
-            // 
-            this.pageHelper2.AllPage = 1;
-            this.pageHelper2.Location = new System.Drawing.Point(290, 482);
-            this.pageHelper2.Margin = new System.Windows.Forms.Padding(2);
-            this.pageHelper2.Name = "pageHelper2";
-            this.pageHelper2.NowPage = 1;
-            this.pageHelper2.PageSize = 5;
-            this.pageHelper2.Size = new System.Drawing.Size(811, 56);
-            this.pageHelper2.TabIndex = 20;
-            this.pageHelper2.Total = 0;
-            this.pageHelper2.Load += new System.EventHandler(this.PageHelper2_Load);
-            // 
             // label1
             // 
             this.label1.AutoSize = true;
@@ -488,7 +374,7 @@ namespace lqnet.Forms
             this.groupBox2.Controls.Add(this.prodtDesig_sel);
             this.groupBox2.Controls.Add(this.dataGridView1);
             this.groupBox2.Controls.Add(this.slectBt);
-            this.groupBox2.Location = new System.Drawing.Point(12, 12);
+            this.groupBox2.Location = new System.Drawing.Point(3, 0);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Size = new System.Drawing.Size(1101, 557);
             this.groupBox2.TabIndex = 0;
@@ -509,7 +395,7 @@ namespace lqnet.Forms
             this.groupBox3.Controls.Add(this.startIdxTextbox);
             this.groupBox3.Controls.Add(this.mergeCountLabel);
             this.groupBox3.Controls.Add(this.checkLabel);
-            this.groupBox3.Location = new System.Drawing.Point(12, 555);
+            this.groupBox3.Location = new System.Drawing.Point(12, 562);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Size = new System.Drawing.Size(1101, 548);
             this.groupBox3.TabIndex = 39;
@@ -522,7 +408,7 @@ namespace lqnet.Forms
             this.panel1.Controls.Add(this.linkLabel1);
             this.panel1.Controls.Add(this.label3);
             this.panel1.Controls.Add(this.label2);
-            this.panel1.Location = new System.Drawing.Point(12, 1096);
+            this.panel1.Location = new System.Drawing.Point(6, 1101);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(1101, 48);
             this.panel1.TabIndex = 40;
@@ -560,13 +446,147 @@ namespace lqnet.Forms
             this.label2.TabIndex = 0;
             this.label2.Text = "成都晶格智汇科技有限公司";
             // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.groupBox2);
+            this.panel2.Controls.Add(this.panel1);
+            this.panel2.Controls.Add(this.groupBox3);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(1112, 568);
+            this.panel2.TabIndex = 41;
+            // 
+            // pageHelper2
+            // 
+            this.pageHelper2.AllPage = 1;
+            this.pageHelper2.AutoScroll = true;
+            this.pageHelper2.Location = new System.Drawing.Point(290, 482);
+            this.pageHelper2.Margin = new System.Windows.Forms.Padding(2);
+            this.pageHelper2.Name = "pageHelper2";
+            this.pageHelper2.NowPage = 1;
+            this.pageHelper2.PageSize = 5;
+            this.pageHelper2.Size = new System.Drawing.Size(811, 56);
+            this.pageHelper2.TabIndex = 20;
+            this.pageHelper2.Total = 0;
+            this.pageHelper2.Load += new System.EventHandler(this.PageHelper2_Load);
+            // 
+            // idDataGridViewTextBoxColumn
+            // 
+            this.idDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderId";
+            this.idDataGridViewTextBoxColumn.HeaderText = "调度单id";
+            this.idDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.idDataGridViewTextBoxColumn.Name = "idDataGridViewTextBoxColumn";
+            this.idDataGridViewTextBoxColumn.ReadOnly = true;
+            this.idDataGridViewTextBoxColumn.Visible = false;
+            this.idDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // prodtDesigDataGridViewTextBoxColumn
+            // 
+            this.prodtDesigDataGridViewTextBoxColumn.DataPropertyName = "ProdtDesig";
+            this.prodtDesigDataGridViewTextBoxColumn.HeaderText = "产品代号";
+            this.prodtDesigDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtDesigDataGridViewTextBoxColumn.Name = "prodtDesigDataGridViewTextBoxColumn";
+            this.prodtDesigDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtDesigDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // numDataGridViewTextBoxColumn
+            // 
+            this.numDataGridViewTextBoxColumn.DataPropertyName = "PlanAmt";
+            this.numDataGridViewTextBoxColumn.HeaderText = "数量";
+            this.numDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.numDataGridViewTextBoxColumn.Name = "numDataGridViewTextBoxColumn";
+            this.numDataGridViewTextBoxColumn.ReadOnly = true;
+            this.numDataGridViewTextBoxColumn.Width = 110;
+            // 
+            // groupOrderCodeDataGridViewTextBoxColumn
+            // 
+            this.groupOrderCodeDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderCode";
+            this.groupOrderCodeDataGridViewTextBoxColumn.HeaderText = "调度单号";
+            this.groupOrderCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupOrderCodeDataGridViewTextBoxColumn.Name = "groupOrderCodeDataGridViewTextBoxColumn";
+            this.groupOrderCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupOrderCodeDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // proceNameDataGridViewTextBoxColumn
+            // 
+            this.proceNameDataGridViewTextBoxColumn.DataPropertyName = "ProceName";
+            this.proceNameDataGridViewTextBoxColumn.HeaderText = "工序名称";
+            this.proceNameDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.proceNameDataGridViewTextBoxColumn.Name = "proceNameDataGridViewTextBoxColumn";
+            this.proceNameDataGridViewTextBoxColumn.ReadOnly = true;
+            this.proceNameDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // prodtBatchDataGridViewTextBoxColumn
+            // 
+            this.prodtBatchDataGridViewTextBoxColumn.DataPropertyName = "ProdtBatch";
+            this.prodtBatchDataGridViewTextBoxColumn.HeaderText = "生产批次";
+            this.prodtBatchDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtBatchDataGridViewTextBoxColumn.Name = "prodtBatchDataGridViewTextBoxColumn";
+            this.prodtBatchDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtBatchDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // groupProceIdDataGridViewTextBoxColumn
+            // 
+            this.groupProceIdDataGridViewTextBoxColumn.DataPropertyName = "GroupProceId";
+            this.groupProceIdDataGridViewTextBoxColumn.HeaderText = "工序id";
+            this.groupProceIdDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupProceIdDataGridViewTextBoxColumn.Name = "groupProceIdDataGridViewTextBoxColumn";
+            this.groupProceIdDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupProceIdDataGridViewTextBoxColumn.Visible = false;
+            this.groupProceIdDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // groupProceCodeDataGridViewTextBoxColumn
+            // 
+            this.groupProceCodeDataGridViewTextBoxColumn.DataPropertyName = "ProceCode";
+            this.groupProceCodeDataGridViewTextBoxColumn.HeaderText = "工序编号";
+            this.groupProceCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupProceCodeDataGridViewTextBoxColumn.Name = "groupProceCodeDataGridViewTextBoxColumn";
+            this.groupProceCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupProceCodeDataGridViewTextBoxColumn.Visible = false;
+            this.groupProceCodeDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // taskListBindingSource
+            // 
+            this.taskListBindingSource.DataSource = typeof(lqnet.Entities.Tasks);
+            // 
+            // indexDataGridViewTextBoxColumn
+            // 
+            this.indexDataGridViewTextBoxColumn.DataPropertyName = "Index";
+            this.indexDataGridViewTextBoxColumn.HeaderText = "序号";
+            this.indexDataGridViewTextBoxColumn.MinimumWidth = 8;
+            this.indexDataGridViewTextBoxColumn.Name = "indexDataGridViewTextBoxColumn";
+            this.indexDataGridViewTextBoxColumn.ReadOnly = true;
+            this.indexDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // importColLabelDataGridViewTextBoxColumn
+            // 
+            this.importColLabelDataGridViewTextBoxColumn.DataPropertyName = "importColLabel";
+            this.importColLabelDataGridViewTextBoxColumn.HeaderText = "导入报告列标签";
+            this.importColLabelDataGridViewTextBoxColumn.MinimumWidth = 8;
+            this.importColLabelDataGridViewTextBoxColumn.Name = "importColLabelDataGridViewTextBoxColumn";
+            this.importColLabelDataGridViewTextBoxColumn.ReadOnly = true;
+            this.importColLabelDataGridViewTextBoxColumn.Width = 250;
+            // 
+            // lineColLabelDataGridViewTextBoxColumn
+            // 
+            this.lineColLabelDataGridViewTextBoxColumn.DataPropertyName = "cellEn";
+            this.lineColLabelDataGridViewTextBoxColumn.HeaderText = "线上指标名称";
+            this.lineColLabelDataGridViewTextBoxColumn.MinimumWidth = 8;
+            this.lineColLabelDataGridViewTextBoxColumn.Name = "lineColLabelDataGridViewTextBoxColumn";
+            this.lineColLabelDataGridViewTextBoxColumn.Width = 250;
+            // 
+            // reportColListBindingSource
+            // 
+            this.reportColListBindingSource.DataSource = typeof(lqnet.Entities.ReportCol);
+            // 
             // MainForm
             // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.ClientSize = new System.Drawing.Size(1123, 1147);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.groupBox2);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScroll = true;
+            this.ClientSize = new System.Drawing.Size(1112, 568);
+            this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = global::lqnet.Properties.Resources.favicon;
             this.MaximizeBox = false;
@@ -576,17 +596,18 @@ namespace lqnet.Forms
             this.Shown += new System.EventHandler(this.MainForm_Shown);
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.Boder_Paint);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mergeCountTextbox)).EndInit();
             this.groupBox1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.reportColListBindingSource)).EndInit();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
             this.groupBox3.ResumeLayout(false);
             this.groupBox3.PerformLayout();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.reportColListBindingSource)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -630,5 +651,6 @@ namespace lqnet.Forms
         private LinkLabel linkLabel1;
         private Label label3;
         private Label label2;
+        private Panel panel2;
     }
 }

lqnet/Forms/MainForm.cs

@@ -54,10 +54,6 @@ namespace lqnet.Forms
         /// </summary>
         public List<DeviceConfigContext> _configContexts;
         /// <summary>
-        /// 适配产品列表
-        /// </summary>
-        public string prodts;
-        /// <summary>
         /// 指标上下文
         /// </summary>
         public List<ItemIndx> indexList;
@@ -151,34 +147,33 @@ namespace lqnet.Forms
         /// </summary>
         private void reloadDeviceConfig()
         {
-            //每次进入必须重新读取以获得适配产品信息
-            readConfigFromRemote();
-            ////先查询本地是否存在
-            //string filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "configs");
-            //if(!Directory.Exists(filePath))
-            //{
-            //    //不存在则创建目录
-            //    Directory.CreateDirectory(filePath);
-            //}
-            //string cofigPath = Path.Combine(filePath, _device.propertyCode + ".json");
-            //if(!File.Exists(cofigPath))
-            //{
-            //    readConfigFromRemote();
-            //} else
-            //{
-            //    //读取配置文件
-            //    using (System.IO.StreamReader file = System.IO.File.OpenText(cofigPath))
-            //    {
-            //        try
-            //        {
-            //            _configContexts = JsonConvert.DeserializeObject<List<DeviceConfigContext>>(file.ReadToEnd());
-            //        }
-            //        catch
-            //        {
-            //            //配置文件读取失败
-            //        }
-            //    }
-            //}
+            //先查询本地是否存在
+            string filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "configs");
+            if (!Directory.Exists(filePath))
+            {
+                //不存在则创建目录
+                Directory.CreateDirectory(filePath);
+            }
+            string cofigPath = Path.Combine(filePath, _device.propertyCode + ".json");
+            if (!File.Exists(cofigPath))
+            {
+                readConfigFromRemote();
+            }
+            else
+            {
+                //读取配置文件
+                using (System.IO.StreamReader file = System.IO.File.OpenText(cofigPath))
+                {
+                    try
+                    {
+                        _configContexts = JsonConvert.DeserializeObject<List<DeviceConfigContext>>(file.ReadToEnd());
+                    }
+                    catch
+                    {
+                        //配置文件读取失败
+                    }
+                }
+            }
         }
         /// <summary>
         /// 从远程服务器读取配置
@@ -194,7 +189,6 @@ namespace lqnet.Forms
                 {
                     config = JsonConvert.DeserializeObject<DeviceConfigs>(rs.Data.ToString());
                     _configContexts = JsonConvert.DeserializeObject<List<DeviceConfigContext>>(config.configs);
-                    prodts = string.IsNullOrEmpty(config.prodts) || string.IsNullOrWhiteSpace(config.prodts)? string.Empty: config.prodts;
                     //读取到文件后写入本地文件路径中
                     writeConfigToLocal();
                 }
@@ -394,20 +388,10 @@ namespace lqnet.Forms
         private void SelectTaskList()
         {
             Func_My_CheckItemComboBox_ClearAndInit();
-            if (!string.IsNullOrEmpty(this.prodts)
-                && !string.IsNullOrWhiteSpace(this.prodts)
-                && !string.IsNullOrEmpty(this.prodtDesig_sel.Text)
-                && !string.IsNullOrWhiteSpace(this.prodtDesig_sel.Text)
-                && !this.prodts.Split(',').Contains(this.prodtDesig_sel.Text))
-            {
-                this.taskListBindingSource.Clear();
-                MessageBox.Show("没有查到任务结果", "提示", MessageBoxButtons.OK);
-                return;
-            }
             R r = CallApi.SelectTasksList(new TaskSelectDTO
             {
                 ProdtDesig = this.prodtDesig_sel.Text,
-                ProdtCodes = string.IsNullOrEmpty(this.prodts) || string.IsNullOrWhiteSpace(this.prodts)?null: this.prodts,
+                AssetNo = this._device.propertyCode,
                 PageNum = this.pageHelper2.NowPage,
                 PageSize = this.pageHelper2.PageSize
             });

lqnet/Lqnet.csproj

@@ -14,7 +14,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
-    <PublishUrl>D:\code\林泉\非标数据集成接口\export\</PublishUrl>
+    <PublishUrl>G:\lqnet\publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -24,7 +24,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationRevision>6</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -79,8 +79,8 @@
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="MathNet.Numerics, Version=4.10.0.0, Culture=neutral, PublicKeyToken=cd8b63ad3d691a37, processorArchitecture=MSIL">
-      <HintPath>..\packages\MathNet.Numerics.Signed.4.10.0\lib\net40\MathNet.Numerics.dll</HintPath>
+    <Reference Include="MathNet.Numerics, Version=4.15.0.0, Culture=neutral, PublicKeyToken=cd8b63ad3d691a37, processorArchitecture=MSIL">
+      <HintPath>..\packages\MathNet.Numerics.Signed.4.15.0\lib\net461\MathNet.Numerics.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=2.3.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.2.3.2\lib\net462\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
@@ -89,17 +89,23 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.3.0\lib\net40\NPOI.dll</HintPath>
+    <Reference Include="NPOI.Core, Version=2.6.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.6.1\lib\netstandard2.0\NPOI.Core.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OOXML, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.3.0\lib\net40\NPOI.OOXML.dll</HintPath>
+    <Reference Include="NPOI.OOXML, Version=2.6.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.6.1\lib\netstandard2.0\NPOI.OOXML.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXml4Net, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.3.0\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
+    <Reference Include="NPOI.OpenXml4Net, Version=2.6.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.6.1\lib\netstandard2.0\NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXmlFormats, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPOI.2.3.0\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
+    <Reference Include="NPOI.OpenXmlFormats, Version=2.6.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.6.1\lib\netstandard2.0\NPOI.OpenXmlFormats.dll</HintPath>
+    </Reference>
+    <Reference Include="SixLabors.Fonts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL">
+      <HintPath>..\packages\SixLabors.Fonts.1.0.0\lib\netstandard2.0\SixLabors.Fonts.dll</HintPath>
+    </Reference>
+    <Reference Include="SixLabors.ImageSharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL">
+      <HintPath>..\packages\SixLabors.ImageSharp.2.1.4\lib\netstandard2.0\SixLabors.ImageSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -174,6 +180,9 @@
     <Compile Include="Entities\To\ReportColList.cs" />
     <Compile Include="Entities\To\TaskToList.cs" />
     <Compile Include="Entities\User.cs" />
+    <Compile Include="Forms\BaseForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\DevicePopupForm.cs">
       <SubType>Form</SubType>
     </Compile>