Browse Source

程序退出关闭进程

Hcsy 8 years ago
parent
commit
d43c5d6343
3 changed files with 50 additions and 70 deletions
  1. 13 13
      UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs
  2. 36 51
      UAS-MES/Main.Designer.cs
  3. 1 6
      UAS-MES/Main.cs

+ 13 - 13
UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -102,19 +102,19 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>网标号不能为空\n", Color.Red);
                         return;
                     }
-                    sql.Clear();
-                    sql.Append("select psr_prefix,psr_length from productsnrelation where psr_prodcode = '" + ma_prodcode.Text + "' and psr_type = 'NETCODE'");
-                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    if (dt.Rows.Count > 0) {
-                        int psr_length = int.Parse(dt.Rows[0][1].ToString());
-                        string psr_prefix = dt.Rows[0][0].ToString();
-                        if (sncode.Text.Length != psr_length || sncode.Text.Substring(0,psr_prefix.Length).ToString() != psr_prefix) {
-                            sncode.Text = "";
-                            sncode.Focus();
-                            OperateResult.AppendText("<<所输入网标不符合定义要求\n", Color.Red);
-                            return;
-                        } 
-                    }
+                    //sql.Clear();
+                    //sql.Append("select psr_prefix,psr_length from productsnrelation where psr_prodcode = '" + ma_prodcode.Text + "' and psr_type = 'NETCODE'");
+                    //dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    //if (dt.Rows.Count > 0) {
+                    //    int psr_length = int.Parse(dt.Rows[0][1].ToString());
+                    //    string psr_prefix = dt.Rows[0][0].ToString();
+                    //    if (sncode.Text.Length != psr_length || sncode.Text.Substring(0,psr_prefix.Length).ToString() != psr_prefix) {
+                    //        sncode.Text = "";
+                    //        sncode.Focus();
+                    //        OperateResult.AppendText("<<所输入网标不符合定义要求\n", Color.Red);
+                    //        return;
+                    //    } 
+                    //}
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
                     string ErrorMessage = "";
                     string result = "";

+ 36 - 51
UAS-MES/Main.Designer.cs

@@ -59,10 +59,9 @@
             this.ProductName.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.ProductName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ProductName.ForeColor = System.Drawing.SystemColors.ButtonFace;
-            this.ProductName.Location = new System.Drawing.Point(108, 4);
-            this.ProductName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ProductName.Location = new System.Drawing.Point(81, 3);
             this.ProductName.Name = "ProductName";
-            this.ProductName.Size = new System.Drawing.Size(212, 27);
+            this.ProductName.Size = new System.Drawing.Size(170, 21);
             this.ProductName.TabIndex = 3;
             this.ProductName.Text = "优软科技制造执行系统";
             // 
@@ -73,11 +72,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.MainTabControl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MainTabControl.ItemSize = new System.Drawing.Size(96, 25);
-            this.MainTabControl.Location = new System.Drawing.Point(186, 40);
-            this.MainTabControl.Margin = new System.Windows.Forms.Padding(4);
+            this.MainTabControl.Location = new System.Drawing.Point(140, 32);
             this.MainTabControl.Name = "MainTabControl";
             this.MainTabControl.SelectedIndex = 0;
-            this.MainTabControl.Size = new System.Drawing.Size(1118, 700);
+            this.MainTabControl.Size = new System.Drawing.Size(838, 560);
             this.MainTabControl.TabIndex = 7;
             this.MainTabControl.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MainTabControl_ControlRemoved);
             // 
@@ -86,10 +84,9 @@
             this.name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.name_label.AutoSize = true;
             this.name_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.name_label.Location = new System.Drawing.Point(8, 10);
-            this.name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.name_label.Location = new System.Drawing.Point(6, 8);
             this.name_label.Name = "name_label";
-            this.name_label.Size = new System.Drawing.Size(43, 20);
+            this.name_label.Size = new System.Drawing.Size(35, 17);
             this.name_label.TabIndex = 4;
             this.name_label.Text = "姓名:";
             // 
