From e02324da8784dec6b8c891edbf8ce81696c41339 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Thu, 6 Mar 2025 08:53:39 +0800 Subject: [PATCH] 1 --- InjectionPC/FrmMain2408.Designer.cs | 120 +++++++++++++------------- InjectionPC/FrmMain2408.cs | 125 +++++++++++++++++++++------- InjectionPC/FrmMain2411.cs | 5 ++ MESWebSite/Manage/Product.aspx | 4 +- 4 files changed, 162 insertions(+), 92 deletions(-) diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs index 235dd36..ced45c4 100644 --- a/InjectionPC/FrmMain2408.Designer.cs +++ b/InjectionPC/FrmMain2408.Designer.cs @@ -221,7 +221,7 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel1.Margin = new System.Windows.Forms.Padding(5); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(2908, 1829); this.panel1.TabIndex = 0; @@ -233,7 +233,7 @@ this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold); this.panel7.Location = new System.Drawing.Point(0, 168); - this.panel7.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel7.Margin = new System.Windows.Forms.Padding(5); this.panel7.Name = "panel7"; this.panel7.Size = new System.Drawing.Size(2908, 1661); this.panel7.TabIndex = 1; @@ -244,7 +244,7 @@ this.panel23.Controls.Add(this.panel24); this.panel23.Dock = System.Windows.Forms.DockStyle.Fill; this.panel23.Location = new System.Drawing.Point(0, 104); - this.panel23.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel23.Margin = new System.Windows.Forms.Padding(5); this.panel23.Name = "panel23"; this.panel23.Size = new System.Drawing.Size(2908, 1557); this.panel23.TabIndex = 1; @@ -255,7 +255,7 @@ this.panel27.Controls.Add(this.panel28); this.panel27.Dock = System.Windows.Forms.DockStyle.Fill; this.panel27.Location = new System.Drawing.Point(0, 1115); - this.panel27.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel27.Margin = new System.Windows.Forms.Padding(5); this.panel27.Name = "panel27"; this.panel27.Size = new System.Drawing.Size(2908, 442); this.panel27.TabIndex = 1; @@ -266,7 +266,7 @@ this.panel29.Controls.Add(this.panel30); this.panel29.Dock = System.Windows.Forms.DockStyle.Fill; this.panel29.Location = new System.Drawing.Point(339, 0); - this.panel29.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel29.Margin = new System.Windows.Forms.Padding(5); this.panel29.Name = "panel29"; this.panel29.Size = new System.Drawing.Size(2569, 442); this.panel29.TabIndex = 1; @@ -277,7 +277,7 @@ this.panel31.Controls.Add(this.panel32); this.panel31.Dock = System.Windows.Forms.DockStyle.Fill; this.panel31.Location = new System.Drawing.Point(133, 0); - this.panel31.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel31.Margin = new System.Windows.Forms.Padding(5); this.panel31.Name = "panel31"; this.panel31.Size = new System.Drawing.Size(2436, 442); this.panel31.TabIndex = 1; @@ -288,7 +288,7 @@ this.panel33.Controls.Add(this.panel34); this.panel33.Dock = System.Windows.Forms.DockStyle.Fill; this.panel33.Location = new System.Drawing.Point(133, 0); - this.panel33.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel33.Margin = new System.Windows.Forms.Padding(5); this.panel33.Name = "panel33"; this.panel33.Size = new System.Drawing.Size(2303, 442); this.panel33.TabIndex = 1; @@ -298,7 +298,7 @@ this.panel35.Controls.Add(this.panel37); this.panel35.Dock = System.Windows.Forms.DockStyle.Fill; this.panel35.Location = new System.Drawing.Point(0, 0); - this.panel35.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel35.Margin = new System.Windows.Forms.Padding(5); this.panel35.Name = "panel35"; this.panel35.Size = new System.Drawing.Size(2170, 442); this.panel35.TabIndex = 1; @@ -308,7 +308,7 @@ this.panel37.Controls.Add(this.panel40); this.panel37.Dock = System.Windows.Forms.DockStyle.Fill; this.panel37.Location = new System.Drawing.Point(0, 0); - this.panel37.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel37.Margin = new System.Windows.Forms.Padding(5); this.panel37.Name = "panel37"; this.panel37.Size = new System.Drawing.Size(2170, 442); this.panel37.TabIndex = 1; @@ -319,7 +319,7 @@ this.panel40.Controls.Add(this.panel41); this.panel40.Dock = System.Windows.Forms.DockStyle.Fill; this.panel40.Location = new System.Drawing.Point(0, 0); - this.panel40.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel40.Margin = new System.Windows.Forms.Padding(5); this.panel40.Name = "panel40"; this.panel40.Size = new System.Drawing.Size(2170, 442); this.panel40.TabIndex = 1; @@ -330,7 +330,7 @@ this.panel42.Controls.Add(this.panel43); this.panel42.Dock = System.Windows.Forms.DockStyle.Fill; this.panel42.Location = new System.Drawing.Point(0, 0); - this.panel42.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel42.Margin = new System.Windows.Forms.Padding(5); this.panel42.Name = "panel42"; this.panel42.Size = new System.Drawing.Size(2037, 442); this.panel42.TabIndex = 1; @@ -352,7 +352,7 @@ this.panel39.Controls.Add(this.label21); this.panel39.Dock = System.Windows.Forms.DockStyle.Fill; this.panel39.Location = new System.Drawing.Point(0, 0); - this.panel39.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel39.Margin = new System.Windows.Forms.Padding(5); this.panel39.Name = "panel39"; this.panel39.Size = new System.Drawing.Size(1904, 442); this.panel39.TabIndex = 1; @@ -416,7 +416,7 @@ // 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(240, 333); - this.textBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.textBox2.Margin = new System.Windows.Forms.Padding(5); this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(329, 74); this.textBox2.TabIndex = 13; @@ -448,7 +448,7 @@ 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(243, 197); - this.textBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.textBox1.Margin = new System.Windows.Forms.Padding(5); this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(328, 74); this.textBox1.TabIndex = 10; @@ -471,7 +471,7 @@ this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(243, 72); - this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.comboBox2.Margin = new System.Windows.Forms.Padding(5); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(928, 56); this.comboBox2.TabIndex = 8; @@ -494,7 +494,7 @@ this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; this.panel43.Location = new System.Drawing.Point(1904, 0); - this.panel43.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel43.Margin = new System.Windows.Forms.Padding(5); this.panel43.Name = "panel43"; this.panel43.Size = new System.Drawing.Size(133, 442); this.panel43.TabIndex = 0; @@ -518,7 +518,7 @@ this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; this.panel41.Location = new System.Drawing.Point(2037, 0); - this.panel41.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel41.Margin = new System.Windows.Forms.Padding(5); this.panel41.Name = "panel41"; this.panel41.Size = new System.Drawing.Size(133, 442); this.panel41.TabIndex = 0; @@ -542,7 +542,7 @@ this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; this.panel34.Location = new System.Drawing.Point(2170, 0); - this.panel34.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel34.Margin = new System.Windows.Forms.Padding(5); this.panel34.Name = "panel34"; this.panel34.Size = new System.Drawing.Size(133, 442); this.panel34.TabIndex = 0; @@ -566,7 +566,7 @@ this.panel32.Controls.Add(this.label14); this.panel32.Dock = System.Windows.Forms.DockStyle.Left; this.panel32.Location = new System.Drawing.Point(0, 0); - this.panel32.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel32.Margin = new System.Windows.Forms.Padding(5); this.panel32.Name = "panel32"; this.panel32.Size = new System.Drawing.Size(133, 442); this.panel32.TabIndex = 0; @@ -590,7 +590,7 @@ this.panel30.Controls.Add(this.label13); this.panel30.Dock = System.Windows.Forms.DockStyle.Left; this.panel30.Location = new System.Drawing.Point(0, 0); - this.panel30.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel30.Margin = new System.Windows.Forms.Padding(5); this.panel30.Name = "panel30"; this.panel30.Size = new System.Drawing.Size(133, 442); this.panel30.TabIndex = 0; @@ -614,7 +614,7 @@ this.panel28.Controls.Add(this.label12); this.panel28.Dock = System.Windows.Forms.DockStyle.Left; this.panel28.Location = new System.Drawing.Point(0, 0); - this.panel28.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel28.Margin = new System.Windows.Forms.Padding(5); this.panel28.Name = "panel28"; this.panel28.Size = new System.Drawing.Size(339, 442); this.panel28.TabIndex = 0; @@ -639,7 +639,7 @@ this.panel24.Controls.Add(this.panel25); this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); - this.panel24.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel24.Margin = new System.Windows.Forms.Padding(5); this.panel24.Name = "panel24"; this.panel24.Size = new System.Drawing.Size(2908, 1115); this.panel24.TabIndex = 0; @@ -651,7 +651,7 @@ this.panel26.Controls.Add(this.glacialList1); this.panel26.Dock = System.Windows.Forms.DockStyle.Fill; this.panel26.Location = new System.Drawing.Point(415, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel26.Margin = new System.Windows.Forms.Padding(5); this.panel26.Name = "panel26"; this.panel26.Size = new System.Drawing.Size(2493, 1115); this.panel26.TabIndex = 1; @@ -664,7 +664,7 @@ this.panel45.Controls.Add(this.textBox4); this.panel45.Controls.Add(this.label25); this.panel45.Location = new System.Drawing.Point(323, 677); - this.panel45.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel45.Margin = new System.Windows.Forms.Padding(5); this.panel45.Name = "panel45"; this.panel45.Size = new System.Drawing.Size(1397, 151); this.panel45.TabIndex = 2; @@ -673,7 +673,7 @@ // this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button3.Location = new System.Drawing.Point(1232, 43); - this.button3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.button3.Margin = new System.Windows.Forms.Padding(5); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(160, 59); this.button3.TabIndex = 5; @@ -685,7 +685,7 @@ // this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button4.Location = new System.Drawing.Point(1037, 43); - this.button4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.button4.Margin = new System.Windows.Forms.Padding(5); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(160, 59); this.button4.TabIndex = 4; @@ -697,7 +697,7 @@ // this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.textBox4.Location = new System.Drawing.Point(336, 45); - this.textBox4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.textBox4.Margin = new System.Windows.Forms.Padding(5); this.textBox4.Name = "textBox4"; this.textBox4.Size = new System.Drawing.Size(660, 55); this.textBox4.TabIndex = 3; @@ -722,7 +722,7 @@ this.panel44.Controls.Add(this.textBox3); this.panel44.Controls.Add(this.label24); this.panel44.Location = new System.Drawing.Point(360, 363); - this.panel44.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel44.Margin = new System.Windows.Forms.Padding(5); this.panel44.Name = "panel44"; this.panel44.Size = new System.Drawing.Size(1397, 151); this.panel44.TabIndex = 1; @@ -731,7 +731,7 @@ // this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button2.Location = new System.Drawing.Point(1197, 43); - this.button2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.button2.Margin = new System.Windows.Forms.Padding(5); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(160, 59); this.button2.TabIndex = 3; @@ -743,7 +743,7 @@ // this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button1.Location = new System.Drawing.Point(1027, 40); - this.button1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.button1.Margin = new System.Windows.Forms.Padding(5); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(160, 59); this.button1.TabIndex = 2; @@ -755,7 +755,7 @@ // this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.textBox3.Location = new System.Drawing.Point(208, 43); - this.textBox3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.textBox3.Margin = new System.Windows.Forms.Padding(5); this.textBox3.Name = "textBox3"; this.textBox3.Size = new System.Drawing.Size(737, 55); this.textBox3.TabIndex = 1; @@ -838,7 +838,7 @@ this.glacialList1.ItemHeight = 57; this.glacialList1.ItemWordWrap = false; this.glacialList1.Location = new System.Drawing.Point(0, 0); - this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.glacialList1.Margin = new System.Windows.Forms.Padding(5); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; this.glacialList1.SelectedTextColor = System.Drawing.Color.White; @@ -858,7 +858,7 @@ this.panel25.Controls.Add(this.panel36); this.panel25.Dock = System.Windows.Forms.DockStyle.Left; this.panel25.Location = new System.Drawing.Point(0, 0); - this.panel25.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel25.Margin = new System.Windows.Forms.Padding(5); this.panel25.Name = "panel25"; this.panel25.Size = new System.Drawing.Size(415, 1115); this.panel25.TabIndex = 0; @@ -889,7 +889,7 @@ this.panel38.Controls.Add(this.label17); this.panel38.Controls.Add(this.label16); this.panel38.Location = new System.Drawing.Point(5, 5); - this.panel38.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel38.Margin = new System.Windows.Forms.Padding(5); this.panel38.Name = "panel38"; this.panel38.Size = new System.Drawing.Size(404, 288); this.panel38.TabIndex = 1; @@ -1116,7 +1116,7 @@ this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeR.FormattingEnabled = true; this.comBoxSizeR.Location = new System.Drawing.Point(0, 21); - this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5); this.comBoxSizeR.Name = "comBoxSizeR"; this.comBoxSizeR.Size = new System.Drawing.Size(136, 72); this.comBoxSizeR.TabIndex = 3; @@ -1126,7 +1126,7 @@ this.panel36.Controls.Add(this.tableLayoutPanel1); this.panel36.Dock = System.Windows.Forms.DockStyle.Top; this.panel36.Location = new System.Drawing.Point(0, 0); - this.panel36.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel36.Margin = new System.Windows.Forms.Padding(5); this.panel36.Name = "panel36"; this.panel36.Size = new System.Drawing.Size(415, 464); this.panel36.TabIndex = 0; @@ -1316,7 +1316,7 @@ this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeL.FormattingEnabled = true; this.comBoxSizeL.Location = new System.Drawing.Point(2, 10); - this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5); this.comBoxSizeL.Name = "comBoxSizeL"; this.comBoxSizeL.Size = new System.Drawing.Size(136, 72); this.comBoxSizeL.TabIndex = 3; @@ -1327,7 +1327,7 @@ this.panel8.Controls.Add(this.panel9); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel8.Margin = new System.Windows.Forms.Padding(5); this.panel8.Name = "panel8"; this.panel8.Size = new System.Drawing.Size(2908, 104); this.panel8.TabIndex = 0; @@ -1338,7 +1338,7 @@ this.panel10.Controls.Add(this.panel11); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; this.panel10.Location = new System.Drawing.Point(415, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel10.Margin = new System.Windows.Forms.Padding(5); this.panel10.Name = "panel10"; this.panel10.Size = new System.Drawing.Size(2493, 104); this.panel10.TabIndex = 2; @@ -1349,7 +1349,7 @@ this.panel12.Controls.Add(this.panel15); this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; this.panel12.Location = new System.Drawing.Point(492, 0); - this.panel12.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel12.Margin = new System.Windows.Forms.Padding(5); this.panel12.Name = "panel12"; this.panel12.Size = new System.Drawing.Size(2001, 104); this.panel12.TabIndex = 1; @@ -1360,7 +1360,7 @@ this.panel16.Controls.Add(this.panel19); this.panel16.Dock = System.Windows.Forms.DockStyle.Fill; this.panel16.Location = new System.Drawing.Point(509, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel16.Margin = new System.Windows.Forms.Padding(5); this.panel16.Name = "panel16"; this.panel16.Size = new System.Drawing.Size(1492, 104); this.panel16.TabIndex = 1; @@ -1371,7 +1371,7 @@ this.panel20.Controls.Add(this.panel22); this.panel20.Dock = System.Windows.Forms.DockStyle.Fill; this.panel20.Location = new System.Drawing.Point(467, 0); - this.panel20.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel20.Margin = new System.Windows.Forms.Padding(5); this.panel20.Name = "panel20"; this.panel20.Size = new System.Drawing.Size(1025, 104); this.panel20.TabIndex = 1; @@ -1395,7 +1395,7 @@ this.panel22.Controls.Add(this.label9); this.panel22.Dock = System.Windows.Forms.DockStyle.Left; this.panel22.Location = new System.Drawing.Point(0, 0); - this.panel22.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel22.Margin = new System.Windows.Forms.Padding(5); this.panel22.Name = "panel22"; this.panel22.Size = new System.Drawing.Size(372, 104); this.panel22.TabIndex = 0; @@ -1421,7 +1421,7 @@ this.panel19.Controls.Add(this.panel21); this.panel19.Dock = System.Windows.Forms.DockStyle.Left; this.panel19.Location = new System.Drawing.Point(0, 0); - this.panel19.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel19.Margin = new System.Windows.Forms.Padding(5); this.panel19.Name = "panel19"; this.panel19.Size = new System.Drawing.Size(467, 104); this.panel19.TabIndex = 0; @@ -1444,7 +1444,7 @@ this.panel21.Controls.Add(this.label7); this.panel21.Dock = System.Windows.Forms.DockStyle.Left; this.panel21.Location = new System.Drawing.Point(0, 0); - this.panel21.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel21.Margin = new System.Windows.Forms.Padding(5); this.panel21.Name = "panel21"; this.panel21.Size = new System.Drawing.Size(220, 104); this.panel21.TabIndex = 0; @@ -1470,7 +1470,7 @@ this.panel15.Controls.Add(this.panel17); this.panel15.Dock = System.Windows.Forms.DockStyle.Left; this.panel15.Location = new System.Drawing.Point(0, 0); - this.panel15.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel15.Margin = new System.Windows.Forms.Padding(5); this.panel15.Name = "panel15"; this.panel15.Size = new System.Drawing.Size(509, 104); this.panel15.TabIndex = 0; @@ -1480,7 +1480,7 @@ this.panel18.Controls.Add(this.label6); this.panel18.Dock = System.Windows.Forms.DockStyle.Fill; this.panel18.Location = new System.Drawing.Point(220, 0); - this.panel18.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel18.Margin = new System.Windows.Forms.Padding(5); this.panel18.Name = "panel18"; this.panel18.Size = new System.Drawing.Size(289, 104); this.panel18.TabIndex = 1; @@ -1503,7 +1503,7 @@ this.panel17.Controls.Add(this.label5); this.panel17.Dock = System.Windows.Forms.DockStyle.Left; this.panel17.Location = new System.Drawing.Point(0, 0); - this.panel17.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel17.Margin = new System.Windows.Forms.Padding(5); this.panel17.Name = "panel17"; this.panel17.Size = new System.Drawing.Size(220, 104); this.panel17.TabIndex = 0; @@ -1530,7 +1530,7 @@ this.panel11.Controls.Add(this.panel13); this.panel11.Dock = System.Windows.Forms.DockStyle.Left; this.panel11.Location = new System.Drawing.Point(0, 0); - this.panel11.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel11.Margin = new System.Windows.Forms.Padding(5); this.panel11.Name = "panel11"; this.panel11.Size = new System.Drawing.Size(492, 104); this.panel11.TabIndex = 0; @@ -1540,7 +1540,7 @@ this.panel14.Controls.Add(this.comboBox1); this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; this.panel14.Location = new System.Drawing.Point(220, 0); - this.panel14.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel14.Margin = new System.Windows.Forms.Padding(5); this.panel14.Name = "panel14"; this.panel14.Size = new System.Drawing.Size(272, 104); this.panel14.TabIndex = 1; @@ -1555,7 +1555,7 @@ "A班", "B班"}); this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.comboBox1.Margin = new System.Windows.Forms.Padding(5); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(272, 93); this.comboBox1.TabIndex = 0; @@ -1565,7 +1565,7 @@ this.panel13.Controls.Add(this.label4); this.panel13.Dock = System.Windows.Forms.DockStyle.Left; this.panel13.Location = new System.Drawing.Point(0, 0); - this.panel13.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel13.Margin = new System.Windows.Forms.Padding(5); this.panel13.Name = "panel13"; this.panel13.Size = new System.Drawing.Size(220, 104); this.panel13.TabIndex = 0; @@ -1589,7 +1589,7 @@ this.panel9.Controls.Add(this.label3); this.panel9.Dock = System.Windows.Forms.DockStyle.Left; this.panel9.Location = new System.Drawing.Point(0, 0); - this.panel9.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel9.Margin = new System.Windows.Forms.Padding(5); this.panel9.Name = "panel9"; this.panel9.Size = new System.Drawing.Size(415, 104); this.panel9.TabIndex = 0; @@ -1614,7 +1614,7 @@ this.panel2.Controls.Add(this.panel3); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel2.Margin = new System.Windows.Forms.Padding(5); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(2908, 168); this.panel2.TabIndex = 0; @@ -1625,7 +1625,7 @@ this.panel4.Controls.Add(this.panel5); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(339, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel4.Margin = new System.Windows.Forms.Padding(5); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(2569, 168); this.panel4.TabIndex = 1; @@ -1636,7 +1636,7 @@ this.panel6.Controls.Add(this.label1); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(0, 0); - this.panel6.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel6.Margin = new System.Windows.Forms.Padding(5); this.panel6.Name = "panel6"; this.panel6.Size = new System.Drawing.Size(2185, 168); this.panel6.TabIndex = 1; @@ -1671,7 +1671,7 @@ this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; this.panel5.Location = new System.Drawing.Point(2185, 0); - this.panel5.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel5.Margin = new System.Windows.Forms.Padding(5); this.panel5.Name = "panel5"; this.panel5.Size = new System.Drawing.Size(384, 168); this.panel5.TabIndex = 0; @@ -1695,7 +1695,7 @@ this.panel3.Controls.Add(this.pictureBox1); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel3.Margin = new System.Windows.Forms.Padding(5); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(339, 168); this.panel3.TabIndex = 0; @@ -1705,7 +1705,7 @@ 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(5, 5); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(5); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(335, 159); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1753,7 +1753,7 @@ this.ClientSize = new System.Drawing.Size(2908, 1829); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.Margin = new System.Windows.Forms.Padding(5); this.Name = "FrmMain2408"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmMain"; diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index 811db7c..dbba011 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -78,6 +78,7 @@ namespace InjectionPC { InitializeComponent(); this.Size = new Size(1280, 920); + timer3.Enabled = false; } public string planID = "", productID = "", nextPlanID = "", nextproductID = "",aa=""; @@ -317,33 +318,34 @@ namespace InjectionPC { if (_lastParts.Contains(partNo[i].ToString().Trim()) == false) { - string currentSize = string.Empty; - List list = GetProductBoxSize(partNo[i].ToString().Trim(), ref currentSize); + InitComboBoxSize(partNo[i].ToString().Trim(), i); + //string currentSize = string.Empty; + //List list = GetProductBoxSize(partNo[i].ToString().Trim(), ref currentSize); - if (i == 0) - { - comBoxSizeL.DataSource = list; - comBoxSizeL.SelectedItem = currentSize; - _selectItemL = currentSize; - int j = 0; - int.TryParse(currentSize, out j); - if (j > 0) - { - lbNeedQtyL.Text = j.ToString(); - } - } - else - { - comBoxSizeR.DataSource = list; - comBoxSizeR.SelectedItem = currentSize; - _selectItemR = currentSize; - int j = 0; - int.TryParse(currentSize, out j); - if (j > 0) - { - lbNeedQtyR.Text = j.ToString(); - } - } + //if (i == 0) + //{ + // comBoxSizeL.DataSource = list; + // comBoxSizeL.SelectedItem = currentSize; + // _selectItemL = currentSize; + // int j = 0; + // int.TryParse(currentSize, out j); + // if (j > 0) + // { + // lbNeedQtyL.Text = j.ToString(); + // } + //} + //else + //{ + // comBoxSizeR.DataSource = list; + // comBoxSizeR.SelectedItem = currentSize; + // _selectItemR = currentSize; + // int j = 0; + // int.TryParse(currentSize, out j); + // if (j > 0) + // { + // lbNeedQtyR.Text = j.ToString(); + // } + //} } } @@ -375,7 +377,38 @@ namespace InjectionPC LogErrBLL.AddInfo(ex.ToString(),MethodBase.GetCurrentMethod()); } } + void InitComboBoxSize(string partCode,int mould) + { + string currentSize = string.Empty; + List list = GetProductBoxSize(partCode, ref currentSize); + if (mould == 0) + { + _isShowHintL = false; + comBoxSizeL.DataSource = list; + comBoxSizeL.SelectedItem = currentSize; + _selectItemL = currentSize; + int j = 0; + int.TryParse(currentSize, out j); + if (j > 0) + { + lbNeedQtyL.Text = j.ToString(); + } + } + else + { + _isShowHintR = false; + comBoxSizeR.DataSource = list; + comBoxSizeR.SelectedItem = currentSize; + _selectItemR = currentSize; + int j = 0; + int.TryParse(currentSize, out j); + if (j > 0) + { + lbNeedQtyR.Text = j.ToString(); + } + } + } void comboBox2_MouseWheel(object sender, MouseEventArgs e) { HandledMouseEventArgs h = e as HandledMouseEventArgs; @@ -2624,6 +2657,12 @@ namespace InjectionPC lbPackageCodeR.Text = ""; } + string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(','); + for (int i = 0; i < partNo.Length; i++) + { + InitComboBoxSize(partNo[i], i); + } + } else @@ -3982,6 +4021,24 @@ namespace InjectionPC } void ChangeSize(string moudel) { + if(moudel == "0") + { + string pcd = lbPackageCodeL.Text?.Trim(); + if (!string.IsNullOrEmpty(pcd)) + { + MessageBox.Show($"请先完成左箱码[{pcd}]装箱后,再进行切换."); + return; + } + } + else + { + string pcd = lbPackageCodeR.Text?.Trim(); + if (!string.IsNullOrEmpty(pcd)) + { + MessageBox.Show($"请先完成右箱码[{pcd}]装箱后,再进行切换."); + return; + } + } string pass = _basicBLL1.GetInjectionChangedSizePass(); Form frm = new Form(); frm.Size = new Size(400, 300); @@ -4032,7 +4089,9 @@ namespace InjectionPC { SaveLog3($"IM18切换从箱码模式切换单条码模式,箱码[{ lbPackageCodeL.Text?.Trim()}],左实际数量[{lbCurrentlQtyL.Text?.Trim()}],右实际数量[{lbCurrentlQtyR.Text?.Trim()}]"); } - this.FormClosed += (arg1, arg2) => { + try + { + this.FormClosed += (arg1, arg2) => { opcGroup1.DataChange -= new DIOPCGroupEvent_DataChangeEventHandler(opcGroup1_DataChange); opcServer.OPCGroups.RemoveAll(); @@ -4040,8 +4099,14 @@ namespace InjectionPC serialPort1.Close(); FrmMain2411 frm = new FrmMain2411(); frm.Show(); - }; - this.Close(); + }; + + this.Close(); + } + catch + { + + } } catch(Exception ex) { @@ -4050,7 +4115,7 @@ namespace InjectionPC } - + private void comboBox2_SelectedValueChanged(object sender, EventArgs e) { if (cboxHandBox.Checked == false) return; diff --git a/InjectionPC/FrmMain2411.cs b/InjectionPC/FrmMain2411.cs index c76f442..15f45a0 100644 --- a/InjectionPC/FrmMain2411.cs +++ b/InjectionPC/FrmMain2411.cs @@ -76,6 +76,8 @@ namespace InjectionPC { InitializeComponent(); this.Size = new Size(1280, 920); + + timer3.Enabled = false; } public string planID = "", productID = "", nextPlanID = "", nextproductID = "",aa=""; @@ -92,6 +94,8 @@ namespace InjectionPC { try { + + _currentStationID = getStationID(Program.station); tb_Plastic = GetPlastic(); Control.CheckForIllegalCrossThreadCalls = false; @@ -3523,6 +3527,7 @@ namespace InjectionPC FrmMain2408 frm = new FrmMain2408(); frm.Show(); }; + this.Close(); } catch (Exception ex) diff --git a/MESWebSite/Manage/Product.aspx b/MESWebSite/Manage/Product.aspx index f016fb9..17c52b5 100644 --- a/MESWebSite/Manage/Product.aspx +++ b/MESWebSite/Manage/Product.aspx @@ -214,7 +214,7 @@ -

描述：

+

烘干要求时长：

@@ -532,7 +532,7 @@ { field: 'Rows', title: '行数', sortable: 'true', width: 10 }, { field: 'Cols', title: '列数', sortable: 'true', width: 10 }, { field: 'Layers', title: '层数', sortable: 'true', width: 10 }, - { field: 'Des', title: '描述', sortable: 'true', width: 10 }, + { field: 'Des', title: '烘干要求时长', sortable: 'true', width: 10 }, { field: 'PackCount', title: '标准包装量', sortable: 'true', width: 10 }, { field: 'PackCountSize', title: '包装范围', sortable: 'true', width: 10 }, { field: 'OpenFailNum', title: '开机报废数', sortable: 'true', width: 10 },