modify:修改界面

lqnet/Api/MyConstants.cs

@@ -33,7 +33,9 @@ namespace lqnet.Api
     }
     public class VariablesGlobal
     {
-        public static string IP_PORT = "http://10.60.102.253:8088/";
+        public static string IP_PORT = "http://10.60.102.252:8088/";
+        //public static string IP_PORT = "http://10.60.102.253:8088/";
+        //public static string IP_PORT = "http://192.168.1.4:8190/";
         public static string USER_TOKEN = "";
     }
 }

lqnet/Forms/DevicePopupForm.cs

@@ -58,7 +58,6 @@ namespace lqnet.Forms
         {
             this.components = new System.ComponentModel.Container();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.deviceListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
             this.okBtn = new System.Windows.Forms.Button();
             this.cancelBtn = new System.Windows.Forms.Button();
@@ -73,6 +72,7 @@ namespace lqnet.Forms
             this.manageCodeTb = new System.Windows.Forms.TextBox();
             this.mangeCodeLabel = new System.Windows.Forms.Label();
             this.pageHelper2 = new lqnet.Utils.PageHelper2();
+            this.deviceListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.indexDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.propertyCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.equitNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -86,6 +86,7 @@ namespace lqnet.Forms
             // 
             // dataGridView1
             // 
+            this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AutoGenerateColumns = false;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -99,16 +100,13 @@ namespace lqnet.Forms
             this.dataGridView1.DataSource = this.deviceListBindingSource;
             this.dataGridView1.Location = new System.Drawing.Point(13, 121);
             this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowHeadersWidth = 62;
             this.dataGridView1.RowTemplate.Height = 30;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dataGridView1.Size = new System.Drawing.Size(894, 278);
+            this.dataGridView1.Size = new System.Drawing.Size(1242, 265);
             this.dataGridView1.TabIndex = 0;
             // 
-            // deviceListBindingSource
-            // 
-            this.deviceListBindingSource.DataSource = typeof(lqnet.Entities.DeviceInfo);
-            // 
             // okBtn
             // 
             this.okBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
@@ -117,7 +115,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(604, 476);
+            this.okBtn.Location = new System.Drawing.Point(950, 476);
             this.okBtn.Name = "okBtn";
             this.okBtn.Size = new System.Drawing.Size(131, 46);
             this.okBtn.TabIndex = 22;
@@ -133,7 +131,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(771, 476);
+            this.cancelBtn.Location = new System.Drawing.Point(1105, 476);
             this.cancelBtn.Name = "cancelBtn";
             this.cancelBtn.Size = new System.Drawing.Size(125, 46);
             this.cancelBtn.TabIndex = 23;
@@ -144,9 +142,11 @@ namespace lqnet.Forms
             // deviceNoLabel
             // 
             this.deviceNoLabel.AutoSize = true;
+            this.deviceNoLabel.Font = new System.Drawing.Font("宋体", 11F);
+            this.deviceNoLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.deviceNoLabel.Location = new System.Drawing.Point(25, 34);
             this.deviceNoLabel.Name = "deviceNoLabel";
-            this.deviceNoLabel.Size = new System.Drawing.Size(94, 21);
+            this.deviceNoLabel.Size = new System.Drawing.Size(98, 22);
             this.deviceNoLabel.TabIndex = 24;
             this.deviceNoLabel.Text = "资产编号";
             // 
@@ -200,9 +200,11 @@ namespace lqnet.Forms
             // deviceNameLabel
             // 
             this.deviceNameLabel.AutoSize = true;
+            this.deviceNameLabel.Font = new System.Drawing.Font("宋体", 11F);
+            this.deviceNameLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.deviceNameLabel.Location = new System.Drawing.Point(339, 34);
             this.deviceNameLabel.Name = "deviceNameLabel";
-            this.deviceNameLabel.Size = new System.Drawing.Size(94, 21);
+            this.deviceNameLabel.Size = new System.Drawing.Size(98, 22);
             this.deviceNameLabel.TabIndex = 28;
             this.deviceNameLabel.Text = "设备名称";
             // 
@@ -217,9 +219,11 @@ namespace lqnet.Forms
             // prodtFactoryLabel
             // 
             this.prodtFactoryLabel.AutoSize = true;
+            this.prodtFactoryLabel.Font = new System.Drawing.Font("宋体", 11F);
+            this.prodtFactoryLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.prodtFactoryLabel.Location = new System.Drawing.Point(339, 76);
             this.prodtFactoryLabel.Name = "prodtFactoryLabel";
-            this.prodtFactoryLabel.Size = new System.Drawing.Size(94, 21);
+            this.prodtFactoryLabel.Size = new System.Drawing.Size(98, 22);
             this.prodtFactoryLabel.TabIndex = 32;
             this.prodtFactoryLabel.Text = "生产厂家";
             // 
@@ -234,32 +238,42 @@ namespace lqnet.Forms
             // mangeCodeLabel
             // 
             this.mangeCodeLabel.AutoSize = true;
+            this.mangeCodeLabel.Font = new System.Drawing.Font("宋体", 11F);
+            this.mangeCodeLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.mangeCodeLabel.Location = new System.Drawing.Point(25, 76);
             this.mangeCodeLabel.Name = "mangeCodeLabel";
-            this.mangeCodeLabel.Size = new System.Drawing.Size(94, 21);
+            this.mangeCodeLabel.Size = new System.Drawing.Size(98, 22);
             this.mangeCodeLabel.TabIndex = 30;
             this.mangeCodeLabel.Text = "管理编号";
             // 
             // pageHelper2
             // 
             this.pageHelper2.AllPage = 1;
-            this.pageHelper2.Location = new System.Drawing.Point(274, 404);
+            this.pageHelper2.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.pageHelper2.Location = new System.Drawing.Point(288, 401);
             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(999, 66);
+            this.pageHelper2.Size = new System.Drawing.Size(969, 66);
             this.pageHelper2.TabIndex = 21;
             this.pageHelper2.Total = 0;
             this.pageHelper2.Load += new System.EventHandler(this.PageHelper2_Load);
             // 
+            // deviceListBindingSource
+            // 
+            this.deviceListBindingSource.DataSource = typeof(lqnet.Entities.DeviceInfo);
+            // 
             // indexDataGridViewTextBoxColumn
             // 
             this.indexDataGridViewTextBoxColumn.DataPropertyName = "Index";
             this.indexDataGridViewTextBoxColumn.HeaderText = "序号";
             this.indexDataGridViewTextBoxColumn.MinimumWidth = 8;
             this.indexDataGridViewTextBoxColumn.Name = "indexDataGridViewTextBoxColumn";
-            this.indexDataGridViewTextBoxColumn.Width = 80;
+            this.indexDataGridViewTextBoxColumn.ReadOnly = true;
+            this.indexDataGridViewTextBoxColumn.Width = 60;
             // 
             // propertyCodeDataGridViewTextBoxColumn
             // 
@@ -267,7 +281,8 @@ namespace lqnet.Forms
             this.propertyCodeDataGridViewTextBoxColumn.HeaderText = "资产编号";
             this.propertyCodeDataGridViewTextBoxColumn.MinimumWidth = 8;
             this.propertyCodeDataGridViewTextBoxColumn.Name = "propertyCodeDataGridViewTextBoxColumn";
-            this.propertyCodeDataGridViewTextBoxColumn.Width = 130;
+            this.propertyCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.propertyCodeDataGridViewTextBoxColumn.Width = 110;
             // 
             // equitNameDataGridViewTextBoxColumn
             // 
@@ -275,7 +290,8 @@ namespace lqnet.Forms
             this.equitNameDataGridViewTextBoxColumn.HeaderText = "设备名称";
             this.equitNameDataGridViewTextBoxColumn.MinimumWidth = 8;
             this.equitNameDataGridViewTextBoxColumn.Name = "equitNameDataGridViewTextBoxColumn";
-            this.equitNameDataGridViewTextBoxColumn.Width = 150;
+            this.equitNameDataGridViewTextBoxColumn.ReadOnly = true;
+            this.equitNameDataGridViewTextBoxColumn.Width = 110;
             // 
             // equitChildTypeDataGridViewTextBoxColumn
             // 
@@ -283,6 +299,8 @@ namespace lqnet.Forms
             this.equitChildTypeDataGridViewTextBoxColumn.HeaderText = "设备类型";
             this.equitChildTypeDataGridViewTextBoxColumn.MinimumWidth = 8;
             this.equitChildTypeDataGridViewTextBoxColumn.Name = "equitChildTypeDataGridViewTextBoxColumn";
+            this.equitChildTypeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.equitChildTypeDataGridViewTextBoxColumn.Width = 110;
             // 
             // manageEquitCodeDataGridViewTextBoxColumn
             // 
@@ -290,6 +308,8 @@ namespace lqnet.Forms
             this.manageEquitCodeDataGridViewTextBoxColumn.HeaderText = "管理编号";
             this.manageEquitCodeDataGridViewTextBoxColumn.MinimumWidth = 8;
             this.manageEquitCodeDataGridViewTextBoxColumn.Name = "manageEquitCodeDataGridViewTextBoxColumn";
+            this.manageEquitCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.manageEquitCodeDataGridViewTextBoxColumn.Width = 110;
             // 
             // prodeFactory
             // 
@@ -297,7 +317,8 @@ namespace lqnet.Forms
             this.prodeFactory.HeaderText = "生产厂家";
             this.prodeFactory.MinimumWidth = 8;
             this.prodeFactory.Name = "prodeFactory";
-            this.prodeFactory.Width = 120;
+            this.prodeFactory.ReadOnly = true;
+            this.prodeFactory.Width = 130;
             // 
             // equitParameterDataGridViewTextBoxColumn
             // 
@@ -305,12 +326,16 @@ namespace lqnet.Forms
             this.equitParameterDataGridViewTextBoxColumn.HeaderText = "设备参数";
             this.equitParameterDataGridViewTextBoxColumn.MinimumWidth = 8;
             this.equitParameterDataGridViewTextBoxColumn.Name = "equitParameterDataGridViewTextBoxColumn";
-            this.equitParameterDataGridViewTextBoxColumn.Width = 150;
+            this.equitParameterDataGridViewTextBoxColumn.ReadOnly = true;
+            this.equitParameterDataGridViewTextBoxColumn.Width = 130;
             // 
             // DevicePopupForm
             // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-            this.ClientSize = new System.Drawing.Size(908, 534);
+            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(1268, 534);
             this.Controls.Add(this.prodtFactoryTb);
             this.Controls.Add(this.prodtFactoryLabel);
             this.Controls.Add(this.manageCodeTb);
@@ -326,6 +351,7 @@ namespace lqnet.Forms
             this.Controls.Add(this.pageHelper2);
             this.Controls.Add(this.dataGridView1);
             this.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = global::lqnet.Properties.Resources.favicon;
             this.Name = "DevicePopupForm";
             this.Text = "选择设备";
@@ -431,7 +457,7 @@ namespace lqnet.Forms
         private void searchDevice()
         {
             string deviceNo = this.deviceNoTb.Text;
-            this.pageHelper2.PageSize = 10;
+            this.pageHelper2.PageSize = 5;
             DeviceQueryDTO dto = new DeviceQueryDTO()
             {
                 pageNum = this.pageHelper2.NowPage,

lqnet/Forms/LoginForm.Designer.cs

@@ -72,7 +72,7 @@ namespace lqnet
             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);
-            this.pwd_textBox.Location = new System.Drawing.Point(216, 72);
+            this.pwd_textBox.Location = new System.Drawing.Point(215, 68);
             this.pwd_textBox.Name = "pwd_textBox";
             this.pwd_textBox.PasswordChar = '*';
             this.pwd_textBox.Size = new System.Drawing.Size(238, 28);
@@ -103,11 +103,11 @@ namespace lqnet
             | 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);
+            this.userName.Font = new System.Drawing.Font("宋体", 11F);
             this.userName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.userName.Location = new System.Drawing.Point(111, 21);
             this.userName.Name = "userName";
-            this.userName.Size = new System.Drawing.Size(79, 30);
+            this.userName.Size = new System.Drawing.Size(76, 22);
             this.userName.TabIndex = 6;
             this.userName.Text = "用户名";
             // 
@@ -119,7 +119,7 @@ namespace lqnet
             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);