@@ -106,10 +103,9 @@
             this.BasicInf.Controls.Add(this.Inf_source_label);
             this.BasicInf.Controls.Add(this.name_label);
             this.BasicInf.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.BasicInf.Location = new System.Drawing.Point(0, 741);
-            this.BasicInf.Margin = new System.Windows.Forms.Padding(4);
+            this.BasicInf.Location = new System.Drawing.Point(0, 593);
             this.BasicInf.Name = "BasicInf";
-            this.BasicInf.Size = new System.Drawing.Size(1304, 39);
+            this.BasicInf.Size = new System.Drawing.Size(978, 31);
             this.BasicInf.TabIndex = 6;
             // 
             // inf_currentstep
@@ -117,10 +113,9 @@
             this.inf_currentstep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_currentstep.AutoSize = true;
             this.inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_currentstep.Location = new System.Drawing.Point(304, 10);
-            this.inf_currentstep.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.inf_currentstep.Location = new System.Drawing.Point(228, 8);
             this.inf_currentstep.Name = "inf_currentstep";
-            this.inf_currentstep.Size = new System.Drawing.Size(0, 20);
+            this.inf_currentstep.Size = new System.Drawing.Size(0, 17);
             this.inf_currentstep.TabIndex = 15;
             // 
             // step_label
@@ -128,10 +123,9 @@
             this.step_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.step_label.AutoSize = true;
             this.step_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.step_label.Location = new System.Drawing.Point(196, 10);
-            this.step_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.step_label.Location = new System.Drawing.Point(147, 8);
             this.step_label.Name = "step_label";
-            this.step_label.Size = new System.Drawing.Size(73, 20);
+            this.step_label.Size = new System.Drawing.Size(59, 17);
             this.step_label.TabIndex = 14;
             this.step_label.Text = "岗位工序:";
             // 
@@ -140,10 +134,9 @@
             this.inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_name.AutoSize = true;
             this.inf_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_name.Location = new System.Drawing.Point(85, 10);
-            this.inf_name.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.inf_name.Location = new System.Drawing.Point(64, 8);
             this.inf_name.Name = "inf_name";
-            this.inf_name.Size = new System.Drawing.Size(0, 20);
+            this.inf_name.Size = new System.Drawing.Size(0, 17);
             this.inf_name.TabIndex = 13;
             // 
             // Inf_linecode
@@ -151,10 +144,9 @@
             this.Inf_linecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode.AutoSize = true;
             this.Inf_linecode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode.Location = new System.Drawing.Point(542, 10);
-            this.Inf_linecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Inf_linecode.Location = new System.Drawing.Point(406, 8);
             this.Inf_linecode.Name = "Inf_linecode";
-            this.Inf_linecode.Size = new System.Drawing.Size(0, 20);
+            this.Inf_linecode.Size = new System.Drawing.Size(0, 17);
             this.Inf_linecode.TabIndex = 11;
             // 
             // inf_source
@@ -162,10 +154,9 @@
             this.inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_source.AutoSize = true;
             this.inf_source.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_source.Location = new System.Drawing.Point(753, 10);
-            this.inf_source.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.inf_source.Location = new System.Drawing.Point(565, 8);
             this.inf_source.Name = "inf_source";
-            this.inf_source.Size = new System.Drawing.Size(0, 20);
+            this.inf_source.Size = new System.Drawing.Size(0, 17);
             this.inf_source.TabIndex = 10;
             // 
             // inf_db
@@ -173,10 +164,9 @@
             this.inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_db.AutoSize = true;
             this.inf_db.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_db.Location = new System.Drawing.Point(1030, 10);
-            this.inf_db.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.inf_db.Location = new System.Drawing.Point(772, 8);
             this.inf_db.Name = "inf_db";
-            this.inf_db.Size = new System.Drawing.Size(0, 20);
+            this.inf_db.Size = new System.Drawing.Size(0, 17);
             this.inf_db.TabIndex = 9;
             // 
             // Inf_linecode_label
@@ -184,10 +174,9 @@
             this.Inf_linecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode_label.AutoSize = true;
             this.Inf_linecode_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode_label.Location = new System.Drawing.Point(461, 10);
