From 555bb075f397e6cde20ca591ed12696c0a6a2ac9 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Mon, 29 Jul 2024 09:42:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=89=93=E7=A0=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InjectionPC/FrmBarCode.Designer.cs | 179 +++++++++++------- InjectionPC/FrmBarCodeNew.Designer.cs | 17 +- InjectionPC/FrmBarCodeNew.cs | 10 +- InjectionPC/Properties/AssemblyInfo.cs | 4 +- .../FrmBarCodeSearchNew.Designer.cs | 140 +++++++++----- InjectionSearch/FrmBarCodeSearchNew.cs | 2 + InjectionSearch/Properties/AssemblyInfo.cs | 4 +- MESClassLibrary/BLL/BasicInfo/ProductBLL.cs | 10 +- MESWebSite/MESWebSite.csproj | 1 + 9 files changed, 231 insertions(+), 136 deletions(-) diff --git a/InjectionPC/FrmBarCode.Designer.cs b/InjectionPC/FrmBarCode.Designer.cs index a7f0b26..4047512 100644 --- a/InjectionPC/FrmBarCode.Designer.cs +++ b/InjectionPC/FrmBarCode.Designer.cs @@ -80,18 +80,20 @@ this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.pictureBox1); this.panel1.Controls.Add(this.label1); - this.panel1.Location = new System.Drawing.Point(1, 1); + this.panel1.Location = new System.Drawing.Point(2, 2); + this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1275, 91); + this.panel1.Size = new System.Drawing.Size(2338, 159); this.panel1.TabIndex = 0; // // label2 // this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1080, 5); + this.label2.Location = new System.Drawing.Point(1980, 9); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(192, 84); + this.label2.Size = new System.Drawing.Size(350, 146); this.label2.TabIndex = 3; this.label2.Text = "2019-05-29 10:30:31"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -101,9 +103,10 @@ // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(4, 4); + this.pictureBox1.Location = new System.Drawing.Point(7, 7); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(169, 84); + this.pictureBox1.Size = new System.Drawing.Size(308, 146); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 2; this.pictureBox1.TabStop = false; @@ -112,9 +115,10 @@ // this.label1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label1.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(172, 5); + this.label1.Location = new System.Drawing.Point(315, 9); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(911, 84); + this.label1.Size = new System.Drawing.Size(1669, 146); this.label1.TabIndex = 1; this.label1.Text = "注塑车间条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -124,9 +128,10 @@ this.label3.BackColor = System.Drawing.Color.DeepSkyBlue; this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(5, 89); + this.label3.Location = new System.Drawing.Point(9, 156); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(169, 52); + this.label3.Size = new System.Drawing.Size(308, 90); this.label3.TabIndex = 1; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -136,9 +141,10 @@ this.label4.BackColor = System.Drawing.Color.DeepSkyBlue; this.label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(174, 89); + this.label4.Location = new System.Drawing.Point(319, 156); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(110, 52); + this.label4.Size = new System.Drawing.Size(200, 90); this.label4.TabIndex = 2; this.label4.Text = "班组："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -151,9 +157,10 @@ this.comboBox1.Items.AddRange(new object[] { "A班", "B班"}); - this.comboBox1.Location = new System.Drawing.Point(284, 91); + this.comboBox1.Location = new System.Drawing.Point(521, 159); + this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(136, 51); + this.comboBox1.Size = new System.Drawing.Size(246, 83); this.comboBox1.TabIndex = 3; // // label5 @@ -161,9 +168,10 @@ this.label5.BackColor = System.Drawing.Color.DeepSkyBlue; this.label5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(419, 91); + this.label5.Location = new System.Drawing.Point(768, 159); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(110, 52); + this.label5.Size = new System.Drawing.Size(200, 90); this.label5.TabIndex = 4; this.label5.Text = "工位："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -172,9 +180,10 @@ // this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(529, 93); + this.label6.Location = new System.Drawing.Point(970, 163); + this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(145, 52); + this.label6.Size = new System.Drawing.Size(264, 90); this.label6.TabIndex = 5; this.label6.Text = "IM01"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -184,9 +193,10 @@ this.label7.BackColor = System.Drawing.Color.DeepSkyBlue; this.label7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(675, 93); + this.label7.Location = new System.Drawing.Point(1238, 163); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(110, 52); + this.label7.Size = new System.Drawing.Size(200, 90); this.label7.TabIndex = 6; this.label7.Text = "用户："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -195,9 +205,10 @@ // this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(784, 93); + this.label8.Location = new System.Drawing.Point(1437, 163); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(123, 52); + this.label8.Size = new System.Drawing.Size(224, 90); this.label8.TabIndex = 7; this.label8.Text = "cy"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -207,9 +218,10 @@ this.label9.BackColor = System.Drawing.Color.DeepSkyBlue; this.label9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label9.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(904, 93); + this.label9.Location = new System.Drawing.Point(1657, 163); + this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(180, 52); + this.label9.Size = new System.Drawing.Size(328, 90); this.label9.TabIndex = 8; this.label9.Text = "质量录入"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -220,9 +232,10 @@ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue; this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label10.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(5, 141); + this.label10.Location = new System.Drawing.Point(9, 247); + this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(169, 622); + this.label10.Size = new System.Drawing.Size(308, 1087); this.label10.TabIndex = 9; this.label10.Text = "打印记录："; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -289,16 +302,17 @@ this.glacialList1.HoverEvents = false; this.glacialList1.HoverTime = 1; this.glacialList1.ImageList = null; - this.glacialList1.ItemHeight = 30; + this.glacialList1.ItemHeight = 50; this.glacialList1.ItemWordWrap = false; - this.glacialList1.Location = new System.Drawing.Point(173, 142); + this.glacialList1.Location = new System.Drawing.Point(317, 248); + this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.Lime; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(1100, 621); + this.glacialList1.Size = new System.Drawing.Size(2017, 1087); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 10; @@ -310,9 +324,10 @@ this.label11.BackColor = System.Drawing.Color.DeepSkyBlue; this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label11.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(5, 763); + this.label11.Location = new System.Drawing.Point(9, 1335); + this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(169, 252); + this.label11.Size = new System.Drawing.Size(308, 440); this.label11.TabIndex = 11; this.label11.Text = "打印信息："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -322,9 +337,10 @@ this.label12.BackColor = System.Drawing.Color.DeepSkyBlue; this.label12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label12.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(173, 763); + this.label12.Location = new System.Drawing.Point(317, 1335); + this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(73, 252); + this.label12.Size = new System.Drawing.Size(132, 440); this.label12.TabIndex = 12; this.label12.Text = "暂停打印"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -335,9 +351,10 @@ this.label13.BackColor = System.Drawing.Color.DeepSkyBlue; this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label13.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(245, 763); + this.label13.Location = new System.Drawing.Point(449, 1335); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(73, 252); + this.label13.Size = new System.Drawing.Size(132, 440); this.label13.TabIndex = 13; this.label13.Text = "下一计划"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -353,17 +370,19 @@ this.panel2.Controls.Add(this.label15); this.panel2.Controls.Add(this.comboBox2); this.panel2.Controls.Add(this.label14); - this.panel2.Location = new System.Drawing.Point(318, 763); + this.panel2.Location = new System.Drawing.Point(583, 1335); + this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(737, 252); + this.panel2.Size = new System.Drawing.Size(1351, 441); this.panel2.TabIndex = 14; // // textBox2 // this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(167, 150); + this.textBox2.Location = new System.Drawing.Point(306, 262); + this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(167, 41); + this.textBox2.Size = new System.Drawing.Size(303, 65); this.textBox2.TabIndex = 6; this.textBox2.Click += new System.EventHandler(this.textBox2_Click); // @@ -371,9 +390,10 @@ // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(37, 156); + this.label17.Location = new System.Drawing.Point(68, 273); + this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(103, 29); + this.label17.Size = new System.Drawing.Size(178, 51); this.label17.TabIndex = 5; this.label17.Text = "数量："; // @@ -381,9 +401,10 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(378, 84); + this.label16.Location = new System.Drawing.Point(693, 147); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(141, 29); + this.label16.Size = new System.Drawing.Size(238, 51); this.label16.TabIndex = 4; this.label16.Text = "(yyMMdd)"; // @@ -391,18 +412,20 @@ // this.textBox1.Enabled = false; this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(168, 81); + this.textBox1.Location = new System.Drawing.Point(308, 142); + this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(166, 41); + this.textBox1.Size = new System.Drawing.Size(301, 65); this.textBox1.TabIndex = 3; // // label15 // this.label15.AutoSize = true; this.label15.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(38, 89); + this.label15.Location = new System.Drawing.Point(70, 156); + this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(103, 29); + this.label15.Size = new System.Drawing.Size(178, 51); this.label15.TabIndex = 2; this.label15.Text = "批次："; // @@ -410,18 +433,20 @@ // this.comboBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(168, 19); + this.comboBox2.Location = new System.Drawing.Point(308, 33); + this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(481, 37); + this.comboBox2.Size = new System.Drawing.Size(879, 59); this.comboBox2.TabIndex = 1; // // label14 // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label14.Location = new System.Drawing.Point(38, 23); + this.label14.Location = new System.Drawing.Point(70, 40); + this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(103, 29); + this.label14.Size = new System.Drawing.Size(178, 51); this.label14.TabIndex = 0; this.label14.Text = "产品："; // @@ -430,9 +455,10 @@ this.label18.BackColor = System.Drawing.Color.DeepSkyBlue; this.label18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(1129, 763); + this.label18.Location = new System.Drawing.Point(2070, 1335); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(73, 252); + this.label18.Size = new System.Drawing.Size(132, 440); this.label18.TabIndex = 15; this.label18.Text = "补打"; this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -444,9 +470,10 @@ this.label19.BackColor = System.Drawing.Color.DeepSkyBlue; this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(1056, 763); + this.label19.Location = new System.Drawing.Point(1936, 1335); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(73, 252); + this.label19.Size = new System.Drawing.Size(132, 440); this.label19.TabIndex = 16; this.label19.Text = "手工打印"; this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -457,9 +484,10 @@ this.label20.BackColor = System.Drawing.Color.DeepSkyBlue; this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(1202, 763); + this.label20.Location = new System.Drawing.Point(2204, 1335); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(73, 252); + this.label20.Size = new System.Drawing.Size(132, 440); this.label20.TabIndex = 17; this.label20.Text = "删除条码"; this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -471,9 +499,10 @@ this.label21.BackColor = System.Drawing.Color.DeepSkyBlue; this.label21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label21.Location = new System.Drawing.Point(1081, 93); + this.label21.Location = new System.Drawing.Point(1982, 163); + this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(192, 50); + this.label21.Size = new System.Drawing.Size(350, 86); this.label21.TabIndex = 18; this.label21.Text = "停机录入"; this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -492,16 +521,18 @@ this.panel3.Controls.Add(this.button1); this.panel3.Controls.Add(this.textBox3); this.panel3.Controls.Add(this.label22); - this.panel3.Location = new System.Drawing.Point(512, 555); + this.panel3.Location = new System.Drawing.Point(939, 971); + this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(527, 56); + this.panel3.Size = new System.Drawing.Size(965, 96); this.panel3.TabIndex = 19; // // button2 // - this.button2.Location = new System.Drawing.Point(417, 20); + this.button2.Location = new System.Drawing.Point(765, 35); + this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.Size = new System.Drawing.Size(138, 40); this.button2.TabIndex = 3; this.button2.Text = "取消"; this.button2.UseVisualStyleBackColor = true; @@ -509,9 +540,10 @@ // // button1 // - this.button1.Location = new System.Drawing.Point(309, 20); + this.button1.Location = new System.Drawing.Point(567, 35); + this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.Size = new System.Drawing.Size(138, 40); this.button1.TabIndex = 2; this.button1.Text = "确定"; this.button1.UseVisualStyleBackColor = true; @@ -519,9 +551,10 @@ // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(81, 20); + this.textBox3.Location = new System.Drawing.Point(149, 35); + this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(176, 21); + this.textBox3.Size = new System.Drawing.Size(319, 31); this.textBox3.TabIndex = 1; this.textBox3.UseSystemPasswordChar = true; this.textBox3.Click += new System.EventHandler(this.textBox3_Click); @@ -530,17 +563,18 @@ // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(26, 24); + this.label22.Location = new System.Drawing.Point(48, 42); + this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(41, 12); + this.label22.Size = new System.Drawing.Size(73, 21); this.label22.TabIndex = 0; this.label22.Text = "密码："; // // FrmBarCode // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1264, 985); + this.ClientSize = new System.Drawing.Size(2317, 1724); this.Controls.Add(this.panel3); this.Controls.Add(this.label21); this.Controls.Add(this.label20); @@ -561,7 +595,8 @@ this.Controls.Add(this.label4); this.Controls.Add(this.label3); this.Controls.Add(this.panel1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmBarCode"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Form1"; diff --git a/InjectionPC/FrmBarCodeNew.Designer.cs b/InjectionPC/FrmBarCodeNew.Designer.cs index 99a51f0..f74d325 100644 --- a/InjectionPC/FrmBarCodeNew.Designer.cs +++ b/InjectionPC/FrmBarCodeNew.Designer.cs @@ -69,6 +69,7 @@ this.button1 = new System.Windows.Forms.Button(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label22 = new System.Windows.Forms.Label(); + this.lbVer = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel2.SuspendLayout(); @@ -120,7 +121,7 @@ this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(1669, 146); this.label1.TabIndex = 1; - this.label1.Text = "注塑车间条码打印new"; + this.label1.Text = "注塑车间条码打印"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label3 @@ -363,6 +364,7 @@ // panel2 // this.panel2.BackColor = System.Drawing.Color.Aquamarine; + this.panel2.Controls.Add(this.lbVer); this.panel2.Controls.Add(this.textBox2); this.panel2.Controls.Add(this.label17); this.panel2.Controls.Add(this.label16); @@ -569,6 +571,16 @@ this.label22.TabIndex = 0; this.label22.Text = "密码："; // + // lbVer + // + this.lbVer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.lbVer.AutoSize = true; + this.lbVer.Location = new System.Drawing.Point(1228, 299); + this.lbVer.Name = "lbVer"; + this.lbVer.Size = new System.Drawing.Size(54, 21); + this.lbVer.TabIndex = 7; + this.lbVer.Text = " "; + // // FrmBarCodeNew // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); @@ -596,6 +608,7 @@ this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.MinimizeBox = false; this.Name = "FrmBarCodeNew"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Form1"; @@ -648,7 +661,7 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.Label label22; - + private System.Windows.Forms.Label lbVer; } } diff --git a/InjectionPC/FrmBarCodeNew.cs b/InjectionPC/FrmBarCodeNew.cs index 6d844e2..c62620c 100644 --- a/InjectionPC/FrmBarCodeNew.cs +++ b/InjectionPC/FrmBarCodeNew.cs @@ -51,14 +51,14 @@ namespace InjectionPC var serverUrl = "http://10.60.101.10:8013/"; var updateXmlFileName = "InjectionUpdate.xml"; var updater = new AutoUpdater(); - if (updater.CheckUpdateLoad(serverUrl, updateXmlFileName)) - { - Environment.Exit(0); - } + //if (updater.CheckUpdateLoad(serverUrl, updateXmlFileName)) + //{ + // Environment.Exit(0); + //} //string serialNo = BasicDAL.GetSjBarCodeSerialNo("2200000175240319", "240716"); _syncontext = SynchronizationContext.Current; - + lbVer.Text = Application.ProductVersion; Control.CheckForIllegalCrossThreadCalls = false; Thread t = new Thread(new ThreadStart(TimeGo)); t.Start(); diff --git a/InjectionPC/Properties/AssemblyInfo.cs b/InjectionPC/Properties/AssemblyInfo.cs index 6dc0db4..1f3dc29 100644 --- a/InjectionPC/Properties/AssemblyInfo.cs +++ b/InjectionPC/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.19")] -[assembly: AssemblyFileVersion("1.0.0.19")] +[assembly: AssemblyVersion("1.0.0.20")] +[assembly: AssemblyFileVersion("1.0.0.20")] //1.0.0.19 注塑码验重，批次提前生成后查询 barcodeDal方法SearchInfoByStock(string StockNo) diff --git a/InjectionSearch/FrmBarCodeSearchNew.Designer.cs b/InjectionSearch/FrmBarCodeSearchNew.Designer.cs index 9e8c42c..f390258 100644 --- a/InjectionSearch/FrmBarCodeSearchNew.Designer.cs +++ b/InjectionSearch/FrmBarCodeSearchNew.Designer.cs @@ -57,6 +57,7 @@ this.label6 = new System.Windows.Forms.Label(); this.textBox5 = new System.Windows.Forms.TextBox(); this.glacialList1 = new GlacialComponents.Controls.GlacialList(); + this.lbVer = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); this.SuspendLayout(); @@ -65,9 +66,10 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label1.Location = new System.Drawing.Point(90, 59); + this.label1.Location = new System.Drawing.Point(165, 103); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(103, 29); + this.label1.Size = new System.Drawing.Size(178, 51); this.label1.TabIndex = 0; this.label1.Text = "产品："; // @@ -75,9 +77,10 @@ // this.comboBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(222, 57); + this.comboBox1.Location = new System.Drawing.Point(407, 100); + this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(627, 37); + this.comboBox1.Size = new System.Drawing.Size(1146, 59); this.comboBox1.TabIndex = 1; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // @@ -85,9 +88,10 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label2.Location = new System.Drawing.Point(85, 109); + this.label2.Location = new System.Drawing.Point(156, 191); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(133, 29); + this.label2.Size = new System.Drawing.Size(230, 51); this.label2.TabIndex = 2; this.label2.Text = "零件号："; // @@ -95,33 +99,37 @@ // this.textBox1.Enabled = false; this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.textBox1.Location = new System.Drawing.Point(222, 101); + this.textBox1.Location = new System.Drawing.Point(407, 177); + this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(239, 41); + this.textBox1.Size = new System.Drawing.Size(435, 65); this.textBox1.TabIndex = 3; // // textBox2 // this.textBox2.Enabled = false; this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.textBox2.Location = new System.Drawing.Point(222, 152); + this.textBox2.Location = new System.Drawing.Point(407, 266); + this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(627, 41); + this.textBox2.Size = new System.Drawing.Size(1146, 65); this.textBox2.TabIndex = 4; // // label3 // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label3.Location = new System.Drawing.Point(90, 163); + this.label3.Location = new System.Drawing.Point(165, 285); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(103, 29); + this.label3.Size = new System.Drawing.Size(178, 51); this.label3.TabIndex = 5; this.label3.Text = "原料："; // // panel1 // this.panel1.BackColor = System.Drawing.Color.Aquamarine; + this.panel1.Controls.Add(this.lbVer); this.panel1.Controls.Add(this.comboBox2); this.panel1.Controls.Add(this.label7); this.panel1.Controls.Add(this.label16); @@ -135,27 +143,30 @@ this.panel1.Controls.Add(this.textBox2); this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.textBox1); - this.panel1.Location = new System.Drawing.Point(185, 541); + this.panel1.Location = new System.Drawing.Point(339, 947); + this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(936, 317); + this.panel1.Size = new System.Drawing.Size(1716, 555); this.panel1.TabIndex = 6; // // comboBox2 // this.comboBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(222, 8); + this.comboBox2.Location = new System.Drawing.Point(407, 14); + this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(206, 37); + this.comboBox2.Size = new System.Drawing.Size(374, 59); this.comboBox2.TabIndex = 12; // // label7 // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label7.Location = new System.Drawing.Point(90, 16); + this.label7.Location = new System.Drawing.Point(165, 28); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(103, 29); + this.label7.Size = new System.Drawing.Size(178, 51); this.label7.TabIndex = 11; this.label7.Text = "机台："; // @@ -163,9 +174,10 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(490, 210); + this.label16.Location = new System.Drawing.Point(898, 368); + this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(141, 29); + this.label16.Size = new System.Drawing.Size(238, 51); this.label16.TabIndex = 10; this.label16.Text = "(yyMMdd)"; // @@ -173,18 +185,20 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label5.Location = new System.Drawing.Point(86, 259); + this.label5.Location = new System.Drawing.Point(158, 453); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(103, 29); + this.label5.Size = new System.Drawing.Size(178, 51); this.label5.TabIndex = 8; this.label5.Text = "数量："; // // textBox4 // this.textBox4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.textBox4.Location = new System.Drawing.Point(222, 259); + this.textBox4.Location = new System.Drawing.Point(407, 453); + this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(239, 41); + this.textBox4.Size = new System.Drawing.Size(435, 65); this.textBox4.TabIndex = 9; this.textBox4.Text = "1000"; // @@ -192,18 +206,20 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label4.Location = new System.Drawing.Point(80, 219); + this.label4.Location = new System.Drawing.Point(147, 383); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(133, 29); + this.label4.Size = new System.Drawing.Size(230, 51); this.label4.TabIndex = 6; this.label4.Text = "批次号："; // // textBox3 // this.textBox3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.textBox3.Location = new System.Drawing.Point(222, 207); + this.textBox3.Location = new System.Drawing.Point(407, 362); + this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(239, 41); + this.textBox3.Size = new System.Drawing.Size(435, 65); this.textBox3.TabIndex = 7; // // label19 @@ -211,9 +227,10 @@ this.label19.BackColor = System.Drawing.Color.DeepSkyBlue; this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(1186, 541); + this.label19.Location = new System.Drawing.Point(2174, 947); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(73, 317); + this.label19.Size = new System.Drawing.Size(132, 553); this.label19.TabIndex = 17; this.label19.Text = "打印条码"; this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -224,9 +241,10 @@ this.label11.BackColor = System.Drawing.Color.DeepSkyBlue; this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label11.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(2, 541); + this.label11.Location = new System.Drawing.Point(4, 947); + this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(182, 317); + this.label11.Size = new System.Drawing.Size(332, 553); this.label11.TabIndex = 18; this.label11.Text = "打印信息："; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -236,9 +254,10 @@ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue; this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label10.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(2, 66); + this.label10.Location = new System.Drawing.Point(4, 116); + this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(182, 475); + this.label10.Size = new System.Drawing.Size(332, 830); this.label10.TabIndex = 19; this.label10.Text = "打印记录："; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -248,9 +267,10 @@ this.label18.BackColor = System.Drawing.Color.DeepSkyBlue; this.label18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(1114, 541); + this.label18.Location = new System.Drawing.Point(2042, 947); + this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(73, 317); + this.label18.Size = new System.Drawing.Size(132, 553); this.label18.TabIndex = 20; this.label18.Text = "补打"; this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -263,17 +283,19 @@ this.panel3.Controls.Add(this.button1); this.panel3.Controls.Add(this.label6); this.panel3.Controls.Add(this.textBox5); - this.panel3.Location = new System.Drawing.Point(2, 2); + this.panel3.Location = new System.Drawing.Point(4, 4); + this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1250, 61); + this.panel3.Size = new System.Drawing.Size(2290, 105); this.panel3.TabIndex = 22; // // button1 // this.button1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.button1.Location = new System.Drawing.Point(1074, 10); + this.button1.Location = new System.Drawing.Point(1969, 18); + this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(95, 43); + this.button1.Size = new System.Drawing.Size(174, 75); this.button1.TabIndex = 6; this.button1.Text = "查询"; this.button1.UseVisualStyleBackColor = true; @@ -283,18 +305,20 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.label6.Location = new System.Drawing.Point(477, 12); + this.label6.Location = new System.Drawing.Point(875, 21); + this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(133, 29); + this.label6.Size = new System.Drawing.Size(230, 51); this.label6.TabIndex = 4; this.label6.Text = "条码号："; // // textBox5 // this.textBox5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); - this.textBox5.Location = new System.Drawing.Point(626, 9); + this.textBox5.Location = new System.Drawing.Point(1148, 16); + this.textBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(415, 41); + this.textBox5.Size = new System.Drawing.Size(758, 65); this.textBox5.TabIndex = 5; // // glacialList1 @@ -377,26 +401,37 @@ this.glacialList1.HoverEvents = false; this.glacialList1.HoverTime = 1; this.glacialList1.ImageList = null; - this.glacialList1.ItemHeight = 21; + this.glacialList1.ItemHeight = 35; this.glacialList1.ItemWordWrap = false; - this.glacialList1.Location = new System.Drawing.Point(185, 65); + this.glacialList1.Location = new System.Drawing.Point(339, 114); + this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; this.glacialList1.SelectionColor = System.Drawing.Color.Lime; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(1074, 473); + this.glacialList1.Size = new System.Drawing.Size(1969, 828); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 23; this.glacialList1.Text = "glacialList1"; // - // FrmBarCodeSearch + // lbVer // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.lbVer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.lbVer.AutoSize = true; + this.lbVer.Location = new System.Drawing.Point(1534, 368); + this.lbVer.Name = "lbVer"; + this.lbVer.Size = new System.Drawing.Size(54, 21); + this.lbVer.TabIndex = 13; + this.lbVer.Text = " "; + // + // FrmBarCodeSearchNew + // + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1264, 861); + this.ClientSize = new System.Drawing.Size(2317, 1507); this.Controls.Add(this.glacialList1); this.Controls.Add(this.panel3); this.Controls.Add(this.label18); @@ -404,7 +439,9 @@ this.Controls.Add(this.label11); this.Controls.Add(this.label19); this.Controls.Add(this.panel1); - this.Name = "FrmBarCodeSearch"; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.MinimizeBox = false; + this.Name = "FrmBarCodeSearchNew"; this.Text = "条码信息"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBarCodeSearch_FormClosing); this.Load += new System.EventHandler(this.FrmBarCodeSearch_Load); @@ -441,5 +478,6 @@ private GlacialComponents.Controls.GlacialList glacialList1; private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label lbVer; } } \ No newline at end of file diff --git a/InjectionSearch/FrmBarCodeSearchNew.cs b/InjectionSearch/FrmBarCodeSearchNew.cs index 4363c58..787edc4 100644 --- a/InjectionSearch/FrmBarCodeSearchNew.cs +++ b/InjectionSearch/FrmBarCodeSearchNew.cs @@ -26,6 +26,8 @@ namespace InjectionSearch { InitializeComponent(); _printTemplateName = Application.StartupPath + "\\Report\\111 - 副本.grf"; + + lbVer.Text = Application.ProductVersion; } private void initProduct() diff --git a/InjectionSearch/Properties/AssemblyInfo.cs b/InjectionSearch/Properties/AssemblyInfo.cs index 62cd571..cef9578 100644 --- a/InjectionSearch/Properties/AssemblyInfo.cs +++ b/InjectionSearch/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.1")] -[assembly: AssemblyFileVersion("1.0.0.1")] +[assembly: AssemblyVersion("1.0.0.20")] +[assembly: AssemblyFileVersion("1.0.0.20")] diff --git a/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs b/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs index 2335847..9298733 100644 --- a/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs +++ b/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs @@ -294,11 +294,17 @@ namespace MESClassLibrary.BLL.BasicInfo try { List list=new List(); + //string sql = + // @"SELECT dbo.tb_Product.ProductID, dbo.tb_Product.ProductName, dbo.tb_ProductType.ProductTypeNo + // FROM dbo.tb_Product LEFT OUTER JOIN + // dbo.tb_ProductType ON dbo.tb_Product.ProductTypeID = dbo.tb_ProductType.ProductTypeID + // where dbo.tb_ProductType.ProductTypeNo='"+ productTypeNo+ @"'"; + string sql = - @"SELECT dbo.tb_Product.ProductID, dbo.tb_Product.ProductName, dbo.tb_ProductType.ProductTypeNo + @"SELECT dbo.tb_Product.ProductID, dbo.tb_Product.ProductName, dbo.tb_ProductType.ProductTypeID FROM dbo.tb_Product LEFT OUTER JOIN dbo.tb_ProductType ON dbo.tb_Product.ProductTypeID = dbo.tb_ProductType.ProductTypeID - where dbo.tb_ProductType.ProductTypeNo='"+ productTypeNo+ @"'"; + where dbo.tb_ProductType.ProductTypeNo='" + productTypeNo + @"'"; DataTable dt = SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql).Tables[0]; if (dt != null && dt.Rows.Count > 0) diff --git a/MESWebSite/MESWebSite.csproj b/MESWebSite/MESWebSite.csproj index 67bd182..85ea89a 100644 --- a/MESWebSite/MESWebSite.csproj +++ b/MESWebSite/MESWebSite.csproj @@ -104,6 +104,7 @@ + PreserveNewest