-            this.userName_textBox.Location = new System.Drawing.Point(217, 24);
+            this.userName_textBox.Location = new System.Drawing.Point(216, 19);
             this.userName_textBox.Margin = new System.Windows.Forms.Padding(3, 30, 3, 3);
             this.userName_textBox.Name = "userName_textBox";
             this.userName_textBox.Size = new System.Drawing.Size(237, 28);
@@ -150,11 +150,11 @@ namespace lqnet
             // 
             this.pwd.AutoSize = true;
             this.pwd.BackColor = System.Drawing.Color.Transparent;
-            this.pwd.Font = new System.Drawing.Font("Microsoft YaHei UI", 11F);
+            this.pwd.Font = new System.Drawing.Font("宋体", 11F);
             this.pwd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.pwd.Location = new System.Drawing.Point(113, 70);
             this.pwd.Name = "pwd";
-            this.pwd.Size = new System.Drawing.Size(71, 30);
+            this.pwd.Size = new System.Drawing.Size(76, 22);
             this.pwd.TabIndex = 7;
             this.pwd.Text = "密  码";
             // 
@@ -184,11 +184,11 @@ namespace lqnet
             | 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);
+            this.deviceLabel.Font = new System.Drawing.Font("宋体", 11F);
             this.deviceLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
-            this.deviceLabel.Location = new System.Drawing.Point(83, 233);
+            this.deviceLabel.Location = new System.Drawing.Point(91, 238);
             this.deviceLabel.Name = "deviceLabel";
