diff --git a/Dlls/Stone.Common.dll b/Dlls/Stone.Common.dll new file mode 100644 index 0000000..a1aac37 Binary files /dev/null and b/Dlls/Stone.Common.dll differ diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs index 121fbc5..65fd801 100644 --- a/FacOneZPStation/FrmZP.Designer.cs +++ b/FacOneZPStation/FrmZP.Designer.cs @@ -77,7 +77,7 @@ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.51529F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.62445F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.86026F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 689F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 699F)); this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0); this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1); this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1); @@ -102,10 +102,10 @@ this.button6.Dock = System.Windows.Forms.DockStyle.Fill; this.button6.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button6.ForeColor = System.Drawing.Color.Black; - this.button6.Location = new System.Drawing.Point(1872, 14); + this.button6.Location = new System.Drawing.Point(1861, 14); this.button6.Margin = new System.Windows.Forms.Padding(14); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(662, 183); + this.button6.Size = new System.Drawing.Size(673, 183); this.button6.TabIndex = 7; this.button6.Text = "手动打印箱单"; this.button6.UseVisualStyleBackColor = false; @@ -119,7 +119,7 @@ this.button1.Location = new System.Drawing.Point(6, 217); this.button1.Margin = new System.Windows.Forms.Padding(6); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(611, 200); + this.button1.Size = new System.Drawing.Size(607, 200); this.button1.TabIndex = 6; this.button1.Text = "打印标签"; this.button1.UseVisualStyleBackColor = false; @@ -131,10 +131,10 @@ this.button5.Dock = System.Windows.Forms.DockStyle.Fill; this.button5.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button5.ForeColor = System.Drawing.Color.Black; - this.button5.Location = new System.Drawing.Point(1262, 225); + this.button5.Location = new System.Drawing.Point(1254, 225); this.button5.Margin = new System.Windows.Forms.Padding(14); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(582, 184); + this.button5.Size = new System.Drawing.Size(579, 184); this.button5.TabIndex = 5; this.button5.Text = "不合格"; this.button5.UseVisualStyleBackColor = false; @@ -145,10 +145,10 @@ this.button4.BackColor = System.Drawing.Color.RoyalBlue; this.button4.Dock = System.Windows.Forms.DockStyle.Fill; this.button4.Font = new System.Drawing.Font("黑体", 16F); - this.button4.Location = new System.Drawing.Point(629, 6); + this.button4.Location = new System.Drawing.Point(625, 6); this.button4.Margin = new System.Windows.Forms.Padding(6); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(613, 199); + this.button4.Size = new System.Drawing.Size(609, 199); this.button4.TabIndex = 4; this.button4.Text = "下一计划"; this.button4.UseVisualStyleBackColor = false; @@ -162,7 +162,7 @@ this.button3.Location = new System.Drawing.Point(6, 6); this.button3.Margin = new System.Windows.Forms.Padding(6); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(611, 199); + this.button3.Size = new System.Drawing.Size(607, 199); this.button3.TabIndex = 3; this.button3.Text = "上一计划"; this.button3.UseVisualStyleBackColor = false; @@ -174,10 +174,10 @@ this.button2.Dock = System.Windows.Forms.DockStyle.Fill; this.button2.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button2.ForeColor = System.Drawing.Color.Black; - this.button2.Location = new System.Drawing.Point(637, 225); + this.button2.Location = new System.Drawing.Point(633, 225); this.button2.Margin = new System.Windows.Forms.Padding(14); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(597, 184); + this.button2.Size = new System.Drawing.Size(593, 184); this.button2.TabIndex = 2; this.button2.Text = "补打标签"; this.button2.UseVisualStyleBackColor = false; @@ -188,10 +188,10 @@ this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button7.Dock = System.Windows.Forms.DockStyle.Fill; this.button7.Font = new System.Drawing.Font("黑体", 16F); - this.button7.Location = new System.Drawing.Point(1864, 217); + this.button7.Location = new System.Drawing.Point(1853, 217); this.button7.Margin = new System.Windows.Forms.Padding(6); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(678, 200); + this.button7.Size = new System.Drawing.Size(689, 200); this.button7.TabIndex = 8; this.button7.Text = "补打箱单"; this.button7.UseVisualStyleBackColor = false; @@ -203,7 +203,7 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label7.ForeColor = System.Drawing.Color.White; - this.label7.Location = new System.Drawing.Point(1545, 3); + this.label7.Location = new System.Drawing.Point(1531, 3); this.label7.Margin = new System.Windows.Forms.Padding(2); this.label7.Name = "label7"; this.tableLayoutPanel4.SetRowSpan(this.label7, 2); @@ -215,10 +215,10 @@ // this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox2.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox2.Location = new System.Drawing.Point(445, 127); + this.textBox2.Location = new System.Drawing.Point(441, 127); this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(1093, 87); + this.textBox2.Size = new System.Drawing.Size(1083, 87); this.textBox2.TabIndex = 30; this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown); // @@ -230,7 +230,7 @@ this.label3.Location = new System.Drawing.Point(5, 123); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(431, 125); + this.label3.Size = new System.Drawing.Size(427, 125); this.label3.TabIndex = 29; this.label3.Text = "扫描物料条码"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -240,10 +240,10 @@ this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labOrderNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labOrderNo.ForeColor = System.Drawing.Color.White; - this.labOrderNo.Location = new System.Drawing.Point(1822, 251); + this.labOrderNo.Location = new System.Drawing.Point(1808, 251); this.labOrderNo.Margin = new System.Windows.Forms.Padding(2); this.labOrderNo.Name = "labOrderNo"; - this.labOrderNo.Size = new System.Drawing.Size(727, 175); + this.labOrderNo.Size = new System.Drawing.Size(741, 175); this.labOrderNo.TabIndex = 28; this.labOrderNo.Text = "A64654646464"; this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -254,7 +254,7 @@ this.label4.Dock = System.Windows.Forms.DockStyle.Fill; this.label4.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(1545, 251); + this.label4.Location = new System.Drawing.Point(1531, 251); this.label4.Margin = new System.Windows.Forms.Padding(2); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(272, 175); @@ -268,10 +268,10 @@ this.labStationNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labStationNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labStationNo.ForeColor = System.Drawing.Color.White; - this.labStationNo.Location = new System.Drawing.Point(443, 251); + this.labStationNo.Location = new System.Drawing.Point(439, 251); this.labStationNo.Margin = new System.Windows.Forms.Padding(2); this.labStationNo.Name = "labStationNo"; - this.labStationNo.Size = new System.Drawing.Size(1097, 175); + this.labStationNo.Size = new System.Drawing.Size(1087, 175); this.labStationNo.TabIndex = 26; this.labStationNo.Text = "V253-MF-S后保下部延伸焊接"; this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -285,7 +285,7 @@ this.label2.Location = new System.Drawing.Point(3, 251); this.label2.Margin = new System.Windows.Forms.Padding(2); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(435, 175); + this.label2.Size = new System.Drawing.Size(431, 175); this.label2.TabIndex = 25; this.label2.Text = "工位名称"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -295,10 +295,10 @@ this.labPName.Dock = System.Windows.Forms.DockStyle.Fill; this.labPName.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labPName.ForeColor = System.Drawing.Color.White; - this.labPName.Location = new System.Drawing.Point(1822, 431); + this.labPName.Location = new System.Drawing.Point(1808, 431); this.labPName.Margin = new System.Windows.Forms.Padding(2); this.labPName.Name = "labPName"; - this.labPName.Size = new System.Drawing.Size(727, 286); + this.labPName.Size = new System.Drawing.Size(741, 286); this.labPName.TabIndex = 24; this.labPName.Text = "MF253 MF S后保"; this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -309,7 +309,7 @@ this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(1545, 431); + this.label8.Location = new System.Drawing.Point(1531, 431); this.label8.Margin = new System.Windows.Forms.Padding(2); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(272, 286); @@ -323,10 +323,10 @@ this.labPartNo.Dock = System.Windows.Forms.DockStyle.Fill; this.labPartNo.Font = new System.Drawing.Font("黑体", 42F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labPartNo.ForeColor = System.Drawing.Color.White; - this.labPartNo.Location = new System.Drawing.Point(443, 431); + this.labPartNo.Location = new System.Drawing.Point(439, 431); this.labPartNo.Margin = new System.Windows.Forms.Padding(2); this.labPartNo.Name = "labPartNo"; - this.labPartNo.Size = new System.Drawing.Size(1097, 286); + this.labPartNo.Size = new System.Drawing.Size(1087, 286); this.labPartNo.TabIndex = 22; this.labPartNo.Text = "A2530822665"; this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -345,7 +345,7 @@ this.label6.Location = new System.Drawing.Point(3, 431); this.label6.Margin = new System.Windows.Forms.Padding(2); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(435, 286); + this.label6.Size = new System.Drawing.Size(431, 286); this.label6.TabIndex = 21; this.label6.Text = "产品代码"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -356,10 +356,10 @@ this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill; this.labBadCount.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labBadCount.ForeColor = System.Drawing.Color.Lime; - this.labBadCount.Location = new System.Drawing.Point(1822, 722); + this.labBadCount.Location = new System.Drawing.Point(1808, 722); this.labBadCount.Margin = new System.Windows.Forms.Padding(2); this.labBadCount.Name = "labBadCount"; - this.labBadCount.Size = new System.Drawing.Size(727, 513); + this.labBadCount.Size = new System.Drawing.Size(741, 513); this.labBadCount.TabIndex = 20; this.labBadCount.Text = "0"; this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -370,10 +370,10 @@ this.labNum.Dock = System.Windows.Forms.DockStyle.Fill; this.labNum.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labNum.ForeColor = System.Drawing.Color.Lime; - this.labNum.Location = new System.Drawing.Point(443, 722); + this.labNum.Location = new System.Drawing.Point(439, 722); this.labNum.Margin = new System.Windows.Forms.Padding(2); this.labNum.Name = "labNum"; - this.labNum.Size = new System.Drawing.Size(1097, 513); + this.labNum.Size = new System.Drawing.Size(1087, 513); this.labNum.TabIndex = 18; this.labNum.Text = "152/210"; this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -387,7 +387,7 @@ this.label10.Location = new System.Drawing.Point(3, 722); this.label10.Margin = new System.Windows.Forms.Padding(2); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(435, 513); + this.label10.Size = new System.Drawing.Size(431, 513); this.label10.TabIndex = 17; this.label10.Text = "计划/完成数"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -400,7 +400,7 @@ this.label14.Location = new System.Drawing.Point(5, 1); this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(431, 121); + this.label14.Size = new System.Drawing.Size(427, 121); this.label14.TabIndex = 12; this.label14.Text = "扫描本体条码"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -409,10 +409,10 @@ // this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.textBox1.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(445, 5); + this.textBox1.Location = new System.Drawing.Point(441, 5); this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(1093, 87); + this.textBox1.Size = new System.Drawing.Size(1083, 87); this.textBox1.TabIndex = 13; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -421,11 +421,11 @@ this.labErrMessage.Dock = System.Windows.Forms.DockStyle.Fill; this.labErrMessage.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labErrMessage.ForeColor = System.Drawing.Color.Red; - this.labErrMessage.Location = new System.Drawing.Point(1824, 1); + this.labErrMessage.Location = new System.Drawing.Point(1810, 1); this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labErrMessage.Name = "labErrMessage"; this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2); - this.labErrMessage.Size = new System.Drawing.Size(723, 247); + this.labErrMessage.Size = new System.Drawing.Size(737, 247); this.labErrMessage.TabIndex = 16; this.labErrMessage.Text = "条码与产品不匹配，重新扫描"; this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -438,7 +438,7 @@ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 28.52292F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 71.47708F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 276F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 730F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 744F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F)); this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0); this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1); @@ -478,7 +478,7 @@ this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.ForeColor = System.Drawing.Color.White; - this.label12.Location = new System.Drawing.Point(1545, 722); + this.label12.Location = new System.Drawing.Point(1531, 722); this.label12.Margin = new System.Windows.Forms.Padding(2); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(272, 513); @@ -491,10 +491,10 @@ this.labTime.BackColor = System.Drawing.Color.Transparent; this.labTime.Dock = System.Windows.Forms.DockStyle.Fill; this.labTime.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTime.Location = new System.Drawing.Point(1978, 0); + this.labTime.Location = new System.Drawing.Point(1971, 0); this.labTime.Margin = new System.Windows.Forms.Padding(0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(582, 149); + this.labTime.Size = new System.Drawing.Size(589, 149); this.labTime.TabIndex = 7; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.Click += new System.EventHandler(this.labTime_Click); @@ -508,7 +508,7 @@ this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(358, 149); + this.pictureBox1.Size = new System.Drawing.Size(357, 149); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -518,10 +518,10 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Dock = System.Windows.Forms.DockStyle.Fill; this.label1.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(358, 0); + this.label1.Location = new System.Drawing.Point(357, 0); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(1620, 149); + this.label1.Size = new System.Drawing.Size(1614, 149); this.label1.TabIndex = 1; this.label1.Text = "装配工位信息看板"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -532,7 +532,7 @@ this.tableLayoutPanel2.ColumnCount = 3; this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.10651F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 81.89349F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 581F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 588F)); this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0); this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0); diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs index 41a7767..2195ee6 100644 --- a/InjectionPC/FrmMain2408.Designer.cs +++ b/InjectionPC/FrmMain2408.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn(); - GlacialComponents.Controls.GLColumn glColumn4 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn5 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn6 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn7 = new GlacialComponents.Controls.GLColumn(); + GlacialComponents.Controls.GLColumn glColumn8 = new GlacialComponents.Controls.GLColumn(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2408)); this.panel1 = new System.Windows.Forms.Panel(); this.panel7 = new System.Windows.Forms.Panel(); @@ -88,7 +88,6 @@ this.label16 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.comBoxSizeR = new System.Windows.Forms.ComboBox(); this.panel47 = new System.Windows.Forms.Panel(); this.btnHandPrintR = new System.Windows.Forms.Button(); this.label30 = new System.Windows.Forms.Label(); @@ -96,12 +95,14 @@ this.lbCurrentlQtyR = new System.Windows.Forms.Label(); this.label34 = new System.Windows.Forms.Label(); this.lbPackageCodeR = new System.Windows.Forms.Label(); + this.panel49 = new System.Windows.Forms.Panel(); + this.btnChangeSizeR = new System.Windows.Forms.Button(); + this.comBoxSizeR = new System.Windows.Forms.ComboBox(); this.panel36 = new System.Windows.Forms.Panel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.label11 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.comBoxSizeL = new System.Windows.Forms.ComboBox(); this.label38 = new System.Windows.Forms.Label(); this.panel46 = new System.Windows.Forms.Panel(); this.btnHandPrintL = new System.Windows.Forms.Button(); @@ -109,6 +110,9 @@ this.lbNeedQtyL = new System.Windows.Forms.Label(); this.lbCurrentlQtyL = new System.Windows.Forms.Label(); this.lbPackageCodeL = new System.Windows.Forms.Label(); + this.panel48 = new System.Windows.Forms.Panel(); + this.btnChangeSizeL = new System.Windows.Forms.Button(); + this.comBoxSizeL = new System.Windows.Forms.ComboBox(); this.panel8 = new System.Windows.Forms.Panel(); this.panel10 = new System.Windows.Forms.Panel(); this.panel12 = new System.Windows.Forms.Panel(); @@ -175,11 +179,13 @@ this.groupBox1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); this.panel47.SuspendLayout(); + this.panel49.SuspendLayout(); this.panel36.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); this.panel46.SuspendLayout(); + this.panel48.SuspendLayout(); this.panel8.SuspendLayout(); this.panel10.SuspendLayout(); this.panel12.SuspendLayout(); @@ -209,7 +215,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(2560, 1830); this.panel1.TabIndex = 0; @@ -221,7 +227,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(2560, 1662); this.panel7.TabIndex = 1; @@ -232,7 +238,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(2560, 1558); this.panel23.TabIndex = 1; @@ -243,7 +249,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(2560, 443); this.panel27.TabIndex = 1; @@ -254,7 +260,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(2221, 443); this.panel29.TabIndex = 1; @@ -265,7 +271,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(2088, 443); this.panel31.TabIndex = 1; @@ -276,7 +282,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(1955, 443); this.panel33.TabIndex = 1; @@ -286,7 +292,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(1822, 443); this.panel35.TabIndex = 1; @@ -296,7 +302,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(1822, 443); this.panel37.TabIndex = 1; @@ -307,7 +313,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(1822, 443); this.panel40.TabIndex = 1; @@ -318,7 +324,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(1689, 443); this.panel42.TabIndex = 1; @@ -337,7 +343,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(1556, 443); this.panel39.TabIndex = 1; @@ -362,7 +368,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; @@ -394,7 +400,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; @@ -416,7 +422,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; @@ -438,7 +444,7 @@ this.panel43.Controls.Add(this.label23); this.panel43.Dock = System.Windows.Forms.DockStyle.Right; this.panel43.Location = new System.Drawing.Point(1556, 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, 443); this.panel43.TabIndex = 0; @@ -462,16 +468,17 @@ this.panel41.Controls.Add(this.label22); this.panel41.Dock = System.Windows.Forms.DockStyle.Right; this.panel41.Location = new System.Drawing.Point(1689, 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, 443); this.panel41.TabIndex = 0; // // label22 // - this.label22.BackColor = System.Drawing.Color.DeepSkyBlue; + this.label22.BackColor = System.Drawing.Color.Gray; this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label22.Dock = System.Windows.Forms.DockStyle.Fill; + this.label22.Enabled = false; this.label22.Location = new System.Drawing.Point(0, 0); this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label22.Name = "label22"; @@ -486,7 +493,7 @@ this.panel34.Controls.Add(this.label15); this.panel34.Dock = System.Windows.Forms.DockStyle.Right; this.panel34.Location = new System.Drawing.Point(1822, 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, 443); this.panel34.TabIndex = 0; @@ -510,7 +517,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, 443); this.panel32.TabIndex = 0; @@ -534,7 +541,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, 443); this.panel30.TabIndex = 0; @@ -558,7 +565,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, 443); this.panel28.TabIndex = 0; @@ -583,7 +590,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(2560, 1115); this.panel24.TabIndex = 0; @@ -594,10 +601,10 @@ this.panel26.Controls.Add(this.panel44); this.panel26.Controls.Add(this.glacialList1); this.panel26.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel26.Location = new System.Drawing.Point(339, 0); - this.panel26.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel26.Location = new System.Drawing.Point(415, 0); + this.panel26.Margin = new System.Windows.Forms.Padding(5); this.panel26.Name = "panel26"; - this.panel26.Size = new System.Drawing.Size(2221, 1115); + this.panel26.Size = new System.Drawing.Size(2145, 1115); this.panel26.TabIndex = 1; // // panel45 @@ -608,7 +615,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; @@ -617,7 +624,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; @@ -629,7 +636,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; @@ -641,7 +648,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; @@ -666,7 +673,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; @@ -675,7 +682,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; @@ -687,7 +694,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; @@ -699,7 +706,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; @@ -725,43 +732,43 @@ this.glacialList1.AutoHeight = true; this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight; this.glacialList1.BackgroundStretchToFit = true; - glColumn1.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn1.CheckBoxes = false; - glColumn1.ImageIndex = -1; - glColumn1.Name = "条码"; - glColumn1.NumericSort = false; - glColumn1.Text = "条码"; - glColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn1.Width = 350; - glColumn2.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn2.CheckBoxes = false; - glColumn2.ImageIndex = -1; - glColumn2.Name = "产品名称"; - glColumn2.NumericSort = false; - glColumn2.Text = "产品名称"; - glColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn2.Width = 320; - glColumn3.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn3.CheckBoxes = false; - glColumn3.ImageIndex = -1; - glColumn3.Name = "打印方式"; - glColumn3.NumericSort = false; - glColumn3.Text = "打印方式"; - glColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn3.Width = 150; - glColumn4.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; - glColumn4.CheckBoxes = false; - glColumn4.ImageIndex = -1; - glColumn4.Name = "打印时间"; - glColumn4.NumericSort = false; - glColumn4.Text = "打印时间"; - glColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; - glColumn4.Width = 270; + glColumn5.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn5.CheckBoxes = false; + glColumn5.ImageIndex = -1; + glColumn5.Name = "条码"; + glColumn5.NumericSort = false; + glColumn5.Text = "条码"; + glColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn5.Width = 350; + glColumn6.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn6.CheckBoxes = false; + glColumn6.ImageIndex = -1; + glColumn6.Name = "产品名称"; + glColumn6.NumericSort = false; + glColumn6.Text = "产品名称"; + glColumn6.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn6.Width = 320; + glColumn7.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn7.CheckBoxes = false; + glColumn7.ImageIndex = -1; + glColumn7.Name = "打印方式"; + glColumn7.NumericSort = false; + glColumn7.Text = "打印方式"; + glColumn7.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn7.Width = 150; + glColumn8.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; + glColumn8.CheckBoxes = false; + glColumn8.ImageIndex = -1; + glColumn8.Name = "打印时间"; + glColumn8.NumericSort = false; + glColumn8.Text = "打印时间"; + glColumn8.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; + glColumn8.Width = 270; this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] { - glColumn1, - glColumn2, - glColumn3, - glColumn4}); + glColumn5, + glColumn6, + glColumn7, + glColumn8}); this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal; this.glacialList1.Dock = System.Windows.Forms.DockStyle.Fill; this.glacialList1.Font = new System.Drawing.Font("宋体", 15.75F); @@ -782,14 +789,14 @@ 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; this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2221, 1115); + this.glacialList1.Size = new System.Drawing.Size(2145, 1115); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 0; @@ -802,9 +809,9 @@ 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(339, 1115); + this.panel25.Size = new System.Drawing.Size(415, 1115); this.panel25.TabIndex = 0; // // tableLayoutPanel2 @@ -820,7 +827,7 @@ this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 299F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(339, 651); + this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651); this.tableLayoutPanel2.TabIndex = 1; // // panel38 @@ -831,9 +838,9 @@ 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(317, 288); + this.panel38.Size = new System.Drawing.Size(405, 288); this.panel38.TabIndex = 1; // // label27 @@ -890,7 +897,7 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox1.Size = new System.Drawing.Size(331, 342); + this.groupBox1.Size = new System.Drawing.Size(407, 342); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "模具2"; @@ -898,12 +905,12 @@ // tableLayoutPanel3 // this.tableLayoutPanel3.ColumnCount = 2; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F)); - this.tableLayoutPanel3.Controls.Add(this.comBoxSizeR, 1, 1); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 66.66666F)); this.tableLayoutPanel3.Controls.Add(this.panel47, 0, 2); this.tableLayoutPanel3.Controls.Add(this.label34, 0, 1); this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.panel49, 1, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 37); this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -912,26 +919,9 @@ this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(323, 300); + this.tableLayoutPanel3.Size = new System.Drawing.Size(399, 300); this.tableLayoutPanel3.TabIndex = 2; // - // comBoxSizeR - // - this.comBoxSizeR.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.comBoxSizeR.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.comBoxSizeR.FormattingEnabled = true; - this.comBoxSizeR.Items.AddRange(new object[] { - "A班", - "B班"}); - this.comBoxSizeR.Location = new System.Drawing.Point(134, 113); - this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); - this.comBoxSizeR.Name = "comBoxSizeR"; - this.comBoxSizeR.Size = new System.Drawing.Size(177, 72); - this.comBoxSizeR.TabIndex = 3; - this.comBoxSizeR.SelectedValueChanged += new System.EventHandler(this.comBoxSizeR_SelectedValueChanged); - // // panel47 // this.tableLayoutPanel3.SetColumnSpan(this.panel47, 2); @@ -943,13 +933,13 @@ this.panel47.Location = new System.Drawing.Point(4, 204); this.panel47.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel47.Name = "panel47"; - this.panel47.Size = new System.Drawing.Size(315, 91); + this.panel47.Size = new System.Drawing.Size(391, 91); this.panel47.TabIndex = 4; // // btnHandPrintR // this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintR.Location = new System.Drawing.Point(200, 29); + this.btnHandPrintR.Location = new System.Drawing.Point(262, 32); this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnHandPrintR.Name = "btnHandPrintR"; this.btnHandPrintR.Size = new System.Drawing.Size(125, 59); @@ -1017,14 +1007,53 @@ this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37); this.lbPackageCodeR.TabIndex = 5; // + // panel49 + // + this.panel49.Controls.Add(this.btnChangeSizeR); + this.panel49.Controls.Add(this.comBoxSizeR); + this.panel49.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel49.Location = new System.Drawing.Point(136, 102); + this.panel49.Name = "panel49"; + this.panel49.Size = new System.Drawing.Size(260, 94); + this.panel49.TabIndex = 6; + // + // btnChangeSizeR + // + this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnChangeSizeR.Location = new System.Drawing.Point(139, 17); + this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeR.Name = "btnChangeSizeR"; + this.btnChangeSizeR.Size = new System.Drawing.Size(132, 72); + this.btnChangeSizeR.TabIndex = 4; + this.btnChangeSizeR.Text = "调整"; + this.btnChangeSizeR.UseVisualStyleBackColor = true; + this.btnChangeSizeR.Click += new System.EventHandler(this.btnChangeSizeR_Click); + // + // comBoxSizeR + // + this.comBoxSizeR.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.comBoxSizeR.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comBoxSizeR.Enabled = false; + this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.comBoxSizeR.FormattingEnabled = true; + this.comBoxSizeR.Items.AddRange(new object[] { + "A班", + "B班"}); + this.comBoxSizeR.Location = new System.Drawing.Point(0, 17); + 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; + this.comBoxSizeR.SelectedValueChanged += new System.EventHandler(this.comBoxSizeR_SelectedValueChanged); + // // panel36 // 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(339, 464); + this.panel36.Size = new System.Drawing.Size(415, 464); this.panel36.TabIndex = 0; // // tableLayoutPanel1 @@ -1041,7 +1070,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00047F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 74.99953F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(339, 464); + this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464); this.tableLayoutPanel1.TabIndex = 1; // // label11 @@ -1052,10 +1081,10 @@ this.label11.Location = new System.Drawing.Point(5, 21); this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(325, 95); + this.label11.Size = new System.Drawing.Size(405, 95); this.label11.TabIndex = 0; this.label11.Text = "打印记录："; - this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // groupBox2 // @@ -1067,7 +1096,7 @@ this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox2.Size = new System.Drawing.Size(331, 338); + this.groupBox2.Size = new System.Drawing.Size(407, 338); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "模具1&&手打"; @@ -1075,12 +1104,12 @@ // tableLayoutPanel4 // this.tableLayoutPanel4.ColumnCount = 2; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F)); - this.tableLayoutPanel4.Controls.Add(this.comBoxSizeL, 1, 1); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 66.66666F)); this.tableLayoutPanel4.Controls.Add(this.label38, 0, 1); this.tableLayoutPanel4.Controls.Add(this.panel46, 0, 2); this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.panel48, 1, 1); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 37); this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -1089,26 +1118,10 @@ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(323, 296); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(399, 296); this.tableLayoutPanel4.TabIndex = 3; // - // comBoxSizeL - // - this.comBoxSizeL.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.comBoxSizeL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.comBoxSizeL.FormattingEnabled = true; - this.comBoxSizeL.Items.AddRange(new object[] { - "A班", - "B班"}); - this.comBoxSizeL.Location = new System.Drawing.Point(134, 111); - this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); - this.comBoxSizeL.Name = "comBoxSizeL"; - this.comBoxSizeL.Size = new System.Drawing.Size(177, 72); - this.comBoxSizeL.TabIndex = 3; - this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSize_SelectedValueChanged); - // // label38 // this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -1133,16 +1146,16 @@ this.panel46.Location = new System.Drawing.Point(4, 201); this.panel46.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel46.Name = "panel46"; - this.panel46.Size = new System.Drawing.Size(315, 90); + this.panel46.Size = new System.Drawing.Size(391, 90); this.panel46.TabIndex = 4; // // btnHandPrintL // this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnHandPrintL.Location = new System.Drawing.Point(200, 29); + this.btnHandPrintL.Location = new System.Drawing.Point(262, 15); this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnHandPrintL.Name = "btnHandPrintL"; - this.btnHandPrintL.Size = new System.Drawing.Size(125, 59); + this.btnHandPrintL.Size = new System.Drawing.Size(125, 73); this.btnHandPrintL.TabIndex = 3; this.btnHandPrintL.Text = "打印"; this.btnHandPrintL.UseVisualStyleBackColor = true; @@ -1194,13 +1207,52 @@ this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37); this.lbPackageCodeL.TabIndex = 5; // + // panel48 + // + this.panel48.Controls.Add(this.btnChangeSizeL); + this.panel48.Controls.Add(this.comBoxSizeL); + this.panel48.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel48.Location = new System.Drawing.Point(136, 101); + this.panel48.Name = "panel48"; + this.panel48.Size = new System.Drawing.Size(260, 92); + this.panel48.TabIndex = 6; + // + // btnChangeSizeL + // + this.btnChangeSizeL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnChangeSizeL.Location = new System.Drawing.Point(141, 12); + this.btnChangeSizeL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeL.Name = "btnChangeSizeL"; + this.btnChangeSizeL.Size = new System.Drawing.Size(125, 72); + this.btnChangeSizeL.TabIndex = 4; + this.btnChangeSizeL.Text = "调整"; + this.btnChangeSizeL.UseVisualStyleBackColor = true; + this.btnChangeSizeL.Click += new System.EventHandler(this.btnChangeSizeL_Click); + // + // comBoxSizeL + // + this.comBoxSizeL.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.comBoxSizeL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comBoxSizeL.Enabled = false; + this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.comBoxSizeL.FormattingEnabled = true; + this.comBoxSizeL.Items.AddRange(new object[] { + "A班", + "B班"}); + this.comBoxSizeL.Location = new System.Drawing.Point(2, 12); + 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; + this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSize_SelectedValueChanged); + // // panel8 // this.panel8.Controls.Add(this.panel10); 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(2560, 104); this.panel8.TabIndex = 0; @@ -1210,10 +1262,10 @@ this.panel10.Controls.Add(this.panel12); this.panel10.Controls.Add(this.panel11); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel10.Location = new System.Drawing.Point(339, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.panel10.Location = new System.Drawing.Point(415, 0); + this.panel10.Margin = new System.Windows.Forms.Padding(5); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(2221, 104); + this.panel10.Size = new System.Drawing.Size(2145, 104); this.panel10.TabIndex = 2; // // panel12 @@ -1222,9 +1274,9 @@ 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(1729, 104); + this.panel12.Size = new System.Drawing.Size(1653, 104); this.panel12.TabIndex = 1; // // panel16 @@ -1233,9 +1285,9 @@ 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(1220, 104); + this.panel16.Size = new System.Drawing.Size(1144, 104); this.panel16.TabIndex = 1; // // panel20 @@ -1244,9 +1296,9 @@ 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(753, 104); + this.panel20.Size = new System.Drawing.Size(677, 104); this.panel20.TabIndex = 1; // // label10 @@ -1257,7 +1309,7 @@ this.label10.Location = new System.Drawing.Point(372, 0); this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(381, 104); + this.label10.Size = new System.Drawing.Size(305, 104); this.label10.TabIndex = 1; this.label10.Text = "停机录入"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1268,7 +1320,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; @@ -1294,7 +1346,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; @@ -1317,7 +1369,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; @@ -1343,7 +1395,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; @@ -1353,7 +1405,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; @@ -1376,7 +1428,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; @@ -1402,7 +1454,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; @@ -1412,7 +1464,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; @@ -1427,7 +1479,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; @@ -1437,7 +1489,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; @@ -1461,9 +1513,9 @@ 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(339, 104); + this.panel9.Size = new System.Drawing.Size(415, 104); this.panel9.TabIndex = 0; // // label3 @@ -1475,7 +1527,7 @@ this.label3.Location = new System.Drawing.Point(0, 0); this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(339, 104); + this.label3.Size = new System.Drawing.Size(415, 104); this.label3.TabIndex = 0; this.label3.Text = "用户信息："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1486,7 +1538,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(2560, 168); this.panel2.TabIndex = 0; @@ -1497,7 +1549,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(2221, 168); this.panel4.TabIndex = 1; @@ -1507,7 +1559,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(1837, 168); this.panel6.TabIndex = 1; @@ -1530,7 +1582,7 @@ this.panel5.Controls.Add(this.label2); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; this.panel5.Location = new System.Drawing.Point(1837, 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; @@ -1554,7 +1606,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; @@ -1564,7 +1616,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; @@ -1615,7 +1667,7 @@ this.ClientSize = new System.Drawing.Size(2560, 1830); 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"; @@ -1654,6 +1706,7 @@ this.tableLayoutPanel3.PerformLayout(); this.panel47.ResumeLayout(false); this.panel47.PerformLayout(); + this.panel49.ResumeLayout(false); this.panel36.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); this.groupBox2.ResumeLayout(false); @@ -1661,6 +1714,7 @@ this.tableLayoutPanel4.PerformLayout(); this.panel46.ResumeLayout(false); this.panel46.PerformLayout(); + this.panel48.ResumeLayout(false); this.panel8.ResumeLayout(false); this.panel10.ResumeLayout(false); this.panel12.ResumeLayout(false); @@ -1801,5 +1855,9 @@ private System.Windows.Forms.Label label39; private System.Windows.Forms.Label lbPackageCodeL; private System.Windows.Forms.Label lbPackageCodeR; + private System.Windows.Forms.Panel panel48; + private System.Windows.Forms.Button btnChangeSizeL; + private System.Windows.Forms.Panel panel49; + private System.Windows.Forms.Button btnChangeSizeR; } } \ No newline at end of file diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index d8a5277..6d2a239 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -64,7 +64,7 @@ namespace InjectionPC private DateTime _loginTime = DateTime.Now; private string _lastBoxNoL = string.Empty; private string _lastBoxNoR = string.Empty; - private WmsBLL _wmsBll = new WmsBLL(); + private WmsBLL _wmsBll = new WmsBLL(); bool _isLoad = false; #endregion @@ -130,12 +130,14 @@ namespace InjectionPC label2.BackColor = Color.Red; } - comBoxSizeL.DataSource = _basicBLL1.GetPackageSize(); - comBoxSizeL.DisplayMember = "describe"; - comBoxSizeL.ValueMember = "Count"; - comBoxSizeR.DataSource = _basicBLL1.GetPackageSize(); - comBoxSizeR.DisplayMember = "describe"; - comBoxSizeR.ValueMember = "Count"; + //comBoxSizeL.DataSource = _basicBLL1.GetPackageSize(); + //comBoxSizeL.DisplayMember = "describe"; + //comBoxSizeL.ValueMember = "Count"; + //comBoxSizeR.DataSource = _basicBLL1.GetPackageSize(); + //comBoxSizeR.DisplayMember = "describe"; + //comBoxSizeR.ValueMember = "Count"; + + comboBox2.MouseWheel += new MouseEventHandler(comboBox2_MouseWheel); @@ -282,6 +284,7 @@ namespace InjectionPC string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(','); label12.Text = "当前生产计划为:"; + for (int i = 0; i < partNo.Length; i++) { DataTable sdt = productBll.SearchInfoByPartNo(partNo[i].ToString().Trim()); @@ -289,6 +292,24 @@ namespace InjectionPC { label12.Text += "零件号" + partNo[i].ToString().Trim() + ",零件名称" + sdt.Rows[0]["ProductName"].ToString() + ";"; } + if (!string.IsNullOrEmpty(partNo[i].ToString().Trim())) + { + string currentSize = string.Empty; + List list = GetProductBoxSize(partNo[i].ToString().Trim(), ref currentSize); + + if(i == 0) + { + comBoxSizeL.DataSource = list; + comBoxSizeL.SelectedItem = currentSize; + } + else + { + comBoxSizeR.DataSource = list; + comBoxSizeR.SelectedItem = currentSize; + } + } + + } } else @@ -589,27 +610,14 @@ namespace InjectionPC ? System.AppDomain.CurrentDomain.BaseDirectory + "wl.grf" : System.AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; + PrintMoudleName(); //new } else { filename = System.AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; + PrintMoudleName(); } - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = - GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo[j].ToString().Trim(); - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(), dt.Rows[0]["StationID"].ToString()); @@ -620,7 +628,8 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName] .ToString(); - headTable.Rows.Add(row); + + DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, (int) GRPaperOrientation.grpoDefault, 1, reportName); @@ -803,32 +812,20 @@ namespace InjectionPC ? System.AppDomain.CurrentDomain.BaseDirectory + "wl.grf" : System.AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; + PrintMoudleName(); //new if (partNo[j].Contains("A2146982300") || partNo[j].Contains("A2146982400")) { filename = AppDomain.CurrentDomain.BaseDirectory + - "Sill.grf"; + PrintMoudleName(); } } else { filename = System.AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; + PrintMoudleName(); } - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo[j].ToString().Trim(); - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(), dt.Rows[0]["StationID"].ToString()); @@ -839,7 +836,8 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName] .ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int) GRPaperOrientation.grpoDefault, 1, reportName); @@ -1095,27 +1093,14 @@ namespace InjectionPC ? System.AppDomain.CurrentDomain.BaseDirectory + "wl.grf" : System.AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; + PrintMoudleName(); //new } else { filename = System.AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; + PrintMoudleName(); } - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo[j].ToString().Trim(); - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; - DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(), dt.Rows[0]["StationID"].ToString()); if (dt4 != null && dt4.Rows.Count > 0) @@ -1125,7 +1110,7 @@ namespace InjectionPC string reportName = ConfigurationManager.AppSettings[printName] .ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, (int) GRPaperOrientation.grpoDefault, 1, reportName); @@ -1323,8 +1308,8 @@ namespace InjectionPC ? System.AppDomain.CurrentDomain.BaseDirectory + "wl.grf" : System.AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; - if(partNo[j].Contains("A2146982300") || + PrintMoudleName();//new + if (partNo[j].Contains("A2146982300") || partNo[j].Contains("A2146982400")) { filename = AppDomain.CurrentDomain.BaseDirectory + @@ -1333,22 +1318,9 @@ namespace InjectionPC } else { - filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf"; + filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName(); } - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo[j].ToString().Trim(); - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; - DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(), dt.Rows[0]["StationID"].ToString()); if (dt4 != null && dt4.Rows.Count > 0) @@ -1357,7 +1329,7 @@ namespace InjectionPC } string reportName = ConfigurationManager.AppSettings[printName].ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); @@ -1656,24 +1628,11 @@ namespace InjectionPC if (IsOne == "1") { - filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf"; - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo[j].ToString().Trim(); - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; - + filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName(); //new - string reportName = ConfigurationManager.AppSettings[printName].ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); @@ -1904,24 +1863,10 @@ namespace InjectionPC if (IsOne == "1") { - filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf"; - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo[j].ToString().Trim(); - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; - + filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName(); //new - string reportName = ConfigurationManager.AppSettings[printName].ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); @@ -2480,26 +2425,14 @@ namespace InjectionPC ? System.AppDomain.CurrentDomain.BaseDirectory + "wl.grf" : System.AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; + PrintMoudleName(); //new if (partNo.Contains("A2146982300") || partNo.Contains("A2146982400")) { filename = AppDomain.CurrentDomain.BaseDirectory + "Sill.grf"; } - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo; - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; - + DataTable dt4 = plbll.SearchInfo(partNo, stationID); if (dt4 != null && dt4.Rows.Count > 0) { @@ -2507,7 +2440,7 @@ namespace InjectionPC } string reportName = ConfigurationManager.AppSettings[printName].ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); @@ -2755,20 +2688,8 @@ namespace InjectionPC if (IsOne == "1") { - filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf"; - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo; - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; - + filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName(); + DataTable dt4 = plbll.SearchInfo(partNo, stationID); if (dt4 != null && dt4.Rows.Count > 0) { @@ -2776,7 +2697,7 @@ namespace InjectionPC } string reportName = ConfigurationManager.AppSettings[printName].ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo, PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + NewOneCode, MethodBase.GetCurrentMethod()); @@ -3066,35 +2987,25 @@ namespace InjectionPC ? AppDomain.CurrentDomain.BaseDirectory + "wl.grf" : AppDomain.CurrentDomain.BaseDirectory + - "单个条码1.grf"; + PrintMoudleName(); //new if (md.PartNo.Contains("A2146982300") || md.PartNo.Contains("A2146982400")) { filename = AppDomain.CurrentDomain.BaseDirectory + "Sill.grf"; } - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = md.PartNo; - + + string partName = ""; DataTable dt2 = pbll.SearchInfoByPartNo(md.PartNo); if (dt2 != null && dt2.Rows.Count > 0) { - row["PartName"] = dt2.Rows[0]["ProductName"].ToString(); + partName = dt2.Rows[0]["ProductName"].ToString(); } else { - row["PartName"] = ""; + partName = ""; } - row["OneBarCode"] = md.OneBarCode; - row["BarCode"] = md.BarCode; DataTable dt4 = plbll.SearchInfo(md.PartNo, md.StationID); if (dt4 != null && dt4.Rows.Count > 0) @@ -3103,7 +3014,8 @@ namespace InjectionPC } string reportName = ConfigurationManager.AppSettings[printName].ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(md.PartNo, partName, md.OneBarCode, md.BarCode); + ReportHelper rp = new ReportHelper(filename, headTable, null, (int) GRPaperOrientation.grpoDefault, 1, reportName); @@ -3868,22 +3780,10 @@ namespace InjectionPC { if (IsSupply == "1") { - filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf"; - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo[j].ToString().Trim(); - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; - + filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName(); + string reportName = ConfigurationManager.AppSettings[printName].ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); ReportHelper rp = new ReportHelper(filename, headTable, null, (int) GRPaperOrientation.grpoDefault, 1, reportName); @@ -4080,22 +3980,11 @@ namespace InjectionPC { if (IsSupply == "1") { - filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码1.grf"; - DataTable headTable = new DataTable(); - headTable.Columns.Add("PrintTime"); - headTable.Columns.Add("PartNo"); - headTable.Columns.Add("PartName"); - headTable.Columns.Add("OneBarCode"); - headTable.Columns.Add("BarCode"); - DataRow row = headTable.NewRow(); - row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); - row["PartNo"] = partNo[j].ToString().Trim(); - row["PartName"] = PartName; - row["OneBarCode"] = NewOneCode; - row["BarCode"] = newcode; - + filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName(); //new + string reportName = ConfigurationManager.AppSettings[printName].ToString(); - headTable.Rows.Add(row); + DataTable headTable = GetPrintHeadTable(partNo[j].ToString().Trim(), PartName, NewOneCode, newcode); + LogHelper.WriteLog(printName + ";" + reportName + ";" + filename); ReportHelper rp = new ReportHelper(filename, headTable, null, (int) GRPaperOrientation.grpoDefault, 1, reportName); @@ -4323,6 +4212,26 @@ namespace InjectionPC { label12.Text += "零件号" + partNo1[i].ToString().Trim() + ",零件名称" + dt2.Rows[0]["ProductName"].ToString() + ";"; } + if((partNo1.Length == 1 && comBoxSizeL.SelectedItem == null) || (partNo1.Length == 2 && comBoxSizeL.SelectedItem == null && comBoxSizeR.SelectedItem == null)) + { + if (!string.IsNullOrEmpty(partNo1[i].ToString().Trim())) + { + string currentSize = string.Empty; + List list = GetProductBoxSize(partNo1[i].ToString().Trim(), ref currentSize); + + if (i == 0) + { + comBoxSizeL.DataSource = list; + comBoxSizeL.SelectedItem = currentSize; + } + else + { + comBoxSizeR.DataSource = list; + comBoxSizeR.SelectedItem = currentSize; + } + } + } + } } else @@ -4787,7 +4696,7 @@ namespace InjectionPC } _selectItemL = comBoxSizeL.SelectedItem; } - + comBoxSizeL.Enabled = false; } private void comBoxSizeR_SelectedValueChanged(object sender, EventArgs e) { @@ -4841,8 +4750,8 @@ namespace InjectionPC } _selectItemR = comBoxSizeR.SelectedItem; } + comBoxSizeR.Enabled = false; - } void CheckPackageSelect() @@ -4994,12 +4903,6 @@ namespace InjectionPC } - private void comBoxSizeL_SelectedIndexChanged(object sender, EventArgs e) - { - - } - - /// /// 用户双击 /// @@ -5091,5 +4994,146 @@ namespace InjectionPC return true; } + private void btnChangeSizeL_Click(object sender, EventArgs e) + { + ChangeSize("0"); + } + + private void btnChangeSizeR_Click(object sender, EventArgs e) + { + ChangeSize("1"); + } + void ChangeSize(string moudel) + { + string pass = _basicBLL1.GetInjectionChangedSizePass(); + Form frm = new Form(); + frm.Size = new Size(400, 300); + frm.StartPosition = FormStartPosition.CenterParent; + TextBox tb = new TextBox(); + tb.Width = 300; + tb.Location = new System.Drawing.Point(30, 30); + tb.PasswordChar = '#'; + Button bt = new Button(); + bt.Width = 100; + bt.Text = "确定"; + bt.Margin = new Padding(40, 100, 0, 0); + bt.Location = new System.Drawing.Point(100, 171); + bt.Click += (arg1, arg2) => { + frm.Close(); + string s = tb.Text; + if(s == pass) + { + if(moudel == "0") + { + comBoxSizeL.Enabled = true; + } + else + { + comBoxSizeR.Enabled = true; + } + } + }; + frm.Controls.Add(tb); + frm.Controls.Add(bt); + frm.ShowDialog(); + + + } + + string PrintMoudleName() + { + if("IM05,IM08,IM10".Contains(Program.station)) //二维小条码 + { + return "单个条码2.grf"; + } + else if ("IM06,IM07,IM09,IM11,IM12,".Contains(Program.station)) //一维条码 + { + return "单个条码.grf"; + } + + else if ("IM01,IM02,IM03,IM04,IM15,IM18,IM20".Contains(Program.station)) //小米大条码 + { + return "Sill.grf"; + } + else if ("IM13,IM14".Contains(Program.station)) //直供条码 + { + return "单个条码1.grf"; + } + else + { + return "单个条码2.grf"; + } + + } + DataTable GetPrintLableModel() + { + DataTable headTable = new DataTable(); + headTable.Columns.Add("PrintTime"); + headTable.Columns.Add("PartNo"); + headTable.Columns.Add("PartName"); + headTable.Columns.Add("OneBarCode"); + headTable.Columns.Add("BarCode"); + headTable.Columns.Add("Station"); + return headTable; + } + DataTable GetPrintHeadTable(string partNo,string partName,string oneBarCode,string barCode) + { + DataTable headTable = GetPrintLableModel(); + DataRow row = headTable.NewRow(); + row["PrintTime"] = + GetDateTime().ToString("yyyy/MM/dd HH:mm:ss"); + row["PartNo"] = partNo; + row["PartName"] = partName; + row["OneBarCode"] = oneBarCode; + row["BarCode"] = barCode; + row["Station"] = Program.station; + headTable.Rows.Add(row); + return headTable; + } + List GetProductBoxSize(string productCode,ref string currentSize) + { + try + { + ProductBLL productBll = new ProductBLL(); + DataTable dt = productBll.SearchInfoByPartNo(productCode); + if (dt.Rows.Count == 0) + { + currentSize = "24"; + MessageBox.Show("零件号{productCode}未设置标包,默认为24,请及时核对后进行配置."); + return null; + } + currentSize = dt.Rows[0]["PackCount"].ToString(); + string sizeStr = dt.Rows[0]["PackCountSize"].ToString(); + List list = new List(); + if (string.IsNullOrEmpty(sizeStr)) + { + list.Add(currentSize); + return list; + } + else + { + string[] array = sizeStr.Split(','); + foreach (string item in array) + { + if (!list.Contains(item)) + { + list.Add(item); + } + } + if (!list.Contains(currentSize)) + { + list.Add(currentSize); + } + } + return list; + } + catch(Exception ex) + { + currentSize = "24"; + MessageBox.Show("零件号{productCode}未设置标包,默认为24,请及时核对后进行配置."); + return null; + } + + } } } diff --git a/InjectionPC/FrmPackageDetail.Designer.cs b/InjectionPC/FrmPackageDetail.Designer.cs index 03b52ed..1a42264 100644 --- a/InjectionPC/FrmPackageDetail.Designer.cs +++ b/InjectionPC/FrmPackageDetail.Designer.cs @@ -58,7 +58,7 @@ namespace InjectionPC this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1785, 967); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2291, 967); this.tableLayoutPanel1.TabIndex = 0; // // panel1 @@ -68,7 +68,7 @@ namespace InjectionPC this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1779, 54); + this.panel1.Size = new System.Drawing.Size(2285, 54); this.panel1.TabIndex = 0; // // txtPackageCode @@ -76,7 +76,7 @@ namespace InjectionPC this.txtPackageCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.txtPackageCode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtPackageCode.Location = new System.Drawing.Point(1115, 5); + this.txtPackageCode.Location = new System.Drawing.Point(1621, 5); this.txtPackageCode.Name = "txtPackageCode"; this.txtPackageCode.Size = new System.Drawing.Size(483, 44); this.txtPackageCode.TabIndex = 1; @@ -85,7 +85,7 @@ namespace InjectionPC // this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSearch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(1627, 0); + this.btnSearch.Location = new System.Drawing.Point(2133, 0); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(153, 51); this.btnSearch.TabIndex = 0; @@ -116,7 +116,7 @@ namespace InjectionPC this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 82; this.dataGridView1.RowTemplate.Height = 37; - this.dataGridView1.Size = new System.Drawing.Size(1779, 841); + this.dataGridView1.Size = new System.Drawing.Size(2285, 841); this.dataGridView1.TabIndex = 1; // // 箱单号 @@ -125,7 +125,7 @@ namespace InjectionPC this.箱单号.HeaderText = "箱单号"; this.箱单号.MinimumWidth = 10; this.箱单号.Name = "箱单号"; - this.箱单号.Width = 300; + this.箱单号.Width = 280; // // 条码 // @@ -133,7 +133,7 @@ namespace InjectionPC this.条码.HeaderText = "条码"; this.条码.MinimumWidth = 10; this.条码.Name = "条码"; - this.条码.Width = 300; + this.条码.Width = 240; // // 注塑码 // @@ -141,7 +141,7 @@ namespace InjectionPC this.注塑码.HeaderText = "注塑码"; this.注塑码.MinimumWidth = 10; this.注塑码.Name = "注塑码"; - this.注塑码.Width = 200; + this.注塑码.Width = 190; // // 零件号 // @@ -149,7 +149,7 @@ namespace InjectionPC this.零件号.HeaderText = "零件号"; this.零件号.MinimumWidth = 10; this.零件号.Name = "零件号"; - this.零件号.Width = 200; + this.零件号.Width = 150; // // 时间 // @@ -163,7 +163,7 @@ namespace InjectionPC // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1785, 967); + this.ClientSize = new System.Drawing.Size(2291, 967); this.Controls.Add(this.tableLayoutPanel1); this.Name = "FrmPackageDetail"; this.Text = "箱单详细信息"; diff --git a/InjectionPC/FrmPackageDetail.cs b/InjectionPC/FrmPackageDetail.cs index f9725d0..9631d8a 100644 --- a/InjectionPC/FrmPackageDetail.cs +++ b/InjectionPC/FrmPackageDetail.cs @@ -1,5 +1,6 @@ using MESClassLibrary.BLL.BasicInfo; using MESClassLibrary.BLL.Inspection; +using Stone.Common; using System; using System.Collections.Generic; using System.ComponentModel; @@ -20,10 +21,13 @@ namespace InjectionPC public FrmPackageDetail(string pPackageCode) { InitializeComponent(); + this.StartPosition = FormStartPosition.CenterParent; this._packageCode = pPackageCode; txtPackageCode.Text = pPackageCode; dataGridView1.AutoGenerateColumns = false; + MyGridViewStyle.SetDataGridRowNumber(dataGridView1); btnSearch_Click(null, null); + this.Size = new Size(1024, 810); } private void btnSearch_Click(object sender, EventArgs e) diff --git a/InjectionPC/InjectionPC.csproj b/InjectionPC/InjectionPC.csproj index 42b2acc..0e246c8 100644 --- a/InjectionPC/InjectionPC.csproj +++ b/InjectionPC/InjectionPC.csproj @@ -71,6 +71,9 @@ False .\SchTaskExtAPI.dll + + ..\Dlls\Stone.Common.dll + diff --git a/InjectionPC/单个条码2.grf b/InjectionPC/单个条码2.grf new file mode 100644 index 0000000..297c32d Binary files /dev/null and b/InjectionPC/单个条码2.grf differ diff --git a/InjectionSearch/FrmBarCodeSearch2408.Designer.cs b/InjectionSearch/FrmBarCodeSearch2408.Designer.cs index 3cefe0c..a36127d 100644 --- a/InjectionSearch/FrmBarCodeSearch2408.Designer.cs +++ b/InjectionSearch/FrmBarCodeSearch2408.Designer.cs @@ -68,12 +68,15 @@ this.btnRePrint = new System.Windows.Forms.Button(); this.txtRePrintBoxCode = new System.Windows.Forms.TextBox(); this.label24 = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btnChangeSizeR = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); this.pnBoxReprint.SuspendLayout(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // label1 @@ -287,7 +290,7 @@ this.label10.Location = new System.Drawing.Point(6, 0); this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(350, 596); + this.label10.Size = new System.Drawing.Size(415, 596); this.label10.TabIndex = 19; this.label10.Text = "打印记录："; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -427,7 +430,7 @@ this.glacialList1.ImageList = null; this.glacialList1.ItemHeight = 39; this.glacialList1.ItemWordWrap = false; - this.glacialList1.Location = new System.Drawing.Point(370, 130); + this.glacialList1.Location = new System.Drawing.Point(441, 130); this.glacialList1.Margin = new System.Windows.Forms.Padding(6); this.glacialList1.Name = "glacialList1"; this.glacialList1.Selectable = true; @@ -435,7 +438,7 @@ this.glacialList1.SelectionColor = System.Drawing.Color.Lime; this.glacialList1.ShowBorder = true; this.glacialList1.ShowFocusRect = false; - this.glacialList1.Size = new System.Drawing.Size(2148, 946); + this.glacialList1.Size = new System.Drawing.Size(2077, 946); this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort; this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White; this.glacialList1.TabIndex = 23; @@ -453,7 +456,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 63.3705F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 36.6295F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(362, 942); + this.tableLayoutPanel1.Size = new System.Drawing.Size(427, 942); this.tableLayoutPanel1.TabIndex = 24; // // groupBox2 @@ -466,7 +469,7 @@ this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(4); - this.groupBox2.Size = new System.Drawing.Size(354, 338); + this.groupBox2.Size = new System.Drawing.Size(419, 338); this.groupBox2.TabIndex = 20; this.groupBox2.TabStop = false; this.groupBox2.Text = "装箱信息"; @@ -474,43 +477,45 @@ // tableLayoutPanel4 // this.tableLayoutPanel4.ColumnCount = 2; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F)); - this.tableLayoutPanel4.Controls.Add(this.comBoxSizeL, 1, 1); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 66.66666F)); this.tableLayoutPanel4.Controls.Add(this.label38, 0, 1); this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.panel2, 1, 1); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 36); this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 2; + this.tableLayoutPanel4.RowCount = 3; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 49.99751F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0025F)); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.00249F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(346, 298); + this.tableLayoutPanel4.Size = new System.Drawing.Size(411, 298); this.tableLayoutPanel4.TabIndex = 3; // // comBoxSizeL // this.comBoxSizeL.Anchor = System.Windows.Forms.AnchorStyles.Left; this.comBoxSizeL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comBoxSizeL.Enabled = false; this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comBoxSizeL.FormattingEnabled = true; this.comBoxSizeL.Items.AddRange(new object[] { "A班", "B班"}); - this.comBoxSizeL.Location = new System.Drawing.Point(144, 187); + this.comBoxSizeL.Location = new System.Drawing.Point(0, 34); this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6); this.comBoxSizeL.Name = "comBoxSizeL"; - this.comBoxSizeL.Size = new System.Drawing.Size(182, 72); + this.comBoxSizeL.Size = new System.Drawing.Size(139, 72); this.comBoxSizeL.TabIndex = 3; + this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSizeL_SelectedValueChanged); // // label38 // this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label38.BackColor = System.Drawing.Color.Transparent; this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(6, 196); + this.label38.Location = new System.Drawing.Point(6, 165); this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label38.Name = "label38"; this.label38.Size = new System.Drawing.Size(116, 54); @@ -524,7 +529,7 @@ this.lbPackageCodeL.AutoSize = true; this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2); this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lbPackageCodeL.Location = new System.Drawing.Point(4, 55); + this.lbPackageCodeL.Location = new System.Drawing.Point(4, 45); this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbPackageCodeL.Name = "lbPackageCodeL"; this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37); @@ -589,6 +594,28 @@ this.label24.Text = "箱单号："; this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // panel2 + // + this.panel2.Controls.Add(this.btnChangeSizeR); + this.panel2.Controls.Add(this.comBoxSizeL); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(139, 131); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(269, 123); + this.panel2.TabIndex = 6; + // + // btnChangeSizeR + // + this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnChangeSizeR.Location = new System.Drawing.Point(142, 34); + this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnChangeSizeR.Name = "btnChangeSizeR"; + this.btnChangeSizeR.Size = new System.Drawing.Size(123, 72); + this.btnChangeSizeR.TabIndex = 5; + this.btnChangeSizeR.Text = "调整"; + this.btnChangeSizeR.UseVisualStyleBackColor = true; + this.btnChangeSizeR.Click += new System.EventHandler(this.btnChangeSizeR_Click); + // // FrmBarCodeSearch2408 // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); @@ -616,6 +643,7 @@ this.tableLayoutPanel4.PerformLayout(); this.pnBoxReprint.ResumeLayout(false); this.pnBoxReprint.PerformLayout(); + this.panel2.ResumeLayout(false); this.ResumeLayout(false); } @@ -658,5 +686,7 @@ private System.Windows.Forms.Button btnRePrint; private System.Windows.Forms.TextBox txtRePrintBoxCode; private System.Windows.Forms.Label label24; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button btnChangeSizeR; } } \ No newline at end of file diff --git a/InjectionSearch/FrmBarCodeSearch2408.cs b/InjectionSearch/FrmBarCodeSearch2408.cs index 1b083cd..f206999 100644 --- a/InjectionSearch/FrmBarCodeSearch2408.cs +++ b/InjectionSearch/FrmBarCodeSearch2408.cs @@ -34,6 +34,7 @@ namespace InjectionSearch public FrmBarCodeSearch2408() { InitializeComponent(); + this.Size = new Size(1280, 1024); } private void initProduct() @@ -88,6 +89,11 @@ namespace InjectionSearch { textBox1.Text = dt.Rows[0]["PartNo"].ToString(); dt.Dispose(); + + string currentSize = string.Empty; + List list = GetProductBoxSize(dt.Rows[0]["PartNo"].ToString(), ref currentSize); + comBoxSizeL.DataSource = list; + comBoxSizeL.SelectedItem = currentSize; } else { @@ -135,9 +141,9 @@ namespace InjectionSearch textBox3.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2); //批次 - comBoxSizeL.DataSource = _basicBLL1.GetPackageSize(); - comBoxSizeL.DisplayMember = "describe"; - comBoxSizeL.ValueMember = "Count"; + //comBoxSizeL.DataSource = _basicBLL1.GetPackageSize(); + //comBoxSizeL.DisplayMember = "describe"; + //comBoxSizeL.ValueMember = "Count"; } private void GetClass() @@ -1222,6 +1228,9 @@ namespace InjectionSearch tableName = gv.SubItems[1].Tag?.ToString(); } FrmPackageDetail detail = new FrmPackageDetail(boxCode); + detail.FormClosed += (arg1, arg2) => { + initBarCode(); + }; detail.ShowDialog(); } @@ -1268,5 +1277,90 @@ namespace InjectionSearch { pnBoxReprint.Visible = false; } + + List GetProductBoxSize(string productCode, ref string currentSize) + { + try + { + ProductBLL productBll = new ProductBLL(); + DataTable dt = productBll.SearchInfoByPartNo(productCode); + if (dt.Rows.Count == 0) + { + currentSize = "24"; + MessageBox.Show("零件号{productCode}未设置标包,默认为24,请及时核对后进行配置."); + return null; + } + currentSize = dt.Rows[0]["PackCount"].ToString(); + string sizeStr = dt.Rows[0]["PackCountSize"].ToString(); + List list = new List(); + if (string.IsNullOrEmpty(sizeStr)) + { + list.Add(currentSize); + return list; + } + else + { + string[] array = sizeStr.Split(','); + foreach (string item in array) + { + if (!list.Contains(item)) + { + list.Add(item); + } + } + if (!list.Contains(currentSize)) + { + list.Add(currentSize); + } + } + return list; + } + catch (Exception ex) + { + currentSize = "24"; + MessageBox.Show("零件号{productCode}未设置标包,默认为24,请及时核对后进行配置."); + return null; + } + + } + + private void btnChangeSizeR_Click(object sender, EventArgs e) + { + ChangeSize(); + } + void ChangeSize() + { + string pass = _basicBLL1.GetInjectionChangedSizePass(); + Form frm = new Form(); + frm.Size = new Size(400, 300); + frm.StartPosition = FormStartPosition.CenterParent; + TextBox tb = new TextBox(); + tb.Width = 300; + tb.Location = new System.Drawing.Point(30, 30); + tb.PasswordChar = '#'; + Button bt = new Button(); + bt.Width = 100; + bt.Text = "确定"; + bt.Margin = new Padding(40, 100, 0, 0); + bt.Location = new System.Drawing.Point(100, 171); + bt.Click += (arg1, arg2) => { + frm.Close(); + string s = tb.Text; + if (s == pass) + { + comBoxSizeL.Enabled = true; + } + }; + frm.Controls.Add(tb); + frm.Controls.Add(bt); + frm.ShowDialog(); + + + } + + private void comBoxSizeL_SelectedValueChanged(object sender, EventArgs e) + { + comBoxSizeL.Enabled = false; + } } } diff --git a/InjectionSearch/FrmPackageDetail.Designer.cs b/InjectionSearch/FrmPackageDetail.Designer.cs index b2b3e8e..6777c6b 100644 --- a/InjectionSearch/FrmPackageDetail.Designer.cs +++ b/InjectionSearch/FrmPackageDetail.Designer.cs @@ -64,10 +64,10 @@ namespace InjectionSearch this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 52F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 59F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 52F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(2137, 1043); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 59F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2331, 1192); this.tableLayoutPanel1.TabIndex = 0; // // panel1 @@ -83,16 +83,16 @@ namespace InjectionSearch this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2131, 46); + this.panel1.Size = new System.Drawing.Size(2325, 53); this.panel1.TabIndex = 0; // // label3 // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(1560, 12); + this.label3.Location = new System.Drawing.Point(1702, 14); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(52, 21); + this.label3.Size = new System.Drawing.Size(58, 24); this.label3.TabIndex = 7; this.label3.Text = "箱码"; // @@ -100,9 +100,9 @@ namespace InjectionSearch // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(929, 14); + this.label2.Location = new System.Drawing.Point(1013, 16); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 21); + this.label2.Size = new System.Drawing.Size(58, 24); this.label2.TabIndex = 6; this.label2.Text = "时间"; // @@ -110,9 +110,9 @@ namespace InjectionSearch // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(1240, 14); + this.label1.Location = new System.Drawing.Point(1353, 16); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(21, 21); + this.label1.Size = new System.Drawing.Size(22, 24); this.label1.TabIndex = 5; this.label1.Text = "-"; // @@ -121,9 +121,9 @@ namespace InjectionSearch this.dateTimePicker2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.dateTimePicker2.CustomFormat = "yyyy-MM-dd HH:mm"; this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker2.Location = new System.Drawing.Point(1270, 9); + this.dateTimePicker2.Location = new System.Drawing.Point(1385, 10); this.dateTimePicker2.Name = "dateTimePicker2"; - this.dateTimePicker2.Size = new System.Drawing.Size(242, 31); + this.dateTimePicker2.Size = new System.Drawing.Size(264, 35); this.dateTimePicker2.TabIndex = 4; // // dateTimePicker1 @@ -131,9 +131,9 @@ namespace InjectionSearch this.dateTimePicker1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.dateTimePicker1.CustomFormat = "yyyy-MM-dd HH:mm"; this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateTimePicker1.Location = new System.Drawing.Point(992, 9); + this.dateTimePicker1.Location = new System.Drawing.Point(1082, 10); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(242, 31); + this.dateTimePicker1.Size = new System.Drawing.Size(264, 35); this.dateTimePicker1.TabIndex = 3; // // tableLayoutPanel2 @@ -145,7 +145,7 @@ namespace InjectionSearch this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(688, 49); + this.tableLayoutPanel2.Size = new System.Drawing.Size(751, 56); this.tableLayoutPanel2.TabIndex = 2; // // toolStrip1 @@ -154,7 +154,7 @@ namespace InjectionSearch this.toolStrip1.ImageScalingSize = new System.Drawing.Size(32, 32); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(688, 49); + this.toolStrip1.Size = new System.Drawing.Size(751, 56); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // @@ -163,18 +163,18 @@ namespace InjectionSearch this.txtPackageCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.txtPackageCode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtPackageCode.Location = new System.Drawing.Point(1623, 4); + this.txtPackageCode.Location = new System.Drawing.Point(1771, 5); this.txtPackageCode.Name = "txtPackageCode"; - this.txtPackageCode.Size = new System.Drawing.Size(342, 39); + this.txtPackageCode.Size = new System.Drawing.Size(373, 44); this.txtPackageCode.TabIndex = 1; // // btnSearch // this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSearch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(1992, 0); + this.btnSearch.Location = new System.Drawing.Point(2173, 0); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(140, 45); + this.btnSearch.Size = new System.Drawing.Size(153, 51); this.btnSearch.TabIndex = 0; this.btnSearch.Text = "查 询"; this.btnSearch.UseVisualStyleBackColor = true; @@ -200,11 +200,11 @@ namespace InjectionSearch dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(3, 55); + this.dataGridView1.Location = new System.Drawing.Point(3, 62); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 82; this.dataGridView1.RowTemplate.Height = 37; - this.dataGridView1.Size = new System.Drawing.Size(2131, 933); + this.dataGridView1.Size = new System.Drawing.Size(2325, 1068); this.dataGridView1.TabIndex = 1; this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); // @@ -214,7 +214,7 @@ namespace InjectionSearch this.箱单号.HeaderText = "箱单号"; this.箱单号.MinimumWidth = 10; this.箱单号.Name = "箱单号"; - this.箱单号.Width = 300; + this.箱单号.Width = 280; // // 条码 // @@ -238,7 +238,7 @@ namespace InjectionSearch this.零件号.HeaderText = "零件号"; this.零件号.MinimumWidth = 10; this.零件号.Name = "零件号"; - this.零件号.Width = 150; + this.零件号.Width = 130; // // 不良替换 // @@ -259,9 +259,9 @@ namespace InjectionSearch // // FrmPackageDetail // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2137, 1043); + this.ClientSize = new System.Drawing.Size(2331, 1192); this.Controls.Add(this.tableLayoutPanel1); this.Name = "FrmPackageDetail"; this.Text = "箱单详细信息"; diff --git a/InjectionSearch/FrmPackageDetail.cs b/InjectionSearch/FrmPackageDetail.cs index bcb5346..c35c9ef 100644 --- a/InjectionSearch/FrmPackageDetail.cs +++ b/InjectionSearch/FrmPackageDetail.cs @@ -1,5 +1,6 @@ using MESClassLibrary.BLL.BasicInfo; using MESClassLibrary.BLL.Inspection; +using Stone.Common; using System; using System.Collections.Generic; using System.ComponentModel; @@ -20,6 +21,9 @@ namespace InjectionSearch public FrmPackageDetail(string pPackageCode) { InitializeComponent(); + this.StartPosition = FormStartPosition.CenterParent; + this.Size = new Size(1200, 820); + MyGridViewStyle.SetDataGridRowNumber(dataGridView1); this._packageCode = pPackageCode; txtPackageCode.Text = pPackageCode; dataGridView1.AutoGenerateColumns = false; diff --git a/InjectionSearch/InjectionSearch.csproj b/InjectionSearch/InjectionSearch.csproj index 34dea61..a3bcba2 100644 --- a/InjectionSearch/InjectionSearch.csproj +++ b/InjectionSearch/InjectionSearch.csproj @@ -51,6 +51,9 @@ ..\packages\NPOI.2.4.1\lib\net45\NPOI.OpenXmlFormats.dll + + ..\Dlls\Stone.Common.dll + diff --git a/MESClassLibrary/BLL/BasicInfo/BasicBLL1.cs b/MESClassLibrary/BLL/BasicInfo/BasicBLL1.cs index 321309a..c67f7ff 100644 --- a/MESClassLibrary/BLL/BasicInfo/BasicBLL1.cs +++ b/MESClassLibrary/BLL/BasicInfo/BasicBLL1.cs @@ -14,5 +14,15 @@ namespace MESClassLibrary.BLL.BasicInfo { return _basicDAL1.GetPackageSize(); } + + public string GetInjectionChangedSizePass() + { + DataTable dt = _basicDAL1.GetInjectionChangedSizePass(); + if(dt.Rows.Count > 0) + { + return dt.Rows[0]["value"].ToString(); + } + return "123456"; + } } } diff --git a/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs b/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs index 465aa70..57eaaa8 100644 --- a/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs +++ b/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs @@ -90,6 +90,7 @@ namespace MESClassLibrary.BLL.BasicInfo "Des", "isImport", "PackCount", + "PackCountSize", "OpenFailNum", "QLevel", "IsPrintOneTag", @@ -150,7 +151,7 @@ namespace MESClassLibrary.BLL.BasicInfo string jsonStr = "[]"; int total = 0;//总行数 - List list = db.SearchAllInfo(); + List list = db.SearchAllInfo(); if (!String.IsNullOrEmpty(stockNo)) { diff --git a/MESClassLibrary/DAL/BasicInfo/BasicDAL1.cs b/MESClassLibrary/DAL/BasicInfo/BasicDAL1.cs index 06065cb..303efc0 100644 --- a/MESClassLibrary/DAL/BasicInfo/BasicDAL1.cs +++ b/MESClassLibrary/DAL/BasicInfo/BasicDAL1.cs @@ -24,5 +24,19 @@ namespace MESClassLibrary.DAL.BasicInfo return null; } } + public DataTable GetInjectionChangedSizePass() + { + try + { + string sql = @"SELECT * from tb_Config where name='InjectionChangeSizePass' "; + + return SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, null).Tables[0]; + } + catch (Exception ex) + { + LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); + return null; + } + } } } diff --git a/MESClassLibrary/EFModel/BBMPT.Designer.cs b/MESClassLibrary/EFModel/BBMPT.Designer.cs index 57dc82c..7c783c7 100644 --- a/MESClassLibrary/EFModel/BBMPT.Designer.cs +++ b/MESClassLibrary/EFModel/BBMPT.Designer.cs @@ -1,4 +1,4 @@ -// 为模型“D:\Project\2、北汽模塑一厂\SVN\Code\MESClassLibrary\EFModel\BBMPT.edmx”启用了 T4 代码生成。 +// 为模型“D:\Project\BBMPT1\MESClassLibrary\EFModel\BBMPT.edmx”启用了 T4 代码生成。 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // “属性”窗口中。 diff --git a/MESClassLibrary/EFModel/BBMPT.edmx b/MESClassLibrary/EFModel/BBMPT.edmx index d0af6bf..e219632 100644 --- a/MESClassLibrary/EFModel/BBMPT.edmx +++ b/MESClassLibrary/EFModel/BBMPT.edmx @@ -23,28 +23,6 @@ - - @@ -495,7 +473,7 @@ - + @@ -867,31 +845,6 @@ - @@ -921,6 +874,12 @@ + + + + + + @@ -1435,21 +1394,6 @@ - - @@ -1574,6 +1518,7 @@ + @@ -2300,77 +2245,6 @@ - @@ -2425,49 +2299,6 @@ - - - @@ -2480,29 +2311,6 @@ - - - @@ -2515,22 +2323,6 @@ - - - - - - - - - - - - - - - - @@ -3971,6 +3763,12 @@ + + + + + + @@ -4496,7 +4294,7 @@ - + @@ -4518,6 +4316,7 @@ + @@ -5219,7 +5018,7 @@ - + @@ -6246,6 +6045,12 @@ + + + + + + @@ -6805,6 +6610,7 @@ + diff --git a/MESClassLibrary/EFModel/tb_Injection_BoxRecord.cs b/MESClassLibrary/EFModel/tb_Injection_BoxRecord.cs index 7ffeb9b..8b38866 100644 --- a/MESClassLibrary/EFModel/tb_Injection_BoxRecord.cs +++ b/MESClassLibrary/EFModel/tb_Injection_BoxRecord.cs @@ -20,5 +20,11 @@ namespace MESClassLibrary.EFModel public Nullable IsFlag { get; set; } public Nullable CreateTime { get; set; } public Nullable BoxType { get; set; } + public string StationNo { get; set; } + public string PartName { get; set; } + public Nullable StandardQty { get; set; } + public Nullable Mould { get; set; } + public Nullable IsPrint { get; set; } + public Nullable PrintTime { get; set; } } } diff --git a/MESClassLibrary/EFModel/tb_Product.cs b/MESClassLibrary/EFModel/tb_Product.cs index 7c7e28c..bf3f097 100644 --- a/MESClassLibrary/EFModel/tb_Product.cs +++ b/MESClassLibrary/EFModel/tb_Product.cs @@ -47,5 +47,6 @@ namespace MESClassLibrary.EFModel public Nullable ProgramNo { get; set; } public Nullable Side { get; set; } public Nullable IsSend { get; set; } + public string PackCountSize { get; set; } } } diff --git a/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.msl b/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.msl index 6993074..127e34f 100644 --- a/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.msl +++ b/MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.msl @@ -568,6 +568,12 @@ + + + + + + @@ -1127,6 +1133,7 @@ + diff --git a/MESWebSite/HttpHandlers/ProductHandler.ashx.cs b/MESWebSite/HttpHandlers/ProductHandler.ashx.cs index 3b43a13..7ef9f1a 100644 --- a/MESWebSite/HttpHandlers/ProductHandler.ashx.cs +++ b/MESWebSite/HttpHandlers/ProductHandler.ashx.cs @@ -65,6 +65,7 @@ namespace MESWebSite.HttpHandlers string Rows = Request.Params["Rows"]; string Cols = Request.Params["Cols"]; string PackCount = Request.Params["PackCount"]; + string PackCountSize = Request.Params["PackCountSize"]; string Layers = Request.Params["Layers"]; string PicturePath = Request.Params["PicturePath"]; string Des = Request.Params["Des"]; @@ -98,6 +99,7 @@ namespace MESWebSite.HttpHandlers Layers = Layers.To32Int(), PicturePath = PicturePath, PackCount = PackCount.To32Int(), + PackCountSize = PackCountSize, Des = Des, isImport = isImport.To16Int(), OpenFailNum = openFailNum.To32Int(), diff --git a/MESWebSite/Manage/Product.aspx b/MESWebSite/Manage/Product.aspx index a4c8141..d848597 100644 --- a/MESWebSite/Manage/Product.aspx +++ b/MESWebSite/Manage/Product.aspx @@ -322,6 +322,16 @@ + + +