-            this.Inf_linecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Inf_linecode_label.Location = new System.Drawing.Point(346, 8);
             this.Inf_linecode_label.Name = "Inf_linecode_label";
-            this.Inf_linecode_label.Size = new System.Drawing.Size(43, 20);
+            this.Inf_linecode_label.Size = new System.Drawing.Size(35, 17);
             this.Inf_linecode_label.TabIndex = 8;
             this.Inf_linecode_label.Text = "线别:";
             // 
@@ -196,10 +185,9 @@
             this.db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.db_label.AutoSize = true;
             this.db_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.db_label.Location = new System.Drawing.Point(935, 10);
-            this.db_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.db_label.Location = new System.Drawing.Point(701, 8);
             this.db_label.Name = "db_label";
-            this.db_label.Size = new System.Drawing.Size(58, 20);
+            this.db_label.Size = new System.Drawing.Size(47, 17);
             this.db_label.TabIndex = 7;
             this.db_label.Text = "数据库:";
             // 
@@ -208,10 +196,9 @@
             this.Inf_source_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_source_label.AutoSize = true;
             this.Inf_source_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_source_label.Location = new System.Drawing.Point(673, 10);
-            this.Inf_source_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Inf_source_label.Location = new System.Drawing.Point(505, 8);
             this.Inf_source_label.Name = "Inf_source_label";
-            this.Inf_source_label.Size = new System.Drawing.Size(43, 20);
+            this.Inf_source_label.Size = new System.Drawing.Size(35, 17);
             this.Inf_source_label.TabIndex = 6;
             this.Inf_source_label.Text = "资源:";
             // 
@@ -221,19 +208,18 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.Menu);
-            this.panel1.Location = new System.Drawing.Point(0, 40);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4);
+            this.panel1.Location = new System.Drawing.Point(0, 32);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(185, 702);
+            this.panel1.Size = new System.Drawing.Size(139, 562);
             this.panel1.TabIndex = 1;
             // 
             // Menu
             // 
             this.Menu.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Menu.Location = new System.Drawing.Point(0, 0);
-            this.Menu.Margin = new System.Windows.Forms.Padding(5);
+            this.Menu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Menu.Name = "Menu";
-            this.Menu.Size = new System.Drawing.Size(183, 700);
+            this.Menu.Size = new System.Drawing.Size(137, 560);
             this.Menu.TabIndex = 3;
             // 
             // notifyIcon1
@@ -245,9 +231,8 @@
             // 
             this.pictureBox1.Image = global::UAS_MES.Properties.Resources.uas_blue;
             this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(100, 41);
+            this.pictureBox1.Size = new System.Drawing.Size(75, 33);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 4;
             this.pictureBox1.TabStop = false;
@@ -257,17 +242,17 @@
             this.headBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(0, 0);
-            this.headBar1.Margin = new System.Windows.Forms.Padding(5);
+            this.headBar1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(1304, 40);
+            this.headBar1.Size = new System.Drawing.Size(978, 32);
             this.headBar1.TabIndex = 0;
             this.headBar1.Title = null;
             // 
             // Main
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1304, 780);
+            this.ClientSize = new System.Drawing.Size(978, 624);
             this.Controls.Add(this.BasicInf);
             this.Controls.Add(this.MainTabControl);
             this.Controls.Add(this.pictureBox1);
@@ -276,9 +261,9 @@
             this.Controls.Add(this.headBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Main";
             this.Text = "优软科技MES系统";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
             this.Load += new System.EventHandler(this.Main_Load);
             this.BasicInf.ResumeLayout(false);
             this.BasicInf.PerformLayout();

+ 1 - 6
UAS-MES/Main.cs

@@ -299,12 +299,7 @@ namespace UAS_MES
 
         private void Main_FormClosing(object sender, FormClosingEventArgs e)
         {
-            //杀死全部未关闭的打印进程
-            Process[] processes = System.Diagnostics.Process.GetProcessesByName("lppa");
-            for (int i = 0; i < processes.Length; i++)
-            {
-                processes[i].Kill();
-            }
+            //杀死全部未关闭的进程
             System.Environment.Exit(0);
         }
     }