-            this.deviceLabel.Size = new System.Drawing.Size(101, 30);
+            this.deviceLabel.Size = new System.Drawing.Size(98, 22);
             this.deviceLabel.TabIndex = 16;
             this.deviceLabel.Text = "设备编号";
             // 
@@ -198,11 +198,11 @@ namespace lqnet
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.deviceListCombox.Enabled = false;
-            this.deviceListCombox.Font = new System.Drawing.Font("宋体", 12F);
+            this.deviceListCombox.Font = new System.Drawing.Font("宋体", 11F);
             this.deviceListCombox.FormattingEnabled = true;
             this.deviceListCombox.Location = new System.Drawing.Point(217, 235);
             this.deviceListCombox.Name = "deviceListCombox";
-            this.deviceListCombox.Size = new System.Drawing.Size(237, 32);
+            this.deviceListCombox.Size = new System.Drawing.Size(237, 30);
             this.deviceListCombox.TabIndex = 17;
             this.deviceListCombox.Text = "请选择";
             this.deviceListCombox.SelectionChangeCommitted += new System.EventHandler(this.DeviceListCombox_SelectionChangeCommitted);
@@ -234,11 +234,11 @@ namespace lqnet
             | 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);
+            this.ipLabel.Font = new System.Drawing.Font("宋体", 11F);
             this.ipLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.ipLabel.Location = new System.Drawing.Point(113, 158);
             this.ipLabel.Name = "ipLabel";
-            this.ipLabel.Size = new System.Drawing.Size(76, 30);
+            this.ipLabel.Size = new System.Drawing.Size(76, 22);
             this.ipLabel.TabIndex = 19;
             this.ipLabel.Text = "服务IP";
             // 

lqnet/Forms/LoginForm.cs