+ 包装范围(例:24,36,48)： +

+ + + + +

@@ -524,6 +534,7 @@ { field: 'Layers', 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 }, { field: 'QLevel', title: 'Q等级', sortable: 'true', width: 10 }, { field: 'BackPlatingNum', title: '可喷涂次数', sortable: 'true', width: 10 }, @@ -624,9 +635,11 @@ var BackPlatingNum = $('#BackPlatingNum').val(); var OpenFailNum = $('#OpenFailNum').val(); var PackCount = $('#PackCount').val(); + var PackCountSize = $('#PackCountSize').val(); var CustomerNo = $('#CustomerNo').val(); var CarModelCode = $('#CarModelCode').val(); var ColorCodeB = $('#ColorCodeB').val(); + //if (StockNo == "") { @@ -682,6 +695,7 @@ IsSupply, IsOneMore, PackCount, + PackCountSize, BackPlatingNum, IsPlating, IsSame, @@ -771,6 +785,7 @@ $('#QLevel').val(row.QLevel); $('#PicturePath').val(row.PicturePath); $('#PackCount').val(row.PackCount); + $('#PackCountSize').val(row.PackCountSize); $('#BackPlatingNum').val(row.BackPlatingNum); $('#OpenFailNum').val(row.OpenFailNum); $('#CustomerNo').val(row.CustomerNo); diff --git a/MESWebSite/Manage/Product.aspx.designer.cs b/MESWebSite/Manage/Product.aspx.designer.cs index 4f62903..e49dfc0 100644 --- a/MESWebSite/Manage/Product.aspx.designer.cs +++ b/MESWebSite/Manage/Product.aspx.designer.cs @@ -2,16 +2,18 @@ // <自动生成> // 此代码由工具生成。 // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 // //------------------------------------------------------------------------------ -namespace MESWebSite.Manage { - - - public partial class Product { - +namespace MESWebSite.Manage +{ + + + public partial class Product + { + ///