@@ -36,9 +36,10 @@ namespace lqnet
 
             try
             {
-                string imgPath = System.Windows.Forms.Application.StartupPath + MyConstants.BACKGROUDIMG_NAME;
-                this.BackgroundImage = Image.FromFile(imgPath);
-                this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+                //string imgPath = System.Windows.Forms.Application.StartupPath + MyConstants.BACKGROUDIMG_NAME;
+                //this.BackgroundImage = Image.FromFile(imgPath);
+                //this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+                this.BackColor = Color.FromArgb(240, 240, 240);
 
                 //XP
                 if (OSHelper.IsWindowsXP)

lqnet/Forms/MainForm.Designer.cs

@@ -52,19 +52,8 @@ namespace lqnet.Forms
         {
             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 dataGridViewCellStyle3 = 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();
@@ -93,6 +82,15 @@ namespace lqnet.Forms
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtDesigDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtBatchDataGridViewTextBoxColumn = 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.groupProceIdDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupProceCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).BeginInit();
             this.groupBox1.SuspendLayout();
@@ -117,30 +115,20 @@ namespace lqnet.Forms
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AutoGenerateColumns = false;
-            this.dataGridView1.BackgroundColor = System.Drawing.Color.SkyBlue;
+            this.dataGridView1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F);
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Index,
             this.idDataGridViewTextBoxColumn,
             this.prodtDesigDataGridViewTextBoxColumn,
+            this.prodtBatchDataGridViewTextBoxColumn,
             this.numDataGridViewTextBoxColumn,
             this.groupOrderCodeDataGridViewTextBoxColumn,
             this.proceNameDataGridViewTextBoxColumn,
-            this.prodtBatchDataGridViewTextBoxColumn,
             this.groupProceIdDataGridViewTextBoxColumn,
             this.groupProceCodeDataGridViewTextBoxColumn});
             this.dataGridView1.DataSource = this.taskListBindingSource;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 14F);
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
             this.dataGridView1.Location = new System.Drawing.Point(8, 81);
             this.dataGridView1.MultiSelect = false;
             this.dataGridView1.Name = "dataGridView1";
@@ -153,90 +141,6 @@ namespace lqnet.Forms
             this.dataGridView1.TabIndex = 2;
             this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView1_CellClick);
             // 
-            // Index
-            // 
-            this.Index.DataPropertyName = "Index";
-            this.Index.HeaderText = "序号";
-            this.Index.MinimumWidth = 10;
-            this.Index.Name = "Index";
-            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 = 180;
-            // 
-            // numDataGridViewTextBoxColumn
-            // 
-            this.numDataGridViewTextBoxColumn.DataPropertyName = "PlanAmt";
-            this.numDataGridViewTextBoxColumn.HeaderText = "数量";
-            this.numDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.numDataGridViewTextBoxColumn.Name = "numDataGridViewTextBoxColumn";
-            this.numDataGridViewTextBoxColumn.ReadOnly = true;
-            this.numDataGridViewTextBoxColumn.Width = 130;
-            // 
-            // groupOrderCodeDataGridViewTextBoxColumn
-            // 
-            this.groupOrderCodeDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderCode";
-            this.groupOrderCodeDataGridViewTextBoxColumn.HeaderText = "调度单号";
-            this.groupOrderCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.groupOrderCodeDataGridViewTextBoxColumn.Name = "groupOrderCodeDataGridViewTextBoxColumn";
-            this.groupOrderCodeDataGridViewTextBoxColumn.ReadOnly = true;
-            this.groupOrderCodeDataGridViewTextBoxColumn.Width = 220;
-            // 
-            // proceNameDataGridViewTextBoxColumn
-            // 
-            this.proceNameDataGridViewTextBoxColumn.DataPropertyName = "ProceName";
-            this.proceNameDataGridViewTextBoxColumn.HeaderText = "工序名称";
-            this.proceNameDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.proceNameDataGridViewTextBoxColumn.Name = "proceNameDataGridViewTextBoxColumn";
-            this.proceNameDataGridViewTextBoxColumn.ReadOnly = true;
-            this.proceNameDataGridViewTextBoxColumn.Width = 220;
-            // 
-            // prodtBatchDataGridViewTextBoxColumn
-            // 
-            this.prodtBatchDataGridViewTextBoxColumn.DataPropertyName = "ProdtBatch";
-            this.prodtBatchDataGridViewTextBoxColumn.HeaderText = "生产批次";
-            this.prodtBatchDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.prodtBatchDataGridViewTextBoxColumn.Name = "prodtBatchDataGridViewTextBoxColumn";
-            this.prodtBatchDataGridViewTextBoxColumn.ReadOnly = true;
-            this.prodtBatchDataGridViewTextBoxColumn.Width = 180;
-            // 
-            // 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);
@@ -244,13 +148,14 @@ namespace lqnet.Forms
             // CheckItemComboBox
             // 
             this.CheckItemComboBox.DisplayMember = "checkName";
+            this.CheckItemComboBox.Font = new System.Drawing.Font("宋体", 12F);
             this.CheckItemComboBox.FormattingEnabled = true;
             this.CheckItemComboBox.Items.AddRange(new object[] {
             "绝缘介电强度",
             "外观/尺寸"});
             this.CheckItemComboBox.Location = new System.Drawing.Point(13, 72);
             this.CheckItemComboBox.Name = "CheckItemComboBox";
-            this.CheckItemComboBox.Size = new System.Drawing.Size(240, 26);
+            this.CheckItemComboBox.Size = new System.Drawing.Size(240, 32);
             this.CheckItemComboBox.TabIndex = 5;
             this.CheckItemComboBox.Text = "请选择";
             this.CheckItemComboBox.SelectionChangeCommitted += new System.EventHandler(this.CheckItemComboBox_SelectionChangeCommitted);
@@ -311,44 +216,49 @@ namespace lqnet.Forms
             // checkLabel
             // 
             this.checkLabel.AutoSize = true;
-            this.checkLabel.Font = new System.Drawing.Font("宋体", 10F);
+            this.checkLabel.Font = new System.Drawing.Font("宋体", 11F);
+            this.checkLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.checkLabel.Location = new System.Drawing.Point(17, 36);
             this.checkLabel.Name = "checkLabel";
-            this.checkLabel.Size = new System.Drawing.Size(69, 20);
+            this.checkLabel.Size = new System.Drawing.Size(76, 22);
             this.checkLabel.TabIndex = 25;
             this.checkLabel.Text = "检验项";
             // 
             // startIdxLabel
             // 
             this.startIdxLabel.AutoSize = true;
-            this.startIdxLabel.Font = new System.Drawing.Font("宋体", 10F);
+            this.startIdxLabel.Font = new System.Drawing.Font("宋体", 11F);
+            this.startIdxLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.startIdxLabel.Location = new System.Drawing.Point(292, 71);
             this.startIdxLabel.Name = "startIdxLabel";
-            this.startIdxLabel.Size = new System.Drawing.Size(89, 20);
+            this.startIdxLabel.Size = new System.Drawing.Size(98, 22);
             this.startIdxLabel.TabIndex = 28;
             this.startIdxLabel.Text = "开始坐标";
             // 
             // startIdxTextbox
             // 
             this.startIdxTextbox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.startIdxTextbox.Font = new System.Drawing.Font("宋体", 12F);
             this.startIdxTextbox.Location = new System.Drawing.Point(395, 72);
             this.startIdxTextbox.Name = "startIdxTextbox";
-            this.startIdxTextbox.Size = new System.Drawing.Size(165, 21);
+            this.startIdxTextbox.Size = new System.Drawing.Size(165, 28);
             this.startIdxTextbox.TabIndex = 29;
             // 
             // mergeCountLabel
             // 
             this.mergeCountLabel.AutoSize = true;
-            this.mergeCountLabel.Font = new System.Drawing.Font("宋体", 10F);
+            this.mergeCountLabel.Font = new System.Drawing.Font("宋体", 11F);
+            this.mergeCountLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.mergeCountLabel.Location = new System.Drawing.Point(600, 71);
             this.mergeCountLabel.Name = "mergeCountLabel";
-            this.mergeCountLabel.Size = new System.Drawing.Size(129, 20);
+            this.mergeCountLabel.Size = new System.Drawing.Size(142, 22);
             this.mergeCountLabel.TabIndex = 30;
             this.mergeCountLabel.Text = "产品合并行数";
             // 
             // groupBox1
             // 
             this.groupBox1.Controls.Add(this.dataGridView2);
+            this.groupBox1.Font = new System.Drawing.Font("宋体", 9F);
             this.groupBox1.Location = new System.Drawing.Point(286, 119);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Size = new System.Drawing.Size(1020, 420);
@@ -360,10 +270,10 @@ namespace lqnet.Forms
             // 
             this.dataGridView2.AllowUserToAddRows = false;
             this.dataGridView2.AutoGenerateColumns = false;
-            this.dataGridView2.BackgroundColor = System.Drawing.Color.SkyBlue;
+            this.dataGridView2.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.dataGridView2.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 14F);
-            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 14F);
+            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView2.ColumnHeadersHeight = 30;
             this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.indexDataGridViewTextBoxColumn,
@@ -380,7 +290,7 @@ namespace lqnet.Forms
             this.dataGridView2.RowTemplate.Height = 50;
             this.dataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dataGridView2.ShowCellToolTips = false;
-            this.dataGridView2.Size = new System.Drawing.Size(1010, 400);
+            this.dataGridView2.Size = new System.Drawing.Size(1010, 430);
             this.dataGridView2.TabIndex = 34;
             // 
             // indexDataGridViewTextBoxColumn
@@ -390,7 +300,7 @@ namespace lqnet.Forms
             this.indexDataGridViewTextBoxColumn.MinimumWidth = 8;
             this.indexDataGridViewTextBoxColumn.Name = "indexDataGridViewTextBoxColumn";
             this.indexDataGridViewTextBoxColumn.ReadOnly = true;
-            this.indexDataGridViewTextBoxColumn.Width = 150;
+            this.indexDataGridViewTextBoxColumn.Width = 60;
             // 
             // importColLabelDataGridViewTextBoxColumn
             // 
@@ -434,10 +344,11 @@ namespace lqnet.Forms
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("宋体", 10.5F);
+            this.label1.Font = new System.Drawing.Font("宋体", 11F);
+            this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.label1.Location = new System.Drawing.Point(17, 41);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(94, 21);
+            this.label1.Size = new System.Drawing.Size(98, 22);
             this.label1.TabIndex = 35;
             this.label1.Text = "产品代号";
             // 
@@ -453,23 +364,25 @@ namespace lqnet.Forms
             // choosedFileLabel
             // 
             this.choosedFileLabel.AutoSize = true;
-            this.choosedFileLabel.Font = new System.Drawing.Font("宋体", 10F);
+            this.choosedFileLabel.Font = new System.Drawing.Font("宋体", 11F);
+            this.choosedFileLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(121)))), ((int)(((byte)(147)))));
             this.choosedFileLabel.Location = new System.Drawing.Point(17, 119);
             this.choosedFileLabel.Name = "choosedFileLabel";
-            this.choosedFileLabel.Size = new System.Drawing.Size(169, 20);
+            this.choosedFileLabel.Size = new System.Drawing.Size(186, 22);
             this.choosedFileLabel.TabIndex = 27;
             this.choosedFileLabel.Text = "当前选择数据文件";
             // 
             // groupBox2
             // 