/// form1 控件。 /// @@ -20,7 +22,7 @@ namespace MESWebSite.Manage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// ImportPDF 控件。 /// @@ -29,7 +31,7 @@ namespace MESWebSite.Manage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Button ImportPDF; - + /// /// input02 控件。 /// @@ -38,7 +40,7 @@ namespace MESWebSite.Manage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlInputFile input02; - + /// /// lb_ID 控件。 /// @@ -47,7 +49,7 @@ namespace MESWebSite.Manage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlInputText lb_ID; - + /// /// lblMessage 控件。 /// @@ -56,7 +58,7 @@ namespace MESWebSite.Manage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblMessage; - + /// /// ImportExcel 控件。 /// @@ -65,7 +67,7 @@ namespace MESWebSite.Manage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Button ImportExcel; - + /// /// input01 控件。 /// @@ -74,7 +76,7 @@ namespace MESWebSite.Manage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlInputFile input01; - + /// /// UserID 控件。 /// diff --git a/PaintingPC/FrmChainDownNew.Designer.cs b/PaintingPC/FrmChainDownNew.Designer.cs new file mode 100644 index 0000000..98c780e --- /dev/null +++ b/PaintingPC/FrmChainDownNew.Designer.cs @@ -0,0 +1,341 @@ +namespace PaintingPC +{ + partial class FrmChainDownNew + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmChainDownNew)); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); + this.label2 = new System.Windows.Forms.Label(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.txtBarCode = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.panel4 = new System.Windows.Forms.Panel(); + this.lbPartName = new System.Windows.Forms.Label(); + this.panel6 = new System.Windows.Forms.Panel(); + this.lbdownCount = new System.Windows.Forms.Label(); + this.panel7 = new System.Windows.Forms.Panel(); + this.panel8 = new System.Windows.Forms.Panel(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.tableLayoutPanel1.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); + this.panel6.SuspendLayout(); + this.SuspendLayout(); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.panel7, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.panel8, 0, 3); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 4; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 17F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 83F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 116F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 474F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1920, 1536); + this.tableLayoutPanel1.TabIndex = 0; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 3; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.63319F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 84.36681F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194F)); + this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.panel1, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.panel2, 2, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Top; + this.tableLayoutPanel2.Location = new System.Drawing.Point(4, 4); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 1; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1912, 124); + this.tableLayoutPanel2.TabIndex = 1; + // + // pictureBox1 + // + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox1.ErrorImage = null; + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.InitialImage = null; + this.pictureBox1.Location = new System.Drawing.Point(4, 4); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(256, 116); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // panel1 + // + this.panel1.Controls.Add(this.label1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(272, 4); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1441, 116); + this.panel1.TabIndex = 1; + // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Fill; + this.label1.Font = new System.Drawing.Font("微软雅黑", 24F); + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(1441, 116); + this.label1.TabIndex = 0; + this.label1.Text = "悬挂链下件扫描看板"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // panel2 + // + this.panel2.Controls.Add(this.label2); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(1721, 4); + this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(187, 116); + this.panel2.TabIndex = 2; + // + // label2 + // + this.label2.Dock = System.Windows.Forms.DockStyle.Fill; + this.label2.Font = new System.Drawing.Font("微软雅黑", 24F); + this.label2.ForeColor = System.Drawing.Color.White; + this.label2.Location = new System.Drawing.Point(0, 0); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(187, 116); + this.label2.TabIndex = 0; + this.label2.Text = "退出"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label2.Click += new System.EventHandler(this.label2_Click); + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 2; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.Controls.Add(this.panel3, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.panel4, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.panel6, 0, 1); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 164); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 2; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 17.17791F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 82.82208F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(1912, 777); + this.tableLayoutPanel3.TabIndex = 2; + // + // panel3 + // + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.txtBarCode); + this.panel3.Controls.Add(this.label3); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(4, 4); + this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(948, 125); + this.panel3.TabIndex = 0; + // + // txtBarCode + // + this.txtBarCode.Font = new System.Drawing.Font("微软雅黑", 14.25F); + this.txtBarCode.Location = new System.Drawing.Point(110, 8); + this.txtBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtBarCode.Name = "txtBarCode"; + this.txtBarCode.Size = new System.Drawing.Size(640, 45); + this.txtBarCode.TabIndex = 1; + this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.ForeColor = System.Drawing.Color.White; + this.label3.Location = new System.Drawing.Point(8, 12); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(75, 38); + this.label3.TabIndex = 0; + this.label3.Text = "条码"; + // + // panel4 + // + this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel4.Controls.Add(this.lbPartName); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(960, 4); + this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(948, 125); + this.panel4.TabIndex = 1; + // + // lbPartName + // + this.lbPartName.BackColor = System.Drawing.Color.Black; + this.lbPartName.Font = new System.Drawing.Font("微软雅黑", 14.25F); + this.lbPartName.ForeColor = System.Drawing.Color.White; + this.lbPartName.Location = new System.Drawing.Point(14, 9); + this.lbPartName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbPartName.Name = "lbPartName"; + this.lbPartName.Size = new System.Drawing.Size(922, 48); + this.lbPartName.TabIndex = 0; + this.lbPartName.Text = "label4"; + this.lbPartName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // panel6 + // + this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tableLayoutPanel3.SetColumnSpan(this.panel6, 2); + this.panel6.Controls.Add(this.lbdownCount); + this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel6.Location = new System.Drawing.Point(3, 103); + this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(1428, 477); + this.panel6.TabIndex = 3; + // + // lbdownCount + // + this.lbdownCount.BackColor = System.Drawing.Color.Green; + this.lbdownCount.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbdownCount.Font = new System.Drawing.Font("微软雅黑", 108F, System.Drawing.FontStyle.Bold); + this.lbdownCount.ForeColor = System.Drawing.Color.Yellow; + this.lbdownCount.Location = new System.Drawing.Point(0, 0); + this.lbdownCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbdownCount.Name = "lbdownCount"; + this.lbdownCount.Size = new System.Drawing.Size(1426, 475); + this.lbdownCount.TabIndex = 0; + this.lbdownCount.Text = "561"; + this.lbdownCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // panel7 + // + this.panel7.AutoScroll = true; + this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel7.Location = new System.Drawing.Point(4, 949); + this.panel7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(1912, 108); + this.panel7.TabIndex = 3; + // + // panel8 + // + this.panel8.AutoScroll = true; + this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel8.Location = new System.Drawing.Point(4, 1065); + this.panel8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(1912, 467); + this.panel8.TabIndex = 4; + // + // timer1 + // + this.timer1.Enabled = true; + this.timer1.Interval = 5000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // FrmChainDownNew + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Black; + this.ClientSize = new System.Drawing.Size(1920, 1536); + this.Controls.Add(this.tableLayoutPanel1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Name = "FrmChainDownNew"; + this.Text = "FrmChainDown"; + this.Load += new System.EventHandler(this.FrmChainDown_Load); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.tableLayoutPanel3.ResumeLayout(false); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); + this.panel4.ResumeLayout(false); + this.panel6.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.TextBox txtBarCode; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Label lbPartName; + private System.Windows.Forms.Panel panel6; + private System.Windows.Forms.Label lbdownCount; + private System.Windows.Forms.Panel panel7; + private System.Windows.Forms.Timer timer1; + private System.Windows.Forms.Panel panel8; + + + } +} \ No newline at end of file diff --git a/PaintingPC/FrmChainDownNew.cs b/PaintingPC/FrmChainDownNew.cs new file mode 100644 index 0000000..c4a2f56 --- /dev/null +++ b/PaintingPC/FrmChainDownNew.cs @@ -0,0 +1,450 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.Design.Serialization; +using System.Configuration; +using System.Data; +using System.Data.SqlClient; +using System.Drawing; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using DBUtility; +using grproLib; +using PaintingPC.Model; + +namespace PaintingPC +{ + public partial class FrmChainDownNew : Form + { + public FrmChainDownNew() + { + InitializeComponent(); + } + + private void tableLayoutPanel1_Paint(object sender, PaintEventArgs e) + { + + } + + private void label2_Click(object sender, EventArgs e) + { + Environment.Exit(0); + } + + private void FrmChainDown_Load(object sender, EventArgs e) + { + var serverUrl = "http://10.60.101.59:8013/"; + var updateXmlFileName = "PaintDown.xml"; + var updater = new AutoUpdater(); + if (updater.CheckUpdateLoad(serverUrl, updateXmlFileName)) + { + Environment.Exit(0); + } + Control.CheckForIllegalCrossThreadCalls = false; + //this.WindowState = FormWindowState.Maximized; + + txtBarCode.Text = ""; + lbPartName.Text = ""; + //lbupCount.BackColor = Color.FromArgb(27,66,39); + lbdownCount.BackColor = Color.FromArgb(27, 66, 39); + lbdownCount.ForeColor = Color.FromArgb(255, 234, 45); + InitCount(); + //initBarCode(Color.Gray); + initPack("",""); + } + + private void InitCount() + { + try + { + //lbupCount.Text = Function.GetChainCountAll(); + //lbdownCount.Text = Function.GetChainCountDown(); + lbdownCount.Text = Function.GetChainCountDown2(); + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(),MethodBase.GetCurrentMethod().Name); + } + } + /// + /// + /// + /// + /// + private void initPack(string typename,string color1) + { + try + { + int drow = 0, dcol = 5; + + panel8.Controls.Clear(); + + DataTable dt = Function1.GetDownInfo(); + if (dt != null && dt.Rows.Count > 0) + { + UC[] uc=new UC[6]; + int[] sum = new int[dt.Rows.Count]; + string[] type = new string[dt.Rows.Count]; + string[] color = new string[dt.Rows.Count]; + int[] packCount=new int[dt.Rows.Count]; + + for (int i = 0; i < dt.Rows.Count; i++) + { + drow = Convert.ToInt32(Math.Ceiling((double)dt.Rows.Count / dcol)); + sum[i] = Convert.ToInt32(dt.Rows[i]["sum"].ToString()); + //type[i] = dt.Rows[i]["carType"].ToString(); + type[i] = dt.Rows[i]["productName"].ToString(); + color[i] = dt.Rows[i]["color"].ToString(); + + DataTable packdt = Function1.PackCount(type[i], color[i]); + if (packdt != null && packdt.Rows.Count > 0) + { + packCount[i] = Convert.ToInt32(packdt.Rows[0]["PackCount"].ToString()); + } + else + { + packCount[i] = 0; + } + } + + for (int i = 0; i < dcol; i++) //列 + { + for (int j = 0; j < drow; j++) //行 + { + uc[i] = new UC(); + + if ((i + dcol * j) < type.Length) + { + uc[i].typeInfo = type[i + dcol * j]; + uc[i].colorInfo = color[i + dcol * j]; + uc[i].countInfo = sum[i + dcol * j].ToString() + "/" + packCount[i + dcol * j].ToString(); + uc[i].Size = new Size(119, 76); + uc[i].Font = new Font("微软雅黑", 12f); + uc[i].ForeColor = Color.White; + uc[i].Location = new Point(5 + i * (uc[i].Size.Width + 3), 5 + j * (uc[i].Size.Height + 3)); + uc[i].BackColor = Color.FromArgb(1, 6, 152); + panel8.Controls.Add(uc[i]); + } + } + } + + if (typename != "") + { + foreach (var aa in panel8.Controls) + { + UC bb = (UC)aa; + if (bb.typeInfo == typename && bb.colorInfo == color1) + { + bb.BackColor = Color.Green; + } + } + } + } + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + } + + + private void txtBarCode_KeyDown(object sender, KeyEventArgs e) + { + try + { + if (e.KeyCode == Keys.Enter) + { + //int a = 0; + int a = 1; + string cartype = "", color = "",filename="",productName=""; + string barcode = "", partNo = "", packNo = "", partDes = "", batch = "", qLevel = "", type = "", date = ""; + + int packCount = 0; + string boxNo = ""; + + if (txtBarCode.Text.Trim() == "") + { + MessageBox.Show("条码不能为空！", "提示", MessageBoxButtons.OK); + txtBarCode.SelectAll(); + return; + } + + #region 判断是一维码还是二维码，如果是二维码转换成一维码 + + if (txtBarCode.Text.Trim().Contains('.')) + { + barcode = Function.TransToBarCodeOne(txtBarCode.Text.Trim()); + } + else + { + barcode = txtBarCode.Text.Trim(); + } + + #endregion + + + + + + #region 产品条码 + + //TODO 正常扫条码 + if (txtBarCode.Text.Trim() != "#####" && txtBarCode.Text.Trim() != "DEL" && txtBarCode.Text.Trim() != "88888") + { + + + #region 判断条码是否已下线、是否在悬挂链上 + + if (Function1.IsDown(barcode)) + { + MessageBox.Show("该条码已下悬挂链！", "提示", MessageBoxButtons.OK); + txtBarCode.SelectAll(); + return; + } + + DataTable dt = Function1.GetOnChainBarCode(); + if (dt != null && dt.Rows.Count > 0) + { + string[] barCode = new string[dt.Rows.Count]; + for (int i = 0; i < dt.Rows.Count; i++) + { + barCode[i] = dt.Rows[i]["barcode"].ToString(); + } + + if (barCode.Contains(barcode) == false) + { + MessageBox.Show("条码不在悬挂链上！", "提示", MessageBoxButtons.OK); + txtBarCode.SelectAll(); + return; + } + else + { + #region 根据条码信息查询对应信息 + + DataTable barDt = Function1.GetBarCodeInfo(barcode); + if (barDt != null && barDt.Rows.Count > 0) + { + cartype = barDt.Rows[0]["carType"].ToString(); + productName= barDt.Rows[0]["productName"].ToString(); + color = barDt.Rows[0]["color"].ToString(); + lbPartName.Text = color + '，' + productName; + } + + #endregion + + #region 执行存储过程操作 1、将上线表Flag改为1；2、插入到下线表中；3、判断是否需要打箱单；4、将pannel8对应标签选中并标记颜色 + + SqlParameter[] param=new SqlParameter[5]; + + param[0] = new SqlParameter("@barCode", SqlDbType.NVarChar, 50); + param[0].Value = barcode; + + param[1] = new SqlParameter("@carType", SqlDbType.NVarChar, 50); + param[1].Value = cartype; + + param[2] = new SqlParameter("@color", SqlDbType.NVarChar, 50); + param[2].Value = color; + + param[3] = new SqlParameter("@flag", SqlDbType.Int); + param[3].Value = a; + + param[4] = new SqlParameter("@productName", SqlDbType.NVarChar,100); + param[4].Value = productName; + + #endregion + + int res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.StoredProcedure, "ChaimDown", param); + + + + #region 判断当前的条码是不是班次的最后一根 + + DataTable isLast = Function1.IsLast(); + if (isLast != null && isLast.Rows.Count > 0) + { + if (barcode == isLast.Rows[0]["barcode"].ToString()) + { + Function1.UpdateIsLast(barcode); + } + } + + #endregion + + #region 刷新页面 + + InitCount(); + + initPack(productName, param[2].Value.ToString()); + + #endregion + + txtBarCode.SelectAll(); + } + } + else + { + MessageBox.Show("悬挂链上已无产品！", "提示", MessageBoxButtons.OK); + txtBarCode.SelectAll(); + return; + } + + #endregion + } + //TODO 未满器具打包 + else if (txtBarCode.Text.Trim() == "#####") + { + FrmPack frm = new FrmPack(); + + frm.OkBtnClick += (arg1) => + { + #region 查找产品信息 + + DataTable dt2 = Function1.GetBarCodeInfo(arg1); + if (dt2 != null && dt2.Rows.Count > 0) + { + type = dt2.Rows[0]["carType"].ToString(); + color = dt2.Rows[0]["color"].ToString(); + partDes = type + color; + DataTable dt3 = Function1.GetProductInfo(type, color); + if (dt3 != null && dt3.Rows.Count > 0) + { + partNo = dt3.Rows[0]["PartNo"].ToString(); + qLevel = dt3.Rows[0]["QLevel"].ToString(); + } + else + { + MessageBox.Show("此产品零件号不存在！", "提示", MessageBoxButtons.OK); + return; + } + } + + #endregion + + #region 查找未打印产品 + + DataTable dt4 = Function1.GetNotPack(barcode); + if (dt4 != null && dt4.Rows.Count > 0) + { + packCount = Convert.ToInt32(dt4.Rows[0]["aa"].ToString()); + } + else + { + packCount = 0; + } + + #endregion + + #region 生成箱单 + + date = DateTime.Now.ToString("yyyy-MM-dd"); + batch = date.Substring(2, 2) + date.Substring(5, 2) + date.Substring(8, 2); + + DataTable dt5 = Function1.GetPackNo(partNo + "." + batch); + if (dt5 != null && dt5.Rows.Count > 0) + { + packNo = + dt5.Rows[0]["boxNum"].ToString().Substring(0, dt5.Rows[0]["boxNum"].ToString().Length - 6) + + (Convert.ToInt32(dt5.Rows[0]["boxNum"].ToString() + .Substring(dt5.Rows[0]["boxNum"].ToString().Length - 7, 6)) + 1).ToString() + .PadLeft(6, '0'); + } + else + { + packNo = partNo + "." + batch + ".000001"; + } + + #endregion + + #region 打印箱单 + + filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf"; + DataTable headTable = new DataTable(); + headTable.Columns.Add("BoxNo"); + headTable.Columns.Add("PartName"); + headTable.Columns.Add("PartNo"); + headTable.Columns.Add("BatchNo"); + headTable.Columns.Add("PackCount"); + headTable.Columns.Add("QLevel"); + DataRow row = headTable.NewRow(); + + row["BoxNo"] = packNo; + row["PartNo"] = partNo; + + row["QLevel"] = qLevel; + row["PartName"] = partDes; + + row["BatchNo"] = batch; + row["PackCount"] = packCount.ToString() + "EA"; + + string reportName = ConfigurationManager.AppSettings["PrinterName"].ToString(); + headTable.Rows.Add(row); + + ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName); + + rp.Report.Print(false); + + #endregion + + #region 存箱单记录 + + PaintBoxModel md = new PaintBoxModel(); + + md.ID = Guid.NewGuid().ToString(); + md.boxNum = packNo; + md.partNo = partNo; + md.PackCount = packCount; + md.flag = 0; + + Function1.InsertPaintInfo(md); + + #endregion + + #region + + Function1.UpdateBoxNo(arg1, packNo); + + #endregion + + frm.Close(); + }; + } + + //TODO 删除条码 + else if (txtBarCode.Text.Trim() == "DEL") + { + FrmDelChaimUp frm = new FrmDelChaimUp(); + + frm.OkBtnClick += (arg1) => + { + frm.Close(); + + #region 删除条码 + + Function1.delChaimUp(arg1); + + #endregion + }; + frm.ShowDialog(); + txtBarCode.SelectAll(); + } + + #endregion + + InitCount(); + } + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + } + + private void timer1_Tick(object sender, EventArgs e) + { + InitCount(); + } + } +} diff --git a/PaintingPC/FrmChainDownNew.resx b/PaintingPC/FrmChainDownNew.resx new file mode 100644 index 0000000..c585ac0 --- /dev/null +++ b/PaintingPC/FrmChainDownNew.resx @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + /9j/4AAQSkZJRgABAQEAkACQAAD/4QBmRXhpZgAATU0AKgAAAAgABgESAAMAAAABAAEAAAMBAAUAAAAB + AAAAVgMDAAEAAAABAAAAAFEQAAEAAAABAQAAAFERAAQAAAABAAAWJVESAAQAAAABAAAWJQAAAAAAAYag + AACxj//bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMDBgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwM + DAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwIBwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM + DAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIAIUBAQMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAA + AAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgj + QrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2 + d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj + 5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIE + BAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYn + KCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqi + o6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEA + AhEDEQA/AP2w/wCGbvD+fvT/AJ//AF6cP2b9A2/em/P/AOvXoXlsew/KnfPj+H8qlAedj9nHQQud03+f + xp0v7OmgxnO6b8//AK9ehKG6NjH0pF2lSBz9a0TsB57c/s5aDJ8xabjpyf8AGi3/AGfdJ2/Mz4HTmvQ4 + 1VR1+XvmsXUvEun6LvZ7hTg8jfmiSc1ykym4q6OUb9mzQpTukab8z/jVe8+Afh1U8tvtHpxmtC++Omk2 + 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 + + + + 17, 17 + + \ No newline at end of file diff --git a/PaintingPC/FrmQuality.Designer.cs b/PaintingPC/FrmQuality.Designer.cs index 8e30679..3d1959a 100644 --- a/PaintingPC/FrmQuality.Designer.cs +++ b/PaintingPC/FrmQuality.Designer.cs @@ -54,25 +54,29 @@ this.labProPosition = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.panel3 = new System.Windows.Forms.Panel(); + this.panelAttchColor = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); + this.cboxAddColor = new System.Windows.Forms.ComboBox(); this.btnOk = new System.Windows.Forms.Button(); this.btnNok = new System.Windows.Forms.Button(); this.btnRepair = new System.Windows.Forms.Button(); this.btnAbt = new System.Windows.Forms.Button(); + this.lableFP = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.panel1.SuspendLayout(); this.groupBox1.SuspendLayout(); + this.panelAttchColor.SuspendLayout(); this.SuspendLayout(); // // labelVersion // this.labelVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labelVersion.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labelVersion.Location = new System.Drawing.Point(1947, 173); - this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelVersion.Location = new System.Drawing.Point(1593, 148); + this.labelVersion.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.labelVersion.Name = "labelVersion"; - this.labelVersion.Size = new System.Drawing.Size(378, 122); + this.labelVersion.Size = new System.Drawing.Size(309, 104); this.labelVersion.TabIndex = 24; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -80,10 +84,10 @@ // this.labStation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labStation.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labStation.Location = new System.Drawing.Point(1562, 173); - this.labStation.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labStation.Location = new System.Drawing.Point(1278, 148); + this.labStation.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.labStation.Name = "labStation"; - this.labStation.Size = new System.Drawing.Size(378, 122); + this.labStation.Size = new System.Drawing.Size(309, 104); this.labStation.TabIndex = 23; this.labStation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -91,10 +95,10 @@ // this.labWorkClass.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.labWorkClass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labWorkClass.Location = new System.Drawing.Point(1177, 173); - this.labWorkClass.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labWorkClass.Location = new System.Drawing.Point(963, 148); + this.labWorkClass.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.labWorkClass.Name = "labWorkClass"; - this.labWorkClass.Size = new System.Drawing.Size(378, 122); + this.labWorkClass.Size = new System.Drawing.Size(309, 104); this.labWorkClass.TabIndex = 22; this.labWorkClass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labWorkClass.Click += new System.EventHandler(this.labWorkClass_Click); @@ -103,10 +107,10 @@ // this.rdo3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.rdo3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo3.Location = new System.Drawing.Point(792, 173); - this.rdo3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.rdo3.Location = new System.Drawing.Point(648, 148); + this.rdo3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.rdo3.Name = "rdo3"; - this.rdo3.Size = new System.Drawing.Size(378, 122); + this.rdo3.Size = new System.Drawing.Size(309, 104); this.rdo3.TabIndex = 21; this.rdo3.Text = "项目调试"; this.rdo3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -116,10 +120,10 @@ // this.rdo2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.rdo2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo2.Location = new System.Drawing.Point(407, 173); - this.rdo2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.rdo2.Location = new System.Drawing.Point(333, 148); + this.rdo2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.rdo2.Name = "rdo2"; - this.rdo2.Size = new System.Drawing.Size(378, 122); + this.rdo2.Size = new System.Drawing.Size(309, 104); this.rdo2.TabIndex = 20; this.rdo2.Text = "量产调试"; this.rdo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -130,10 +134,10 @@ this.rdo1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); this.rdo1.Checked = true; this.rdo1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.rdo1.Location = new System.Drawing.Point(22, 173); - this.rdo1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.rdo1.Location = new System.Drawing.Point(18, 148); + this.rdo1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.rdo1.Name = "rdo1"; - this.rdo1.Size = new System.Drawing.Size(378, 122); + this.rdo1.Size = new System.Drawing.Size(309, 104); this.rdo1.TabIndex = 19; this.rdo1.TabStop = true; this.rdo1.Text = "正式量产"; @@ -144,10 +148,10 @@ // this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTime.Location = new System.Drawing.Point(1868, 16); - this.labTime.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labTime.Location = new System.Drawing.Point(1528, 14); + this.labTime.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(457, 146); + this.labTime.Size = new System.Drawing.Size(374, 126); this.labTime.TabIndex = 18; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.Click += new System.EventHandler(this.labTime_Click); @@ -156,10 +160,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(22, 16); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.pictureBox1.Location = new System.Drawing.Point(18, 14); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(290, 146); + this.pictureBox1.Size = new System.Drawing.Size(238, 126); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 17; this.pictureBox1.TabStop = false; @@ -168,27 +172,27 @@ // this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labTitle.Location = new System.Drawing.Point(295, 16); - this.labTitle.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labTitle.Location = new System.Drawing.Point(242, 14); + this.labTitle.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.labTitle.Name = "labTitle"; - this.labTitle.Size = new System.Drawing.Size(1577, 146); + this.labTitle.Size = new System.Drawing.Size(1290, 126); this.labTitle.TabIndex = 16; this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // panel2 // - this.panel2.Location = new System.Drawing.Point(22, 1174); - this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.panel2.Location = new System.Drawing.Point(18, 1006); + this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1828, 614); + this.panel2.Size = new System.Drawing.Size(1496, 526); this.panel2.TabIndex = 48; // // pictureBox2 // - this.pictureBox2.Location = new System.Drawing.Point(22, 653); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.pictureBox2.Location = new System.Drawing.Point(18, 560); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(1828, 511); + this.pictureBox2.Size = new System.Drawing.Size(1496, 438); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox2.TabIndex = 47; this.pictureBox2.TabStop = false; @@ -197,10 +201,10 @@ // this.label15.BackColor = System.Drawing.Color.Lime; this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(22, 306); - this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label15.Location = new System.Drawing.Point(18, 262); + this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(292, 131); + this.label15.Size = new System.Drawing.Size(239, 112); this.label15.TabIndex = 49; this.label15.Text = "扫码信息"; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -209,10 +213,10 @@ // this.labProductInfo.BackColor = System.Drawing.Color.White; this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labProductInfo.Location = new System.Drawing.Point(1408, 306); - this.labProductInfo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labProductInfo.Location = new System.Drawing.Point(1152, 262); + this.labProductInfo.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.labProductInfo.Name = "labProductInfo"; - this.labProductInfo.Size = new System.Drawing.Size(917, 131); + this.labProductInfo.Size = new System.Drawing.Size(750, 112); this.labProductInfo.TabIndex = 52; this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -220,10 +224,10 @@ // this.label2.BackColor = System.Drawing.Color.Lime; this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(1106, 306); - this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label2.Location = new System.Drawing.Point(905, 262); + this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(292, 131); + this.label2.Size = new System.Drawing.Size(239, 112); this.label2.TabIndex = 51; this.label2.Text = "产品信息"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -232,10 +236,10 @@ // this.txtBarCode.BackColor = System.Drawing.Color.White; this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.txtBarCode.Location = new System.Drawing.Point(326, 327); - this.txtBarCode.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.txtBarCode.Location = new System.Drawing.Point(267, 280); + this.txtBarCode.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.txtBarCode.Name = "txtBarCode"; - this.txtBarCode.Size = new System.Drawing.Size(765, 87); + this.txtBarCode.Size = new System.Drawing.Size(626, 76); this.txtBarCode.TabIndex = 0; this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.txtBarCode.DoubleClick += new System.EventHandler(this.txtBarCode_DoubleClick); @@ -245,10 +249,10 @@ // this.labProPosition.BackColor = System.Drawing.Color.White; this.labProPosition.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labProPosition.Location = new System.Drawing.Point(1861, 450); - this.labProPosition.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labProPosition.Location = new System.Drawing.Point(1522, 386); + this.labProPosition.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.labProPosition.Name = "labProPosition"; - this.labProPosition.Size = new System.Drawing.Size(464, 151); + this.labProPosition.Size = new System.Drawing.Size(380, 130); this.labProPosition.TabIndex = 64; this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -257,43 +261,67 @@ this.panel1.AutoScroll = true; this.panel1.Controls.Add(this.groupBox1); this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panel1.Location = new System.Drawing.Point(22, 434); - this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.panel1.Location = new System.Drawing.Point(18, 372); + this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1828, 212); + this.panel1.Size = new System.Drawing.Size(1496, 182); this.panel1.TabIndex = 66; // // groupBox1 // - this.groupBox1.Controls.Add(this.panel3); + this.groupBox1.Controls.Add(this.panelAttchColor); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Margin = new System.Windows.Forms.Padding(0); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(0); - this.groupBox1.Size = new System.Drawing.Size(1828, 212); + this.groupBox1.Size = new System.Drawing.Size(1496, 182); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "更改颜色"; // - // panel3 - // - this.panel3.AutoScroll = true; - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 37); - this.panel3.Margin = new System.Windows.Forms.Padding(0); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1828, 175); - this.panel3.TabIndex = 0; + // panelAttchColor + // + this.panelAttchColor.AutoScroll = true; + this.panelAttchColor.Controls.Add(this.label1); + this.panelAttchColor.Controls.Add(this.cboxAddColor); + this.panelAttchColor.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelAttchColor.Location = new System.Drawing.Point(0, 32); + this.panelAttchColor.Margin = new System.Windows.Forms.Padding(0); + this.panelAttchColor.Name = "panelAttchColor"; + this.panelAttchColor.Size = new System.Drawing.Size(1496, 150); + this.panelAttchColor.TabIndex = 0; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(27, 29); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(201, 57); + this.label1.TabIndex = 1; + this.label1.Text = "附加颜色"; + // + // cboxAddColor + // + this.cboxAddColor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboxAddColor.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cboxAddColor.FormattingEnabled = true; + this.cboxAddColor.Location = new System.Drawing.Point(243, 23); + this.cboxAddColor.Name = "cboxAddColor"; + this.cboxAddColor.Size = new System.Drawing.Size(1022, 66); + this.cboxAddColor.TabIndex = 0; + this.cboxAddColor.SelectedValueChanged += new System.EventHandler(this.cboxAddColor_SelectedValueChanged); // // btnOk // this.btnOk.BackColor = System.Drawing.Color.LawnGreen; this.btnOk.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOk.Location = new System.Drawing.Point(1852, 663); + this.btnOk.Location = new System.Drawing.Point(1515, 702); + this.btnOk.Margin = new System.Windows.Forms.Padding(2); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(491, 153); + this.btnOk.Size = new System.Drawing.Size(402, 131); this.btnOk.TabIndex = 67; this.btnOk.Text = "合 格"; this.btnOk.UseVisualStyleBackColor = false; @@ -303,11 +331,12 @@ // this.btnNok.BackColor = System.Drawing.Color.Yellow; this.btnNok.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnNok.Location = new System.Drawing.Point(1852, 974); + this.btnNok.Location = new System.Drawing.Point(1515, 949); + this.btnNok.Margin = new System.Windows.Forms.Padding(2); this.btnNok.Name = "btnNok"; - this.btnNok.Size = new System.Drawing.Size(491, 153); + this.btnNok.Size = new System.Drawing.Size(402, 131); this.btnNok.TabIndex = 68; - this.btnNok.Text = "不合格"; + this.btnNok.Text = "不 良"; this.btnNok.UseVisualStyleBackColor = false; this.btnNok.Click += new System.EventHandler(this.btnNok_Click); // @@ -315,9 +344,10 @@ // this.btnRepair.BackColor = System.Drawing.Color.DodgerBlue; this.btnRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRepair.Location = new System.Drawing.Point(1852, 1314); + this.btnRepair.Location = new System.Drawing.Point(1515, 1178); + this.btnRepair.Margin = new System.Windows.Forms.Padding(2); this.btnRepair.Name = "btnRepair"; - this.btnRepair.Size = new System.Drawing.Size(491, 153); + this.btnRepair.Size = new System.Drawing.Size(402, 131); this.btnRepair.TabIndex = 69; this.btnRepair.Text = "返 喷"; this.btnRepair.UseVisualStyleBackColor = false; @@ -327,19 +357,32 @@ // this.btnAbt.BackColor = System.Drawing.Color.OrangeRed; this.btnAbt.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAbt.Location = new System.Drawing.Point(1852, 1635); + this.btnAbt.Location = new System.Drawing.Point(1515, 1402); + this.btnAbt.Margin = new System.Windows.Forms.Padding(2); this.btnAbt.Name = "btnAbt"; - this.btnAbt.Size = new System.Drawing.Size(491, 153); + this.btnAbt.Size = new System.Drawing.Size(402, 131); this.btnAbt.TabIndex = 70; this.btnAbt.Text = "报 废"; this.btnAbt.UseVisualStyleBackColor = false; this.btnAbt.Click += new System.EventHandler(this.btnAbt_Click); // + // lableFP + // + this.lableFP.AutoSize = true; + this.lableFP.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lableFP.ForeColor = System.Drawing.Color.Red; + this.lableFP.Location = new System.Drawing.Point(1603, 613); + this.lableFP.Name = "lableFP"; + this.lableFP.Size = new System.Drawing.Size(159, 36); + this.lableFP.TabIndex = 71; + this.lableFP.Text = "存在返喷"; + // // FrmQuality // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2351, 1764); + this.ClientSize = new System.Drawing.Size(1924, 1534); + this.Controls.Add(this.lableFP); this.Controls.Add(this.btnAbt); this.Controls.Add(this.btnRepair); this.Controls.Add(this.btnNok); @@ -362,7 +405,7 @@ this.Controls.Add(this.pictureBox1); this.Controls.Add(this.labTitle); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.Name = "FrmQuality"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "喷涂质检"; @@ -371,6 +414,8 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.panel1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); + this.panelAttchColor.ResumeLayout(false); + this.panelAttchColor.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -396,10 +441,13 @@ private System.Windows.Forms.Label labProPosition; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Button btnOk; private System.Windows.Forms.Button btnNok; private System.Windows.Forms.Button btnRepair; private System.Windows.Forms.Button btnAbt; + private System.Windows.Forms.Panel panelAttchColor; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox cboxAddColor; + private System.Windows.Forms.Label lableFP; } } \ No newline at end of file diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs index 8b17566..fc1c872 100644 --- a/PaintingPC/FrmQuality.cs +++ b/PaintingPC/FrmQuality.cs @@ -20,12 +20,21 @@ namespace PaintingPC public static string paintId = ""; private static string position = "", reason = ""; - - public FrmQuality() + private bool _isWmsQuality = false ; + public FrmQuality(bool isWmsQuality) { InitializeComponent(); //WindowState = FormWindowState.Normal; this.Size = new Size(1280, 1024); + this._isWmsQuality = isWmsQuality; + + if(isWmsQuality == true) + { + groupBox1.Visible = false; + btnNok.Visible = false; + btnOk.Visible = false; + btnAbt.Visible = false; + } } private void FrmSecondCheck_Load(object sender, EventArgs e) @@ -80,47 +89,53 @@ namespace PaintingPC try { DataTable dt = Function.GetColorByStockNo(stockNo); - if (dt != null && dt.Rows.Count > 0) - { - RadioButton[] rb = new RadioButton[dt.Rows.Count]; - for(int i=0; i 6) - { - rb[i].Location = new Point(rb[i - 1].Location.X + rb[i - 1].Width + 50, rb[i - 1].Location.Y); - } - else - { - rb[i].Location = new Point(rb[i - 1].Location.X + rb[i - 1].Width + 50, rb[i - 1].Location.Y); - } - - } - rb[i].Click += new System.EventHandler(this.rb_Click); - } - - groupBox1.Controls.AddRange(rb); - //panel3.Controls.AddRange(rb); - } + DataRow dr = dt.NewRow(); + dr["Color"] = ""; + dt.Rows.InsertAt(dr, 0); + cboxAddColor.DataSource = dt; + cboxAddColor.DisplayMember = "Color"; + cboxAddColor.ValueMember = "Color"; + + //if (dt != null && dt.Rows.Count > 0) + //{ + // RadioButton[] rb = new RadioButton[dt.Rows.Count]; + // for(int i=0; i 6) + // { + // rb[i].Location = new Point(rb[i - 1].Location.X + rb[i - 1].Width + 50, rb[i - 1].Location.Y); + // } + // else + // { + // rb[i].Location = new Point(rb[i - 1].Location.X + rb[i - 1].Width + 50, rb[i - 1].Location.Y); + // } + + // } + // rb[i].Click += new System.EventHandler(this.rb_Click); + // } + + // groupBox1.Controls.AddRange(rb); + //} } catch (Exception ex) { @@ -129,7 +144,19 @@ namespace PaintingPC throw ex; } } + private void cboxAddColor_SelectedValueChanged(object sender, EventArgs e) + { + string[] ss = labProductInfo.Text.Split('，'); + if (ss.Length > 1) + { + string attchColor = cboxAddColor.Text.Trim(); + if (!string.IsNullOrEmpty(attchColor)) + { + labProductInfo.Text = cboxAddColor.Text.Trim() + "，" + ss[1]; + } + } + } private void rb_CheckedChanged(object sender, EventArgs e) { RadioButton rb = sender as RadioButton; @@ -330,7 +357,7 @@ namespace PaintingPC if (CheckColor(ref colorName, ref partName) == false) return; #endregion //保存 - SaveInspect("不合格", colorName, partName); + SaveInspect("不良", colorName, partName); ClearPage(); ClearTxtBarcode(); txtBarCode.TabIndex = 0; @@ -376,8 +403,9 @@ namespace PaintingPC ClearControlColor(SetControlGroup()); btnRepair.BackColor = Color.Yellow; + string s = _isWmsQuality == false ? "打磨" : "WMS打磨"; //保存 - SaveInspect("打磨", colorName, partName); + SaveInspect(s, colorName, partName); ClearPage(); ClearTxtBarcode(); txtBarCode.TabIndex = 0; @@ -385,6 +413,9 @@ namespace PaintingPC else { MessageBox.Show("根据该零件可回喷次数设置，不能判定为打磨或已超过打磨次数！"); + ClearPage(); + ClearTxtBarcode(); + txtBarCode.TabIndex = 0; return; } @@ -554,7 +585,14 @@ namespace PaintingPC model1.InspectTimes = (Function.GetInspectTimes(txtBarCode.Text.Trim())+1).ToString(); model1.remark1 = colorName; //颜色名称 model1.remark2 = partName; //零件描述 - model1.remark3 = "喷涂质检"; // 喷涂质检 或 油漆件库 + if(_isWmsQuality == false) + { + model1.remark3 = "喷涂质检"; // 喷涂质检 或 油漆件库 + } + else + { + model1.remark3 = "油漆件库"; // 喷涂质检 或 油漆件库 + } Function.InsertInspect2(model1); } } @@ -630,7 +668,7 @@ namespace PaintingPC #region 查询该系列产品都有什么颜色 string canChanageColor = ConfigurationManager.AppSettings["CanChangeColor"].Trim(); - if (canChanageColor.ToLower() == "true") + if (canChanageColor.ToLower() == "true" && _isWmsQuality==false) //_isWmsQuality =true 表示库房返喷判断,不能附加颜色 { string stockNo = barcode.Substring(0, 10); InitColor(stockNo); @@ -843,13 +881,26 @@ namespace PaintingPC else { #region 没有一检结果，查询老外数据库，取产品信息 + if(_isWmsQuality == false) + { + //喷涂线边质检,没有质检结果,查询老外数据库，取产品信息 + string[] info = Function.GetProductInfo2(barcode).Split('，'); + labProductInfo.Text = info[0] + "，" + info[1]; + paintId = info[2]; - string[] info = Function.GetProductInfo2(barcode).Split('，'); - labProductInfo.Text = info[0] + "，" + info[1]; - paintId = info[2]; + labProductInfo.Tag = Function.GetSide(barcode, paintId); + labProPosition.Text = labTitle.Text.Trim() + " " + labProductInfo.Tag.ToString().Replace(';', ' '); + } + else + { + //库房返喷,没有质检结果,不能查老外库,就是条码不正确 + MessageBox.Show("没有喷涂线边质检记录,无法返喷操作!"); + txtBarCode.Text = ""; + txtBarCode.TabIndex = 0; + txtBarCode.Select(); + return ; + } - labProductInfo.Tag = Function.GetSide(barcode, paintId); - labProPosition.Text = labTitle.Text.Trim() + " " + labProductInfo.Tag.ToString().Replace(';', ' '); #endregion } @@ -920,7 +971,7 @@ namespace PaintingPC btnAbt.BackColor = Color.LightGray; btnRepair.BackColor = Color.LightGray; - ClearRadioButton(); + //ClearRadioButton(); ClearInspect(); ClearControlColor(SetControlGroup()); pictureBox2.Controls.Clear(); @@ -930,6 +981,8 @@ namespace PaintingPC txtBarCode.Select(); position = ""; reason = ""; + lableFP.Text = ""; + cboxAddColor.DataSource = null; } public void ClearRadioButton() @@ -1021,6 +1074,7 @@ namespace PaintingPC } + private void txtBarCode_DoubleClick(object sender, EventArgs e) { diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs index 0f5bd7a..d544ceb 100644 --- a/PaintingPC/Function.cs +++ b/PaintingPC/Function.cs @@ -1494,7 +1494,31 @@ namespace PaintingPC } return res; } - + public static string GetChainCountDown2() + { + string res = "0"; + try + { + + string sql1 = @" + select count(0) + from tb_ChainDown + where + "; + string condition = GetWorkClassTime(); + object cc = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql1 + condition , null); + if (cc != null) + { + res = cc.ToString(); + } + + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + return res; + } public static DataTable GetChainCountLabel() { DataTable res = new DataTable(); diff --git a/PaintingPC/PaintingPC.csproj b/PaintingPC/PaintingPC.csproj index 759f94f..82e7620 100644 --- a/PaintingPC/PaintingPC.csproj +++ b/PaintingPC/PaintingPC.csproj @@ -88,6 +88,12 @@ + + Form + + + FrmChainDownNew.cs + Form @@ -175,6 +181,9 @@ True Reference.map + + FrmChainDownNew.cs + FrmChainDown.cs diff --git a/PaintingPC/Program.cs b/PaintingPC/Program.cs index 847e826..940dd18 100644 --- a/PaintingPC/Program.cs +++ b/PaintingPC/Program.cs @@ -35,11 +35,15 @@ namespace PaintingPC string pageView = ConfigurationManager.AppSettings["PageView"].ToString(); if(pageView == "喷涂质量看板") { - Application.Run(new FrmQuality()); + Application.Run(new FrmQuality(false)); + } + if (pageView == "库房质量看板") + { + Application.Run(new FrmQuality(true)); } else if(pageView == "下悬挂链") { - Application.Run(new FrmChainDown()); + Application.Run(new FrmChainDownNew()); } } #region 系统异常处理 diff --git a/WebService/Function.cs b/WebService/Function.cs index 1c4ec9a..7f666cb 100644 --- a/WebService/Function.cs +++ b/WebService/Function.cs @@ -1,5 +1,6 @@ using DBUtility; using System; +using System.Linq; using System.Collections.Generic; using System.Configuration; using System.Data; @@ -868,6 +869,8 @@ namespace Webservice model.ResultRowsCount = "0"; model.ErrReason = ""; model.DataList = null; + string lu_code = ""; + int repaint = 0; try { @@ -880,17 +883,17 @@ namespace Webservice #endregion - #region 查看是否已入库，已入库的不允许再入库 - - if (IsStockIn(barcode)) - { - model.Result = "0"; - model.ResultType = "Result"; - model.ResultRowsCount = "0"; - model.ErrReason = "已入库，不能再次入库"; + #region 查看是否已入库，已入库的不允许再入库 融合入AllowSendToWms + //融合入AllowSendToWms + //if (IsStockIn(barcode)) + //{ + // model.Result = "0"; + // model.ResultType = "Result"; + // model.ResultRowsCount = "0"; + // model.ErrReason = "已入库，不能再次入库"; - return JSONTools.ScriptSerialize>(model); - } + // return JSONTools.ScriptSerialize>(model); + //} #endregion @@ -916,43 +919,39 @@ namespace Webservice #endregion - #region 没有进行质量判定，不允许入库 - - if (!exsitInspectResult(barcode)) - { - model.Result = "0"; - model.ResultType = "Result"; - model.ResultRowsCount = "0"; - model.ErrReason = "没有进行质量判定，不能入库"; + #region 没有进行质量判定，不允许入库 融合入AllowSendToWms + //融合入AllowSendToWms + //if (!exsitInspectResult(barcode)) + //{ + // model.Result = "0"; + // model.ResultType = "Result"; + // model.ResultRowsCount = "0"; + // model.ErrReason = "没有进行质量判定，不能入库"; - return JSONTools.ScriptSerialize>(model); - } + // return JSONTools.ScriptSerialize>(model); + //} #endregion - #region 查状态，看是否还不合格，不合格的不允许入库 - - if (isPass == 1) - { - if (!barcodeStatus(barcode)) - { - model.Result = "0"; - model.ResultType = "Result"; - model.ResultRowsCount = "0"; - model.ErrReason = "产品检验不合格，不能入库"; + #region 合格状态下，查看记录是否一致,若是不合格，不合格的不允许入库 融合入AllowSendToWms + //融合入AllowSendToWms + //if (isPass == 1) + //{ + // if (!barcodeStatus(barcode)) + // { + // model.Result = "0"; + // model.ResultType = "Result"; + // model.ResultRowsCount = "0"; + // model.ErrReason = "产品检验不合格，不能入库"; - return JSONTools.ScriptSerialize>(model); - } - } + // return JSONTools.ScriptSerialize>(model); + // } + //} #endregion - #region 转换零件号，并查找油漆件的零件号 - - string lu_code = ""; - - LogHelper.WriteSysLogBase("【转换零件号】：barcode：" + barcode, MethodBase.GetCurrentMethod().Name); - + #region 是否允许发送给wms 返喷判断 合格或不合格同检测记录是否一致,报废转合格,已报工校验, 读取返喷状态和颜色状态 + if (string.IsNullOrWhiteSpace(stcokNo)) { model.Result = "0"; @@ -964,11 +963,29 @@ namespace Webservice return JSONTools.ScriptSerialize>(model); } + + string msg = string.Empty; + if(AllowSendToWms(barcode,isPass, ref repaint,ref msg,ref lu_code) == false) + { + model.Result = "0"; + model.ResultType = "Result"; + model.ResultRowsCount = "0"; + model.ErrReason = msg; + + return JSONTools.ScriptSerialize>(model); + } + #endregion + + #region 转换零件号，并查找油漆件的零件号 + + LogHelper.WriteSysLogBase("【转换零件号】：barcode：" + barcode, MethodBase.GetCurrentMethod().Name); + + if (!string.IsNullOrWhiteSpace(stcokNo)) { - #region 通过塑件存货代码和颜色查找对应油漆件零件号 + #region 通过塑件存货代码和颜色查找对应油漆件零件号 融合入AllowSendToWms - lu_code = Function.GetPaintCoe(barcode); + //lu_code = Function.GetPaintCoe(barcode); #endregion @@ -1013,7 +1030,7 @@ namespace Webservice wmsM.WmsRead = 1; wmsM.ReadTime = null; wmsM.Remark = ""; - + wmsM.Repaint = repaint.ToString(); #region 产线及工厂ID LogHelper.WriteSysLogBase("【添加产线ID】barcode：" + barcode, MethodBase.GetCurrentMethod().Name); @@ -1103,6 +1120,88 @@ namespace Webservice return JSONTools.ScriptSerialize>(model); } } + /// + /// + /// + /// + /// 0-不合格;1-合格 + /// + static bool AllowSendToWms(string oneBarCode, int state,ref int pRepaint,ref string errorMssg ,ref string paintColor) + { + if (string.IsNullOrEmpty(oneBarCode)) return false; + + DataTable inspectTable = GetInspectResultTable($"barcode='{oneBarCode}'",ref paintColor); + if (inspectTable.Rows.Count == 0) + { + errorMssg = "没有进行质量判定，不能入库"; + return false; + } + paintColor = GetPaintLU(oneBarCode.Substring(0, 10), inspectTable.Rows[0]["remark1"].ToString()); + + int rePaint = 0; //0:未返喷,1:喷涂线边判断返喷 2:物流仓库判定返喷 + List paintRows = inspectTable.AsEnumerable().Where(p => p.Field("inspectResult").Contains("打磨")).ToList(); + if (paintRows.Count > 0) + { + List wmsPaintRows = paintRows.Where(p => p.Field("inspectResult").Contains("WMS打磨")).ToList(); + if(wmsPaintRows.Count > 0) + { + rePaint = 2; + } + else + { + rePaint = 1; + } + } + else + { + rePaint = 0; + } + pRepaint = rePaint; + //不合格 返喷=0 有报工记录不能重发 + if (state == 0) + { + if (inspectTable.Rows[0]["inspectResult"].ToString().Contains("报废") == false) + { + errorMssg = $"条码[{oneBarCode}]质检记录是[{inspectTable.Rows[0]["inspectResult"].ToString()}]状态,无法报废报工."; + return false; + } + if (rePaint == 0) + { + if (IsStockInAll(oneBarCode)) + { + errorMssg = $"条码[{oneBarCode}]已报工,不能重新报工."; + return false; + } + } + } + //合格 返喷=0 最近一条是报废记录,可以重发. 否则不可以. + else if (state == 1) + { + if(inspectTable.Rows[0]["inspectResult"].ToString().Contains("合格") ==false) + { + errorMssg = $"条码[{oneBarCode}]质检记录是[{inspectTable.Rows[0]["inspectResult"].ToString()}]状态,无法合格报工."; + return false; + } + if (rePaint == 0) + { + if (IsStockInAll(oneBarCode)) + { + string lastRst = inspectTable.Rows[0]["inspectResult"].ToString(); + if (lastRst.Contains("报废")) //允许报废转合格 + { + return true; + } + errorMssg = $"条码[{oneBarCode}]已报工,不能重新报工."; + return false; + } + } + } + + + + return true; + } + /// /// 将二维码转换成相应一维码 @@ -1159,6 +1258,28 @@ namespace Webservice } } + public static bool IsStockInAll(string barcode) + { + try + { + string sql = @" select * from tb_StockIn where barcode = '" + barcode + "' "; + DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + if (dt != null && dt.Rows.Count > 0) + { + return true; + } + else + { + return false; + } + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return false; + } + } + /// /// 查询检验结果，最终是否合格 /// @@ -1196,10 +1317,11 @@ namespace Webservice if (dt != null && dt.Rows.Count > 0) { string inspectResult = dt.Rows[0]["inspectResult"].ToString().Trim(); - if ("[合格]" == inspectResult) + if ("[合格]" == inspectResult) //合格报工 { return true; } + else { return false; @@ -1255,6 +1377,38 @@ namespace Webservice return false; } } + /// + /// 根据塑件码查询所有检验记录 + /// + /// + /// + static DataTable GetInspectResultTable(string oneBarCode, ref string paintCode ) + { + string sql = ""; + if (oneBarCode.Contains(".")) + { + string barcodeOne = TransToBarCodeOne(oneBarCode); + sql = @" select * from tb_InspectResult where barcode = '" + oneBarCode.Trim() + "' or barcode = '" + barcodeOne + @"' order by id desc "; + } + else + { + sql = @" select * from tb_InspectResult where barcode = '" + oneBarCode.Trim() + "' order by id desc"; + } + DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + + return dt; + } + static string GetPaintLU(string stockNo, string color) + { + string sql = @"select * from tb_PaintColorInfo where StockNo='" + stockNo + @"' and Color='" + + color + @"'"; + DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + if (dt != null && dt.Rows.Count > 0) + { + return dt.Rows[0]["Paint_No"].ToString(); + } + return ""; + } /// /// 查询条码是否曾经上喷涂线 diff --git a/WebService/Model/WMS03Model.cs b/WebService/Model/WMS03Model.cs index 3771c11..736afa4 100644 --- a/WebService/Model/WMS03Model.cs +++ b/WebService/Model/WMS03Model.cs @@ -71,5 +71,10 @@ namespace WebService.Model /// 备注 /// public string Remark { get; set; } + + /// + /// 返喷状态 0:未返喷 1:喷涂线边返喷 2:物流仓库返喷 + /// + public string Repaint { get; set; } } } \ No newline at end of file diff --git a/WebService/WMSWebService.asmx.cs b/WebService/WMSWebService.asmx.cs index 653fa4e..742ab0b 100644 --- a/WebService/WMSWebService.asmx.cs +++ b/WebService/WMSWebService.asmx.cs @@ -81,7 +81,7 @@ namespace Webservice /// 喷涂报废接口 /// /// 条码号:A2048856739-P.190605.0008(二维码) - /// 1-合格；0-不合格 + /// 0-不合格;1-合格； [WebMethod] [ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)] public bool WMSSprayingForCS(string barcode, int isOK, out string errorReason)