+            this.groupBox2.Controls.Add(this.dataGridView1);
             this.groupBox2.Controls.Add(this.label1);
             this.groupBox2.Controls.Add(this.pageHelper2);
             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(3, 0);
+            this.groupBox2.Font = new System.Drawing.Font("宋体", 9F);
+            this.groupBox2.Location = new System.Drawing.Point(3, 5);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(1306, 538);
+            this.groupBox2.Size = new System.Drawing.Size(1306, 557);
             this.groupBox2.TabIndex = 0;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "选择调度单";
@@ -478,12 +391,13 @@ namespace lqnet.Forms
             // 
             this.pageHelper2.AllPage = 1;
             this.pageHelper2.AutoScroll = true;
-            this.pageHelper2.Location = new System.Drawing.Point(464, 484);
+            this.pageHelper2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pageHelper2.Location = new System.Drawing.Point(494, 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(829, 56);
+            this.pageHelper2.Size = new System.Drawing.Size(815, 51);
             this.pageHelper2.TabIndex = 20;
             this.pageHelper2.Total = 0;
             this.pageHelper2.Load += new System.EventHandler(this.PageHelper2_Load);
@@ -502,7 +416,8 @@ 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(3, 545);
+            this.groupBox3.Font = new System.Drawing.Font("宋体", 9F);
+            this.groupBox3.Location = new System.Drawing.Point(3, 565);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Size = new System.Drawing.Size(1309, 548);
             this.groupBox3.TabIndex = 39;
@@ -512,9 +427,10 @@ namespace lqnet.Forms
             // mergeCountTextbox
             // 
             this.mergeCountTextbox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.mergeCountTextbox.Font = new System.Drawing.Font("宋体", 12F);
             this.mergeCountTextbox.Location = new System.Drawing.Point(752, 70);
             this.mergeCountTextbox.Name = "mergeCountTextbox";
-            this.mergeCountTextbox.Size = new System.Drawing.Size(165, 21);
+            this.mergeCountTextbox.Size = new System.Drawing.Size(165, 28);
             this.mergeCountTextbox.TabIndex = 37;
             this.mergeCountTextbox.Text = "1";
             // 
@@ -525,7 +441,7 @@ namespace lqnet.Forms
             this.panel1.Controls.Add(this.label3);
             this.panel1.Controls.Add(this.label2);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel1.Location = new System.Drawing.Point(0, 1093);
+            this.panel1.Location = new System.Drawing.Point(0, 1113);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(1312, 59);
             this.panel1.TabIndex = 40;
@@ -533,7 +449,7 @@ namespace lqnet.Forms
             // linkLabel1
             // 
             this.linkLabel1.AutoSize = true;
-            this.linkLabel1.Location = new System.Drawing.Point(1094, 21);
+            this.linkLabel1.Location = new System.Drawing.Point(1166, 21);
             this.linkLabel1.Name = "linkLabel1";
             this.linkLabel1.Size = new System.Drawing.Size(80, 18);
             this.linkLabel1.TabIndex = 2;
@@ -546,7 +462,7 @@ namespace lqnet.Forms
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F);
             this.label3.ForeColor = System.Drawing.Color.White;
-            this.label3.Location = new System.Drawing.Point(585, 15);
+            this.label3.Location = new System.Drawing.Point(639, 15);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(133, 27);
             this.label3.TabIndex = 1;
@@ -566,20 +482,105 @@ namespace lqnet.Forms
             // panel2
             // 
             this.panel2.AutoScroll = true;
-            this.panel2.Controls.Add(this.groupBox2);
             this.panel2.Controls.Add(this.panel1);
             this.panel2.Controls.Add(this.groupBox3);
+            this.panel2.Controls.Add(this.groupBox2);
             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(1338, 894);
             this.panel2.TabIndex = 41;
             // 
+            // Index
+            // 
+            this.Index.DataPropertyName = "Index";
+            this.Index.HeaderText = "序号";
+            this.Index.MinimumWidth = 10;
+            this.Index.Name = "Index";
+            this.Index.ReadOnly = true;
+            this.Index.Width = 60;
+            // 
+            // 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 = 80;
+            // 
+            // prodtDesigDataGridViewTextBoxColumn
+            // 
+            this.prodtDesigDataGridViewTextBoxColumn.DataPropertyName = "ProdtDesig";
+            this.prodtDesigDataGridViewTextBoxColumn.HeaderText = "产品代号";
+            this.prodtDesigDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtDesigDataGridViewTextBoxColumn.Name = "prodtDesigDataGridViewTextBoxColumn";
+            this.prodtDesigDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtDesigDataGridViewTextBoxColumn.Width = 120;
+            // 
+            // prodtBatchDataGridViewTextBoxColumn
+            // 
+            this.prodtBatchDataGridViewTextBoxColumn.DataPropertyName = "ProdtBatch";
+            this.prodtBatchDataGridViewTextBoxColumn.HeaderText = "生产批次";
+            this.prodtBatchDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtBatchDataGridViewTextBoxColumn.Name = "prodtBatchDataGridViewTextBoxColumn";
+            this.prodtBatchDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtBatchDataGridViewTextBoxColumn.Width = 120;
+            // 
+            // numDataGridViewTextBoxColumn
+            // 
+            this.numDataGridViewTextBoxColumn.DataPropertyName = "PlanAmt";
+            this.numDataGridViewTextBoxColumn.HeaderText = "数量";
+            this.numDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.numDataGridViewTextBoxColumn.Name = "numDataGridViewTextBoxColumn";
+            this.numDataGridViewTextBoxColumn.ReadOnly = true;
+            this.numDataGridViewTextBoxColumn.Width = 80;
+            // 
+            // groupOrderCodeDataGridViewTextBoxColumn
+            // 
+            this.groupOrderCodeDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderCode";
+            this.groupOrderCodeDataGridViewTextBoxColumn.HeaderText = "调度单号";
+            this.groupOrderCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupOrderCodeDataGridViewTextBoxColumn.Name = "groupOrderCodeDataGridViewTextBoxColumn";
+            this.groupOrderCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupOrderCodeDataGridViewTextBoxColumn.Width = 130;
+            // 
+            // proceNameDataGridViewTextBoxColumn
+            // 
+            this.proceNameDataGridViewTextBoxColumn.DataPropertyName = "ProceName";
+            this.proceNameDataGridViewTextBoxColumn.HeaderText = "工序名称";
+            this.proceNameDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.proceNameDataGridViewTextBoxColumn.Name = "proceNameDataGridViewTextBoxColumn";
+            this.proceNameDataGridViewTextBoxColumn.ReadOnly = true;
+            this.proceNameDataGridViewTextBoxColumn.Width = 130;
+            // 
+            // 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;
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.AutoScroll = true;
+            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.ClientSize = new System.Drawing.Size(1338, 894);
             this.Controls.Add(this.panel2);
             this.Icon = global::lqnet.Properties.Resources.favicon;
@@ -611,7 +612,7 @@ namespace lqnet.Forms
         #endregion
         private BindingSource taskListBindingSource;
         private TextBox prodtDesig_sel;
-        private DataGridView dataGridView1;
+        protected DataGridView dataGridView1;
         private ComboBox CheckItemComboBox;
         private Button slectBt;
         private Button selectFileBt;
@@ -622,7 +623,7 @@ namespace lqnet.Forms
         private TextBox startIdxTextbox;
         private Label mergeCountLabel;
         private GroupBox groupBox1;
-        private DataGridView dataGridView2;
+        protected DataGridView dataGridView2;
         private Button parseReportBtn;
         private BindingSource reportColListBindingSource;
         private Label label1;
@@ -635,18 +636,18 @@ namespace lqnet.Forms
         private Label label3;
         private Label label2;
         private Panel panel2;
+        private TextBox mergeCountTextbox;
+        private DataGridViewTextBoxColumn indexDataGridViewTextBoxColumn;
+        private DataGridViewTextBoxColumn importColLabelDataGridViewTextBoxColumn;
+        private DataGridViewComboBoxColumn lineColLabelDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn Index;
         private DataGridViewTextBoxColumn idDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn prodtDesigDataGridViewTextBoxColumn;
+        private DataGridViewTextBoxColumn prodtBatchDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn numDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn groupOrderCodeDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn proceNameDataGridViewTextBoxColumn;
-        private DataGridViewTextBoxColumn prodtBatchDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn groupProceIdDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn groupProceCodeDataGridViewTextBoxColumn;
-        private TextBox mergeCountTextbox;
-        private DataGridViewTextBoxColumn indexDataGridViewTextBoxColumn;
-        private DataGridViewTextBoxColumn importColLabelDataGridViewTextBoxColumn;
-        private DataGridViewComboBoxColumn lineColLabelDataGridViewTextBoxColumn;
     }
 }

lqnet/Forms/MainForm.cs

@@ -121,17 +121,17 @@ namespace lqnet.Forms
                 reloadDeviceConfig();
                 startSendbeat();
             }
-            try
-            {
-                string imgPath = System.Windows.Forms.Application.StartupPath + MyConstants.BACKGROUDIMG_NAME;
-                this.BackgroundImage = Image.FromFile(imgPath);
-                this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            }
-            catch (Exception)
-            {
-                this.BackColor = MyConstants.BACKGROUDIMG_COLOR;
-                //MessageBox.Show("未找到背景图片资源，建议重新安装修复终端，避免影响使用观感", "初始化提示", MessageBoxButtons.OK);
-            }
+            //try
+            //{
+            //    string imgPath = System.Windows.Forms.Application.StartupPath + MyConstants.BACKGROUDIMG_NAME;
+            //    this.BackgroundImage = Image.FromFile(imgPath);
+            //    this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            //}
+            //catch (Exception)
+            //{
+            //    this.BackColor = MyConstants.BACKGROUDIMG_COLOR;
+            //    //MessageBox.Show("未找到背景图片资源，建议重新安装修复终端，避免影响使用观感", "初始化提示", MessageBoxButtons.OK);
+            //}
 
         }
 

lqnet/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.9")]
-[assembly: AssemblyFileVersion("1.0.0.9")]
+[assembly: AssemblyVersion("1.0.0.12")]
+[assembly: AssemblyFileVersion("1.0.0.12")]

lqnet/bin/Debug/configs/100012.json

@@ -1 +1 @@
-[{"checkCode":"JYX0000211901","checkName":"外形尺寸","startRow":"A5,E5","mergeCount":1,"itemConfigs":{"B5":{"label":"B5","indxName":"25"},"C5":{"label":"C5","indxName":"8"},"D5":{"label":"D5","indxName":"12"},"E5":{"label":"","indxName":null},"F5":{"label":"F5","indxName":"105"},"G5":{"label":"G5","indxName":"0.03A"},"H5":{"label":"H5","indxName":"⊥0.03A"},"I5":{"label":"I5","indxName":"引出线"}}}]
+[{"checkCode":"JYX0000211901","checkName":"外形尺寸","startRow":"A5","mergeCount":1,"itemConfigs":{"B5":{"label":"B5","indxName":"25"},"C5":{"label":"C5","indxName":"8"},"D5":{"label":"D5","indxName":"12"},"E5":{"label":"E5","indxName":"2"},"F5":{"label":"F5","indxName":"105"},"G5":{"label":"G5","indxName":"0.03A"},"H5":{"label":"H5","indxName":"⊥0.03A"},"I5":{"label":"I5","indxName":"引出线"},"J5":{"label":"J5","indxName":"测试"}}}]

lqnet/bin/Debug/lqnet.application

@@ -7,14 +7,14 @@
     <framework targetVersion="4.6.2" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="lqnet.exe.manifest" size="88327">
+    <dependentAssembly dependencyType="install" codebase="lqnet.exe.manifest" size="88329">
       <assemblyIdentity name="lqnet.exe" version="1.0.0.6" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>MGm3p8eZrmKaTRlFmlmPPqB24cqHoHzTMgWx0QkfskY=</dsig:DigestValue>
+        <dsig:DigestValue>0sNO00WWRBp41ZCpytkknS0Rwp8OTf5uUn6ORAQgEIw=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/bin/Debug/lqnet.exe.manifest

@@ -4,7 +4,7 @@
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="lqnet" version="1.0.0.9" language="neutral" processorArchitecture="x86" />
+    <assemblyIdentity name="lqnet" version="1.0.0.12" language="neutral" processorArchitecture="x86" />
     <commandLine file="lqnet.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -79,13 +79,13 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="lqnet.exe" size="688128">
-      <assemblyIdentity name="lqnet" version="1.0.0.9" language="neutral" processorArchitecture="x86" />
+      <assemblyIdentity name="lqnet" version="1.0.0.12" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>WqYeJ1DszGcvpS4iePUsCco0wrP72lshN0k033DMBfM=</dsig:DigestValue>
+        <dsig:DigestValue>fbTExfSSIHI0kymqyg+UuOOezUv4wwvDqEY0mOFBr/U=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/obj/Debug/Lqnet.csproj.FileListAbsolute.txt

@@ -165,6 +165,9 @@ D:\code\林泉\非标数据集成接口\lqnet\lqnet\bin\Debug\System.Text.Encodi
 D:\code\林泉\非标数据集成接口\lqnet\lqnet\obj\Debug\lqnet.exe.manifest
 D:\code\林泉\非标数据集成接口\lqnet\lqnet\obj\Debug\lqnet.application
 D:\code\林泉\非标数据集成接口\lqnet\lqnet\obj\Debug\Lqnet.csproj.CopyComplete
+F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.Core.dll
+F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.Core.pdb
+F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\SixLabors.Fonts.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\lqnet.exe.config
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\lqnet.exe.manifest
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\lqnet.application
@@ -272,7 +275,6 @@ F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\ICSharpCode.SharpZipLib
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\MathNet.Numerics.dll
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\Microsoft.IO.RecyclableMemoryStream.dll
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\Newtonsoft.Json.dll
-F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.Core.dll
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OOXML.dll
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OpenXml4Net.dll
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OpenXmlFormats.dll
@@ -296,7 +298,6 @@ F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\ICSharpCode.SharpZipLib
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\MathNet.Numerics.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\Microsoft.IO.RecyclableMemoryStream.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\Newtonsoft.Json.xml
-F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.Core.pdb
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.Core.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OOXML.pdb
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OOXML.xml
@@ -305,7 +306,6 @@ F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OpenXml4Net.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OpenXmlFormats.pdb
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OpenXmlFormats.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\NPOI.OpenXmlFormats.dll.config
-F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\SixLabors.Fonts.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\SixLabors.ImageSharp.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\System.Buffers.xml
 F:\c_work\非标数据集成接口\lqnet\lqnet\bin\Debug\System.Configuration.ConfigurationManager.xml

lqnet/obj/Debug/lqnet.application

@@ -7,14 +7,14 @@
     <framework targetVersion="4.6.2" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="lqnet.exe.manifest" size="88327">
+    <dependentAssembly dependencyType="install" codebase="lqnet.exe.manifest" size="88329">
       <assemblyIdentity name="lqnet.exe" version="1.0.0.6" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>MGm3p8eZrmKaTRlFmlmPPqB24cqHoHzTMgWx0QkfskY=</dsig:DigestValue>
+        <dsig:DigestValue>0sNO00WWRBp41ZCpytkknS0Rwp8OTf5uUn6ORAQgEIw=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/obj/Debug/lqnet.exe.manifest

@@ -4,7 +4,7 @@
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="lqnet" version="1.0.0.9" language="neutral" processorArchitecture="x86" />
+    <assemblyIdentity name="lqnet" version="1.0.0.12" language="neutral" processorArchitecture="x86" />
     <commandLine file="lqnet.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -79,13 +79,13 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="lqnet.exe" size="688128">
-      <assemblyIdentity name="lqnet" version="1.0.0.9" language="neutral" processorArchitecture="x86" />
+      <assemblyIdentity name="lqnet" version="1.0.0.12" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>WqYeJ1DszGcvpS4iePUsCco0wrP72lshN0k033DMBfM=</dsig:DigestValue>
+        <dsig:DigestValue>fbTExfSSIHI0kymqyg+UuOOezUv4wwvDqEY0mOFBr/U=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>