diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs index c5e9e6d..121fbc5 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, 343F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 689F)); this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0); this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1); this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1); @@ -86,13 +86,14 @@ this.tableLayoutPanel3.Controls.Add(this.button2, 1, 1); this.tableLayoutPanel3.Controls.Add(this.button7, 3, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 809); + this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 1401); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1274, 212); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(2548, 423); this.tableLayoutPanel3.TabIndex = 3; // // button6 @@ -101,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(937, 7); - this.button6.Margin = new System.Windows.Forms.Padding(7); + this.button6.Location = new System.Drawing.Point(1872, 14); + this.button6.Margin = new System.Windows.Forms.Padding(14); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(330, 92); + this.button6.Size = new System.Drawing.Size(662, 183); this.button6.TabIndex = 7; this.button6.Text = "手动打印箱单"; this.button6.UseVisualStyleBackColor = false; @@ -115,9 +116,10 @@ this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button1.Dock = System.Windows.Forms.DockStyle.Fill; this.button1.Font = new System.Drawing.Font("黑体", 16F); - this.button1.Location = new System.Drawing.Point(3, 109); + 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(306, 100); + this.button1.Size = new System.Drawing.Size(611, 200); this.button1.TabIndex = 6; this.button1.Text = "打印标签"; this.button1.UseVisualStyleBackColor = false; @@ -129,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(632, 113); - this.button5.Margin = new System.Windows.Forms.Padding(7); + this.button5.Location = new System.Drawing.Point(1262, 225); + this.button5.Margin = new System.Windows.Forms.Padding(14); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(291, 92); + this.button5.Size = new System.Drawing.Size(582, 184); this.button5.TabIndex = 5; this.button5.Text = "不合格"; this.button5.UseVisualStyleBackColor = false; @@ -143,9 +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(315, 3); + this.button4.Location = new System.Drawing.Point(629, 6); + this.button4.Margin = new System.Windows.Forms.Padding(6); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(307, 100); + this.button4.Size = new System.Drawing.Size(613, 199); this.button4.TabIndex = 4; this.button4.Text = "下一计划"; this.button4.UseVisualStyleBackColor = false; @@ -156,9 +159,10 @@ this.button3.BackColor = System.Drawing.Color.Aqua; this.button3.Dock = System.Windows.Forms.DockStyle.Fill; this.button3.Font = new System.Drawing.Font("黑体", 16F); - this.button3.Location = new System.Drawing.Point(3, 3); + 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(306, 100); + this.button3.Size = new System.Drawing.Size(611, 199); this.button3.TabIndex = 3; this.button3.Text = "上一计划"; this.button3.UseVisualStyleBackColor = false; @@ -170,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(319, 113); - this.button2.Margin = new System.Windows.Forms.Padding(7); + this.button2.Location = new System.Drawing.Point(637, 225); + this.button2.Margin = new System.Windows.Forms.Padding(14); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(299, 92); + this.button2.Size = new System.Drawing.Size(597, 184); this.button2.TabIndex = 2; this.button2.Text = "补打标签"; this.button2.UseVisualStyleBackColor = false; @@ -184,9 +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(933, 109); + this.button7.Location = new System.Drawing.Point(1864, 217); + this.button7.Margin = new System.Windows.Forms.Padding(6); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(338, 100); + this.button7.Size = new System.Drawing.Size(678, 200); this.button7.TabIndex = 8; this.button7.Text = "补打箱单"; this.button7.UseVisualStyleBackColor = false; @@ -198,11 +203,11 @@ 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(774, 2); - this.label7.Margin = new System.Windows.Forms.Padding(1); + this.label7.Location = new System.Drawing.Point(1545, 3); + this.label7.Margin = new System.Windows.Forms.Padding(2); this.label7.Name = "label7"; this.tableLayoutPanel4.SetRowSpan(this.label7, 2); - this.label7.Size = new System.Drawing.Size(136, 154); + this.label7.Size = new System.Drawing.Size(272, 243); this.label7.TabIndex = 32; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -210,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(223, 80); - this.textBox2.Margin = new System.Windows.Forms.Padding(2); + this.textBox2.Location = new System.Drawing.Point(445, 127); + this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(547, 47); + this.textBox2.Size = new System.Drawing.Size(1093, 87); this.textBox2.TabIndex = 30; this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown); // @@ -222,10 +227,10 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(3, 78); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + 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(215, 79); + this.label3.Size = new System.Drawing.Size(431, 125); this.label3.TabIndex = 29; this.label3.Text = "扫描物料条码"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -235,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(913, 159); - this.labOrderNo.Margin = new System.Windows.Forms.Padding(1); + this.labOrderNo.Location = new System.Drawing.Point(1822, 251); + this.labOrderNo.Margin = new System.Windows.Forms.Padding(2); this.labOrderNo.Name = "labOrderNo"; - this.labOrderNo.Size = new System.Drawing.Size(361, 111); + this.labOrderNo.Size = new System.Drawing.Size(727, 175); this.labOrderNo.TabIndex = 28; this.labOrderNo.Text = "A64654646464"; this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -249,10 +254,10 @@ 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(774, 159); - this.label4.Margin = new System.Windows.Forms.Padding(1); + this.label4.Location = new System.Drawing.Point(1545, 251); + this.label4.Margin = new System.Windows.Forms.Padding(2); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(136, 111); + this.label4.Size = new System.Drawing.Size(272, 175); this.label4.TabIndex = 27; this.label4.Text = "计划编号"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -263,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(222, 159); - this.labStationNo.Margin = new System.Windows.Forms.Padding(1); + this.labStationNo.Location = new System.Drawing.Point(443, 251); + this.labStationNo.Margin = new System.Windows.Forms.Padding(2); this.labStationNo.Name = "labStationNo"; - this.labStationNo.Size = new System.Drawing.Size(549, 111); + this.labStationNo.Size = new System.Drawing.Size(1097, 175); this.labStationNo.TabIndex = 26; this.labStationNo.Text = "V253-MF-S后保下部延伸焊接"; this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -277,10 +282,10 @@ this.label2.Dock = System.Windows.Forms.DockStyle.Fill; this.label2.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(2, 159); - this.label2.Margin = new System.Windows.Forms.Padding(1); + 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(217, 111); + this.label2.Size = new System.Drawing.Size(435, 175); this.label2.TabIndex = 25; this.label2.Text = "工位名称"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -290,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(913, 273); - this.labPName.Margin = new System.Windows.Forms.Padding(1); + this.labPName.Location = new System.Drawing.Point(1822, 431); + this.labPName.Margin = new System.Windows.Forms.Padding(2); this.labPName.Name = "labPName"; - this.labPName.Size = new System.Drawing.Size(361, 181); + this.labPName.Size = new System.Drawing.Size(727, 286); this.labPName.TabIndex = 24; this.labPName.Text = "MF253 MF S后保"; this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -304,10 +309,10 @@ 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(774, 273); - this.label8.Margin = new System.Windows.Forms.Padding(1); + this.label8.Location = new System.Drawing.Point(1545, 431); + this.label8.Margin = new System.Windows.Forms.Padding(2); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(136, 181); + this.label8.Size = new System.Drawing.Size(272, 286); this.label8.TabIndex = 23; this.label8.Text = "产品名称"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -318,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(222, 273); - this.labPartNo.Margin = new System.Windows.Forms.Padding(1); + this.labPartNo.Location = new System.Drawing.Point(443, 431); + this.labPartNo.Margin = new System.Windows.Forms.Padding(2); this.labPartNo.Name = "labPartNo"; - this.labPartNo.Size = new System.Drawing.Size(549, 181); + this.labPartNo.Size = new System.Drawing.Size(1097, 286); this.labPartNo.TabIndex = 22; this.labPartNo.Text = "A2530822665"; this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -337,10 +342,10 @@ this.label6.Dock = System.Windows.Forms.DockStyle.Fill; this.label6.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Location = new System.Drawing.Point(2, 273); - this.label6.Margin = new System.Windows.Forms.Padding(1); + 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(217, 181); + this.label6.Size = new System.Drawing.Size(435, 286); this.label6.TabIndex = 21; this.label6.Text = "产品代码"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -351,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(913, 457); - this.labBadCount.Margin = new System.Windows.Forms.Padding(1); + this.labBadCount.Location = new System.Drawing.Point(1822, 722); + this.labBadCount.Margin = new System.Windows.Forms.Padding(2); this.labBadCount.Name = "labBadCount"; - this.labBadCount.Size = new System.Drawing.Size(361, 257); + this.labBadCount.Size = new System.Drawing.Size(727, 513); this.labBadCount.TabIndex = 20; this.labBadCount.Text = "0"; this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -365,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(222, 457); - this.labNum.Margin = new System.Windows.Forms.Padding(1); + this.labNum.Location = new System.Drawing.Point(443, 722); + this.labNum.Margin = new System.Windows.Forms.Padding(2); this.labNum.Name = "labNum"; - this.labNum.Size = new System.Drawing.Size(549, 257); + this.labNum.Size = new System.Drawing.Size(1097, 513); this.labNum.TabIndex = 18; this.labNum.Text = "152/210"; this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -379,10 +384,10 @@ this.label10.Dock = System.Windows.Forms.DockStyle.Fill; this.label10.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Location = new System.Drawing.Point(2, 457); - this.label10.Margin = new System.Windows.Forms.Padding(1); + 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(217, 257); + this.label10.Size = new System.Drawing.Size(435, 513); this.label10.TabIndex = 17; this.label10.Text = "计划/完成数"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -392,10 +397,10 @@ this.label14.Dock = System.Windows.Forms.DockStyle.Fill; this.label14.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.ForeColor = System.Drawing.Color.White; - this.label14.Location = new System.Drawing.Point(3, 1); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + 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(215, 76); + this.label14.Size = new System.Drawing.Size(431, 121); this.label14.TabIndex = 12; this.label14.Text = "扫描本体条码"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -404,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(223, 3); - this.textBox1.Margin = new System.Windows.Forms.Padding(2); + this.textBox1.Location = new System.Drawing.Point(445, 5); + this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(547, 47); + this.textBox1.Size = new System.Drawing.Size(1093, 87); this.textBox1.TabIndex = 13; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -416,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(914, 1); - this.labErrMessage.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.labErrMessage.Location = new System.Drawing.Point(1824, 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(359, 156); + this.labErrMessage.Size = new System.Drawing.Size(723, 247); this.labErrMessage.TabIndex = 16; this.labErrMessage.Text = "条码与产品不匹配，重新扫描"; this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -432,9 +437,9 @@ this.tableLayoutPanel4.ColumnCount = 4; 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, 138F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 362F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + 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, 40F)); this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0); this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1); this.tableLayoutPanel4.Controls.Add(this.label3, 0, 1); @@ -454,17 +459,17 @@ this.tableLayoutPanel4.Controls.Add(this.textBox1, 1, 0); this.tableLayoutPanel4.Controls.Add(this.labErrMessage, 3, 0); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(2, 88); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(2); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 153); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 5; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.8932F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 17.47573F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40.52419F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 258F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(1276, 716); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 516F)); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(2552, 1238); this.tableLayoutPanel4.TabIndex = 2; // // label12 @@ -473,10 +478,10 @@ 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(774, 457); - this.label12.Margin = new System.Windows.Forms.Padding(1); + this.label12.Location = new System.Drawing.Point(1545, 722); + this.label12.Margin = new System.Windows.Forms.Padding(2); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(136, 257); + this.label12.Size = new System.Drawing.Size(272, 513); this.label12.TabIndex = 19; this.label12.Text = "不合格数"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -486,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(990, 0); + this.labTime.Location = new System.Drawing.Point(1978, 0); this.labTime.Margin = new System.Windows.Forms.Padding(0); this.labTime.Name = "labTime"; - this.labTime.Size = new System.Drawing.Size(290, 86); + this.labTime.Size = new System.Drawing.Size(582, 149); this.labTime.TabIndex = 7; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.Click += new System.EventHandler(this.labTime_Click); @@ -503,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(179, 86); + this.pictureBox1.Size = new System.Drawing.Size(358, 149); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; @@ -513,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(179, 0); + this.label1.Location = new System.Drawing.Point(358, 0); this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(811, 86); + this.label1.Size = new System.Drawing.Size(1620, 149); this.label1.TabIndex = 1; this.label1.Text = "装配工位信息看板"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -527,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, 289F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 581F)); this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0); this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0); @@ -537,7 +542,7 @@ 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(1280, 86); + this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 149); this.tableLayoutPanel2.TabIndex = 0; // // tableLayoutPanel1 @@ -554,17 +559,18 @@ this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10.69692F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 89.30308F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 217F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 1024); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 434F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1830); this.tableLayoutPanel1.TabIndex = 9; // // FrmZP // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1280, 1024); + this.ClientSize = new System.Drawing.Size(2560, 1830); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6); this.Name = "FrmZP"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmZP"; diff --git a/InjectionPC/FrmDown.cs b/InjectionPC/FrmDown.cs index 64e3b1e..ede7c87 100644 --- a/InjectionPC/FrmDown.cs +++ b/InjectionPC/FrmDown.cs @@ -366,7 +366,8 @@ namespace InjectionPC private void label2_Click(object sender, EventArgs e) { - Environment.Exit(0); + this.Close(); + //Environment.Exit(0); } } diff --git a/InjectionPC/FrmQuality.cs b/InjectionPC/FrmQuality.cs index 69a5bd8..41828d1 100644 --- a/InjectionPC/FrmQuality.cs +++ b/InjectionPC/FrmQuality.cs @@ -976,7 +976,8 @@ namespace InjectionPC private void label2_Click(object sender, EventArgs e) { - Environment.Exit(0); + this.Close(); + //Environment.Exit(0); } private void textBox1_KeyDown(object sender, KeyEventArgs e) diff --git a/PaintingPC/FrmQuality.Designer.cs b/PaintingPC/FrmQuality.Designer.cs index 0f5b981..8e30679 100644 --- a/PaintingPC/FrmQuality.Designer.cs +++ b/PaintingPC/FrmQuality.Designer.cs @@ -55,8 +55,8 @@ this.panel1 = new System.Windows.Forms.Panel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel3 = new System.Windows.Forms.Panel(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); + 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(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -287,27 +287,29 @@ this.panel3.Size = new System.Drawing.Size(1828, 175); this.panel3.TabIndex = 0; // - // button2 - // - this.button2.BackColor = System.Drawing.Color.LawnGreen; - this.button2.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button2.Location = new System.Drawing.Point(1852, 663); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(491, 153); - this.button2.TabIndex = 67; - this.button2.Text = "合 格"; - this.button2.UseVisualStyleBackColor = false; - // - // button3 - // - this.button3.BackColor = System.Drawing.Color.Yellow; - this.button3.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button3.Location = new System.Drawing.Point(1852, 974); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(491, 153); - this.button3.TabIndex = 68; - this.button3.Text = "不合格"; - this.button3.UseVisualStyleBackColor = false; + // 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.Name = "btnOk"; + this.btnOk.Size = new System.Drawing.Size(491, 153); + this.btnOk.TabIndex = 67; + this.btnOk.Text = "合 格"; + this.btnOk.UseVisualStyleBackColor = false; + this.btnOk.Click += new System.EventHandler(this.btnOk_Click); + // + // btnNok + // + 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.Name = "btnNok"; + this.btnNok.Size = new System.Drawing.Size(491, 153); + this.btnNok.TabIndex = 68; + this.btnNok.Text = "不合格"; + this.btnNok.UseVisualStyleBackColor = false; + this.btnNok.Click += new System.EventHandler(this.btnNok_Click); // // btnRepair // @@ -340,8 +342,8 @@ this.ClientSize = new System.Drawing.Size(2351, 1764); this.Controls.Add(this.btnAbt); this.Controls.Add(this.btnRepair); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); + this.Controls.Add(this.btnNok); + this.Controls.Add(this.btnOk); this.Controls.Add(this.panel1); this.Controls.Add(this.labProPosition); this.Controls.Add(this.txtBarCode); @@ -395,8 +397,8 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button btnOk; + private System.Windows.Forms.Button btnNok; private System.Windows.Forms.Button btnRepair; private System.Windows.Forms.Button btnAbt; } diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs index a32195f..8b17566 100644 --- a/PaintingPC/FrmQuality.cs +++ b/PaintingPC/FrmQuality.cs @@ -48,7 +48,7 @@ namespace PaintingPC try { string title = ConfigurationManager.AppSettings["Position"].ToString(); - string workClass = Function.GetWorkClass(); + string workClass = Function.GetWorkClass2(); string station = ConfigurationManager.AppSettings["Station"].ToString(); labTitle.Text = title; @@ -236,60 +236,119 @@ namespace PaintingPC /// /// /// - private void btnPass_Click(object sender, EventArgs e) - { - #region 必须选择缺陷位置与缺陷原因，否则无法保存 + //private void btnPass_Click(object sender, EventArgs e) + //{ + // #region 必须选择缺陷位置与缺陷原因，否则无法保存 + + // string damnPositionTemp = ""; + // string reasonTemp = ""; + // //缺陷位置 + // foreach (Control c in pictureBox2.Controls) + // { + // Label lab = c as Label; + // if (lab.BackColor != Color.Transparent) + // { + // damnPositionTemp += lab.Text + ";"; + // } + // } + // //缺陷原因 + // foreach (Control c in panel2.Controls) + // { + // Label lab = c as Label; + // if (lab.BackColor != Color.Transparent) + // { + // reasonTemp += lab.Text + ";"; + // } + // } + + // if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp)) + // { + // MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); + // return; + // } + + // #endregion + + // ClearControlColor(SetControlGroup()); + // btnRepair.BackColor = Color.Yellow; + // //保存 + // SaveInspect("抛光"); + // ClearPage(); + // ClearTxtBarcode(); + // txtBarCode.TabIndex = 0; + // //LoadPage(); + // //ClearInspect(); + // //ClearControlColor(SetControlGroup()); + //} - string damnPositionTemp = ""; - string reasonTemp = ""; - //缺陷位置 - foreach (Control c in pictureBox2.Controls) - { - Label lab = c as Label; - if (lab.BackColor != Color.Transparent) - { - damnPositionTemp += lab.Text + ";"; - } - } - //缺陷原因 - foreach (Control c in panel2.Controls) + /// + /// 合格 + /// + /// + /// + private void btnOk_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) { - Label lab = c as Label; - if (lab.BackColor != Color.Transparent) - { - reasonTemp += lab.Text + ";"; - } + MessageBox.Show("请先扫描数据,然后操作."); + return; } + #region 判断产品是否有颜色 + string colorName = string.Empty; + string partName = string.Empty; + if (CheckColor(ref colorName,ref partName) == false) return; - if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp)) + #endregion + ClearControlColor(SetControlGroup()); + btnAbt.BackColor = Color.Red; + //保存 + SaveInspect("合格", colorName, partName); + ClearPage(); + ClearTxtBarcode(); + txtBarCode.TabIndex = 0; + } + + /// + /// 不合格 + /// + /// + /// + private void btnNok_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) { - MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); + MessageBox.Show("请先扫描数据,然后操作."); return; } - + #region 必须选择缺陷位置与缺陷原因，否则无法保存 + if (CheckDefect() == false) return; #endregion - ClearControlColor(SetControlGroup()); - btnRepair.BackColor = Color.Yellow; + #region 判断产品是否有颜色 + string colorName = string.Empty; + string partName = string.Empty; + if (CheckColor(ref colorName, ref partName) == false) return; + #endregion //保存 - SaveInspect("抛光"); + SaveInspect("不合格", colorName, partName); ClearPage(); ClearTxtBarcode(); txtBarCode.TabIndex = 0; - //LoadPage(); - //ClearInspect(); - //ClearControlColor(SetControlGroup()); } /// - /// 打磨按钮 + /// 返喷按钮 /// /// /// private void btnRepair_Click(object sender, EventArgs e) { #region 可回喷次数 =1，不能打磨， =2 可以， 不能有两次质检结果为打磨 - + if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) + { + MessageBox.Show("请先扫描数据,然后操作."); + return; + } string barcode = Function.UniteBarCodeToOne(txtBarCode.Text.Trim()); int cs = Function.YiDaMoCiShu(barcode); //if (cs >= 1) @@ -304,39 +363,21 @@ namespace PaintingPC { #region 必须选择缺陷位置与缺陷原因，否则无法保存 - string damnPositionTemp = ""; - string reasonTemp = ""; - //缺陷位置 - foreach (Control c in pictureBox2.Controls) - { - Label lab = c as Label; - if (lab.BackColor != Color.Transparent) - { - damnPositionTemp += lab.Text + ";"; - } - } - //缺陷原因 - foreach (Control c in panel2.Controls) - { - Label lab = c as Label; - if (lab.BackColor != Color.Transparent) - { - reasonTemp += lab.Text + ";"; - } - } + if (CheckDefect() == false) return; - if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp)) - { - MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); - return; - } + #endregion + #region 判断产品是否有颜色 + string colorName = string.Empty; + string partName = string.Empty; + + if (CheckColor(ref colorName, ref partName) == false) return; #endregion ClearControlColor(SetControlGroup()); btnRepair.BackColor = Color.Yellow; //保存 - SaveInspect("打磨"); + SaveInspect("打磨", colorName, partName); ClearPage(); ClearTxtBarcode(); txtBarCode.TabIndex = 0; @@ -357,8 +398,86 @@ namespace PaintingPC /// private void btnAbt_Click(object sender, EventArgs e) { + if (string.IsNullOrEmpty(txtBarCode.Text.Trim())) + { + MessageBox.Show("请先扫描数据,然后操作."); + return; + } #region 必须选择缺陷位置与缺陷原因，否则无法保存 + if (CheckDefect() == false) return; + #endregion + + #region 判断产品是否有颜色 + string colorName = string.Empty; + string partName = string.Empty; + if (CheckColor(ref colorName, ref partName) == false) return; + #endregion + + ClearControlColor(SetControlGroup()); + btnAbt.BackColor = Color.Red; + //保存 + SaveInspect("报废", colorName, partName); + + #region 报废则调WMS WebService，入库 + + try + { + WMSWebService webService = new WMSWebService(); + webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString(); + //webService.Timeout = 1200000; + + string errorReason = ""; + webService.WMSSprayingForCS(Function.UniteBarCodeToOne(txtBarCode.Text.Trim()), 0, out errorReason); + } + catch (Exception ex) + { + LogHelper.WriteErrLogBase("工位：" + labStation.Text.Trim() + "，二次质检调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + #endregion + + ClearPage(); + ClearTxtBarcode(); + txtBarCode.TabIndex = 0; + //ClearInspect(); + //ClearControlColor(SetControlGroup()); + } + /// + /// 判断产品是否有颜色 + /// + /// + bool CheckColor(ref string colorName,ref string partName) + { + string[] ss = labProductInfo.Text.Split('，'); + if (ss.Length >= 1) + { + if (string.IsNullOrWhiteSpace(ss[0])) + { + MessageBox.Show("无颜色信息，请重新扫描"); + return false; + } + } + else + { + MessageBox.Show("条码有误，请重新扫描"); + return false; + } + colorName = ss[0]; + if (ss.Length > 1) + { + if (!string.IsNullOrEmpty(ss[1])) + { + partName = ss[1]; + } + } + return true; + } + /// + /// 必须选择缺陷位置与缺陷原因，否则无法保存 + /// + /// + bool CheckDefect() + { string damnPositionTemp = ""; string reasonTemp = ""; //缺陷位置 @@ -385,60 +504,12 @@ namespace PaintingPC if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp)) { MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); - return; - } - #endregion - - #region 判断产品是否有颜色 - - string[] ss = labProductInfo.Text.Split('，'); - if (ss.Length >= 1) - { - if (string.IsNullOrWhiteSpace(ss[0])) - { - MessageBox.Show("无颜色信息，请重新扫描"); - return; - } - } - else - { - MessageBox.Show("条码有误，请重新扫描"); - return; + return false; } - - #endregion - - ClearControlColor(SetControlGroup()); - btnAbt.BackColor = Color.Red; - //保存 - SaveInspect("报废"); - - #region 报废则调WMS WebService，入库 - - //try - //{ - // WMSWebService webService = new WMSWebService(); - // webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString(); - // //webService.Timeout = 1200000; - - // string errorReason = ""; - // webService.WMSSprayingForCS(Function.UniteBarCodeToOne(txtBarCode.Text.Trim()), 0, out errorReason); - //} - //catch (Exception ex) - //{ - // LogHelper.WriteErrLogBase("工位：" + labStation.Text.Trim() + "，二次质检调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name); - //} - - #endregion - - ClearPage(); - ClearTxtBarcode(); - txtBarCode.TabIndex = 0; - //ClearInspect(); - //ClearControlColor(SetControlGroup()); + return true; } - public void SaveInspect(string inspectResult) + public void SaveInspect(string inspectResult,string colorName, string partName) { try { @@ -455,11 +526,15 @@ namespace PaintingPC model1.reason = reason; model1.remark3 = paintId; - if (string.IsNullOrWhiteSpace(model1.damnPosition) || string.IsNullOrWhiteSpace(model1.reason)) + if(inspectResult != "合格") { - MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); - return; + if (string.IsNullOrWhiteSpace(model1.damnPosition) || string.IsNullOrWhiteSpace(model1.reason)) + { + MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！"); + return; + } } + if (rdo1.Checked) { @@ -477,8 +552,10 @@ namespace PaintingPC model1.productInfo = labProductInfo.Text.Trim(); model1.side = labProPosition.Text.Contains("A侧") ? "A侧" : "B侧"; model1.InspectTimes = (Function.GetInspectTimes(txtBarCode.Text.Trim())+1).ToString(); - - Function.InsertInspect(model1); + model1.remark1 = colorName; //颜色名称 + model1.remark2 = partName; //零件描述 + model1.remark3 = "喷涂质检"; // 喷涂质检 或 油漆件库 + Function.InsertInspect2(model1); } } catch (Exception ex) @@ -570,7 +647,7 @@ namespace PaintingPC Int32.TryParse(strCode, out num); if (num > 7000) { - labProductInfo.Text = Function.GetReprintInfo(barcode); + labProductInfo.Text = Function.GetReprintInfo2(barcode); if (string.IsNullOrWhiteSpace(labProductInfo.Text.Trim())) { ButtonDisable(SetControlGroup()); @@ -649,19 +726,24 @@ namespace PaintingPC } dt.Dispose(); - if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture)) + if (!string.IsNullOrEmpty(picture)) { + if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture)) + { - string strImageURL = Function.GetImgPath() + picture; + string strImageURL = Function.GetImgPath() + picture; - System.Net.WebClient webClient = new System.Net.WebClient(); - webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture); - } + System.Net.WebClient webClient = new System.Net.WebClient(); + webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture); + } + + FileStream fs = new FileStream(Directory.GetCurrentDirectory() + "\\" + picture, FileMode.Open, FileAccess.Read);//获取图片文件流 Image img = Image.FromStream(fs); // 文件流转换成Image格式 pictureBox2.Image = img; //给 图片框设置要显示的图片 fs.Close(); // 关闭流，释放图片资源 + } } catch (Exception ex) { @@ -697,7 +779,7 @@ namespace PaintingPC #endregion //不是补打的条码，根据条码查询产品信息、检验信息，选中缺陷位置及原因 - DataTable dtInspect = Function.GetInspectInfoByBarCode(barcode); + DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode); if (dtInspect != null && dtInspect.Rows.Count > 0) { labProductInfo.Text = dtInspect.Rows[0]["productInfo"].ToString().Trim(); //产品信息 @@ -754,7 +836,7 @@ namespace PaintingPC #region 根据一检结果显示一检时的位置--暂时不要 - labProPosition.Text = Function.GetFirstInsPosition(dtInspect); + labProPosition.Text = Function.GetFirstInsPosition2(dtInspect); #endregion } @@ -762,7 +844,7 @@ namespace PaintingPC { #region 没有一检结果，查询老外数据库，取产品信息 - string[] info = Function.GetProductInfo(barcode).Split('，'); + string[] info = Function.GetProductInfo2(barcode).Split('，'); labProductInfo.Text = info[0] + "，" + info[1]; paintId = info[2]; @@ -906,16 +988,16 @@ namespace PaintingPC /// /// /// - private void button1_Click(object sender, EventArgs e) - { - ClearControlColor(SetControlGroup()); - //btnPass.BackColor = Color.GreenYellow; - //保存 - SaveInspect("其他"); - ClearPage(); - ClearTxtBarcode(); - txtBarCode.TabIndex = 0; - } + //private void button1_Click(object sender, EventArgs e) + //{ + // ClearControlColor(SetControlGroup()); + // //btnPass.BackColor = Color.GreenYellow; + // //保存 + // SaveInspect("其他"); + // ClearPage(); + // ClearTxtBarcode(); + // txtBarCode.TabIndex = 0; + //} private void UpdateSoftware() { diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs index f585fa8..0f5bd7a 100644 --- a/PaintingPC/Function.cs +++ b/PaintingPC/Function.cs @@ -103,6 +103,7 @@ namespace PaintingPC } } + /// /// 根据条码获取图片地址 /// @@ -194,58 +195,7 @@ namespace PaintingPC } } - /// - /// 保存检验结果 - /// - /// - /// - public static int InsertInspect(InspectModel model) - { - int res = 0; - try - { - string sql = @" INSERT INTO [dbo].[tb_InspectResult] - ([ID] - ,[barcode] - ,[side] - ,[position] - ,[stationNo] - ,[workClass] - ,[inspectResult] - ,[damnPosition] - ,[defectID] - ,[reason] - ,[productInfo] - ,[productOption] - ,[createTime] - ,[InspectTimes] - ) - VALUES - ('" + model.ID +@"' - ,'" + model.barcode +@"' - ,'" + model.side +@"' - ,'"+ model.position +@"' - ,'"+ model.stationNo +@"' - ,'"+ model.workClass +@"' - ,'" + model.inspectResult + @"' - ,'" + model.damnPosition + @"' - ,'" + model.defectID + @"' - ,'" + model.reason + @"' - ,'" + model.productInfo + @"' - ,'" + model.productOption + @"' - ,(select getdate()), '"+ model.InspectTimes +@"' - ) "; - res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null); - LogHelper.WriteSysLogBase( "[sql：]" + sql ,MethodBase.GetCurrentMethod().Name); - return res; - } - catch (Exception ex) - { - LogHelper.WriteLogManager(ex); - LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); - return res; - } - } + public Panel IInitPanel(Panel BackgroundPanel, int LabelSizeW, int LabelSizeH, DataTable dataSouce, string LabelTextCol, string LabelTagCol, EventHandler LabelClick) { @@ -294,32 +244,7 @@ namespace PaintingPC return BackgroundPanel; } - /// - /// 根据条码获取检验信息 - /// - /// - /// - public static DataTable GetInspectInfoByBarCode(string barcode) - { - DataTable res = new DataTable(); - try - { - string sql = @" select * from (SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '"+ barcode +@"' AND InspectTimes = '1' ORDER BY createTime DESC) aa - UNION - SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '2' ORDER BY createTime DESC) bb - UNION - SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '3' ORDER BY createTime DESC) cc) dd order by createTime DESC "; - res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); - LogHelper.WriteSysLogBase("[sql：]" + sql, MethodBase.GetCurrentMethod().Name); - return res; - } - catch (Exception ex) - { - LogHelper.WriteLogManager(ex); - LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); - return res; - } - } + /// /// 获取国外数据库数据--暂时不用此方法 @@ -468,7 +393,7 @@ namespace PaintingPC return "B班"; } } - + /// /// 判断传入时间是否在工作时间段内 /// @@ -850,37 +775,27 @@ namespace PaintingPC return res; } } - - /// - /// 查询补打条码信息 - /// - /// - /// - public static string GetReprintInfo(string barcode) + + public static DataTable GetLastResult(string barcode) { - string res = ""; + DataTable res = new DataTable(); try { - if (!string.IsNullOrWhiteSpace(barcode)) - { - string sql = @" - SELECT ProductID, StockNo, ColorDes,(SELECT ProductName FROM tb_Product WHERE ProductID =(SELECT top 1 ProductID FROM tb_PaintBarCode WHERE OneBarCode = '" + barcode + "')) ProductName FROM tb_PaintBarCode WHERE OneBarCode = '" + barcode + "' "; - DataTable aa = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); - if (aa != null && aa.Rows.Count > 0) - { - res = aa.Rows[0]["ColorDes"].ToString() + "，" + aa.Rows[0]["ProductName"].ToString(); - } - } - return res; + string sql = @"select top 1 * from tb_InspectResult where barcode='" + barcode + @"' order by ID desc "; + + res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + } catch (Exception ex) { - LogHelper.WriteLogManager(ex); LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); - return res; } + + return res; } + + /// /// 根据滑撬号获取圈数 /// @@ -1102,41 +1017,7 @@ namespace PaintingPC return res; } } - - /// - /// 根据一检结果显示一检时的位置 - /// - /// - /// - public static string GetFirstInsPosition(DataTable dt) - { - string res = ""; - try - { - if (dt != null && dt.Rows.Count > 0) - { - DataRow[] dr = dt.Select(" InspectTimes = '1' "); - if (dr != null && dr.Length > 0) - { - string position = dr[0]["position"].ToString(); - - string sql = @" select value from tb_Config where name = 'RemoveStr' "; - object objStr = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql, null); - if (objStr != null) - { - res = position.Replace(objStr.ToString(), "").Trim(); - } - } - } - return res; - } - catch (Exception ex) - { - LogHelper.WriteLogManager(ex); - LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); - return res; - } - } + /// /// 判断条码有效性 @@ -1298,6 +1179,7 @@ namespace PaintingPC where barcode = '" + barcode + @"' and inspectResult = '[打磨]' "; + object aa = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql, null); if (aa != null) { @@ -1673,7 +1555,327 @@ namespace PaintingPC #region 新 + /// + /// 根据一检结果显示一检时的位置 + /// + /// + /// + public static string GetFirstInsPosition2(DataTable dt) + { + string res = ""; + try + { + if (dt != null && dt.Rows.Count > 0) + { + DataRow[] dr = dt.Select(" InspectTimes = '1' "); + if (dr != null && dr.Length > 0) + { + string position = dr[0]["position"].ToString(); + + string sql = @" select value from tb_Config where name = 'RemoveStr' "; + object objStr = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql, null); + if (objStr != null) + { + res = position.Replace(objStr.ToString(), "").Trim(); + } + } + } + return res; + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return res; + } + } + + /// + /// 根据条码获取检验信息 + /// + /// + /// + public static DataTable GetInspectInfoByBarCode2(string barcode) + { + DataTable res = new DataTable(); + try + { + string sql = @" select * from (SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '1' ORDER BY createTime DESC) aa + UNION + SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '2' ORDER BY createTime DESC) bb + UNION + SELECT * from (select TOP 1 * from tb_InspectResult where barcode = '" + barcode + @"' AND InspectTimes = '3' ORDER BY createTime DESC) cc) dd order by createTime DESC "; + res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + LogHelper.WriteSysLogBase("[sql：]" + sql, MethodBase.GetCurrentMethod().Name); + return res; + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return res; + } + } + + /// + /// 查询补打条码信息 + /// + /// + /// + public static string GetReprintInfo2(string barcode) + { + string res = ""; + try + { + if (!string.IsNullOrWhiteSpace(barcode)) + { + string sql = @" + SELECT ProductID, StockNo, ColorDes,(SELECT ProductName FROM tb_Product WHERE ProductID =(SELECT top 1 ProductID FROM tb_PaintBarCode WHERE OneBarCode = '" + barcode + "')) ProductName FROM tb_PaintBarCode WHERE OneBarCode = '" + barcode + "' "; + DataTable aa = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + if (aa != null && aa.Rows.Count > 0) + { + res = aa.Rows[0]["ColorDes"].ToString() + "，" + aa.Rows[0]["ProductName"].ToString(); + } + } + return res; + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return res; + } + } + + /// + /// 保存检验结果 + /// + /// + /// + public static int InsertInspect2(InspectModel model) + { + int res = 0; + try + { + string sql = @" INSERT INTO [dbo].[tb_InspectResult] + ( + [barcode] + ,[side] + ,[position] + ,[stationNo] + ,[workClass] + ,[inspectResult] + ,[damnPosition] + ,[defectID] + ,[reason] + ,[productInfo] + ,[productOption] + ,[createTime] + ,[InspectTimes] + ,[remark1] + ,[remark2] + ,[remark3] + ) + VALUES + ('" + model.barcode + @"' + ,'" + model.side + @"' + ,'" + model.position + @"' + ,'" + model.stationNo + @"' + ,'" + model.workClass + @"' + ,'" + model.inspectResult + @"' + ,'" + model.damnPosition + @"' + ,'" + model.defectID + @"' + ,'" + model.reason + @"' + ,'" + model.productInfo + @"' + ,'" + model.productOption + @"' + ,(select getdate()), '" + model.InspectTimes + @"' + ,'" + model.remark1 + @"' + ,'" + model.remark2 + @"' + ,'" + model.remark3 + @"' + ) "; + res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null); + LogHelper.WriteSysLogBase("[sql：]" + sql, MethodBase.GetCurrentMethod().Name); + return res; + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return res; + } + } + + public static string GetProductInfo2(string barcode) + { + string res = ""; + //string colorNo = ""; + //string colorQQNo = ""; + //string colorPRNo = ""; + string colorInfo = "", paintCode = "", paintID = ""; + string barCode1_1 = "", barCode1_2 = "", barCode1_3 = "", barCode1_4 = "", barCode1_5 = "", barCode1_6 = "", + barCode2_1 = "", barCode2_2 = "", barCode2_3 = "", barCode2_4 = "", barCode2_5 = "", barCode2_6 = ""; + string columnName = "", side = ""; + try + { + DataTable dt1 = GetLastResult(barcode); + if (dt1 != null && dt1.Rows.Count > 0) + { + colorInfo = dt1.Rows[0]["productInfo"].ToString() + "，" + dt1.Rows[0]["remark3"].ToString(); + } + else + { + #region 从老外系统获得颜色信息 + + string sql = @" + DECLARE @barcode varchar(30); + SET @barcode = '" + barcode + @"'; + SELECT paintcode, + LTrim(RTrim(Side1_Data1)) as Side1_Data1, + LTrim(RTrim(Side1_Data2)) as Side1_Data2, + LTrim(RTrim(Side1_Data3)) as Side1_Data3, + LTrim(RTrim(Side1_Data4)) as Side1_Data4, + LTrim(RTrim(Side1_Data5)) as Side1_Data5, + LTrim(RTrim(Side1_Data6)) as Side1_Data6, + LTrim(RTrim(Side2_Data1)) as Side2_Data1, + LTrim(RTrim(Side2_Data2)) as Side2_Data2, + LTrim(RTrim(Side2_Data3)) as Side2_Data3, + LTrim(RTrim(Side2_Data4)) as Side2_Data4, + LTrim(RTrim(Side2_Data5)) as Side2_Data5, + LTrim(RTrim(Side2_Data6)) as Side2_Data6 + FROM [dbo].[Skiddata_Unloading] + WHERE LTrim(RTrim(Side1_Data1)) = @barcode + OR LTrim(RTrim(Side1_Data2))= @barcode + OR LTrim(RTrim(Side1_Data3))= @barcode + OR LTrim(RTrim(Side1_Data4))= @barcode + OR LTrim(RTrim(Side1_Data5))= @barcode + OR LTrim(RTrim(Side1_Data6))= @barcode + OR LTrim(RTrim(Side2_Data1)) = @barcode + OR LTrim(RTrim(Side2_Data2))= @barcode + OR LTrim(RTrim(Side2_Data3))= @barcode + OR LTrim(RTrim(Side2_Data4))= @barcode + OR LTrim(RTrim(Side2_Data5))= @barcode + OR LTrim(RTrim(Side2_Data6))= @barcode + "; + string sqlConnString = ConfigurationManager.ConnectionStrings["SqlConnStringForeign"].ToString(); + //object aa = SqlHelper.ExecuteScalar(sqlConnString, CommandType.Text, sql, null); + DataTable dtColor = SqlHelper.GetDataDateTable(sqlConnString, CommandType.Text, sql, null); + + + if (dtColor != null && dtColor.Rows.Count > 0) + { + paintCode = dtColor.Rows[0]["paintcode"].ToString(); + } + + //根据颜色代码查颜色 + + if (!string.IsNullOrWhiteSpace(paintCode) && paintCode.ToLower() != "na") + { + DataTable dt = new DataTable(); + string sql_c = ""; + sql_c = @"select * from tb_PaintInfo where PaintCode='" + paintCode + @"'"; + + dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_c, null); + if (dt != null && dt.Rows.Count > 0) + { + //res = dt.Rows[0]["ColorName"].ToString(); + //colorInfo = dt.Rows[0]["Des"].ToString().Trim() + "，" + + // dt.Rows[0]["ColorCode"].ToString().Trim() + "，" + + // dt.Rows[0]["ColorNo"].ToString().Trim(); + //colorInfo = dt.Rows[0]["ColorName"].ToString(); + paintID = dt.Rows[0]["ID"].ToString(); + } + + string sql_1 = @"select Color from tb_PaintColorInfo where StockNo='" + barcode.Substring(0, 10) + @"' and PaintID='" + paintID + @"'"; + DataTable dt_1 = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_1, null); + if (dt_1 != null && dt_1.Rows.Count > 0) + { + colorInfo = dt_1.Rows[0]["Color"].ToString(); + } + } + + #endregion + + barcode = UniteBarCodeToOne(barcode); + + #region 根据条码查询产品信息 + + string stockNo = ""; + string batchNo = ""; + string partNo = ""; + + + Function.GetCode(barcode, out stockNo, out batchNo, out partNo); + + string productName = ""; + GetInfoByStockNo2(stockNo, out partNo, out productName); + + #endregion + + colorInfo = colorInfo + "，" + productName + "，" + paintID; + } + + res = colorInfo; + return res; + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return res; + } + } + public static string GetWorkClass2() + { + //bool classA = IsBetweenTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), "2019-06-12 08:00:00", "2019-06-12 20:00:00"); + bool classA = IsBetweenTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), DateTime.Now.ToString("yyyy-MM-dd") + " 07:45:00", DateTime.Now.ToString("yyyy-MM-dd") + " 19:45:00"); + if (classA) + { + return "A班"; + } + else + { + return "B班"; + } + } + + /// + /// 根据存货代码获得零件名称、颜色名称 + /// + /// + /// + /// + public static void GetInfoByStockNo2(string stockNo, out string partNo, out string partName) + { + partNo = ""; + partName = ""; + string sql = ""; + try + { + DataTable dt = new DataTable(); + if (!string.IsNullOrWhiteSpace(stockNo)) + { + sql = " select ProductName,PartNo from tb_Product where StockNo = '" + stockNo + @"' "; + dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + } + if (dt != null && dt.Rows.Count > 0) + { + partName = dt.Rows[0]["ProductName"].ToString(); + partNo = dt.Rows[0]["PartNo"].ToString(); + } + else + { + partName = ""; + partNo = ""; + } + LogHelper.WriteSysLogBase("[入参]：stockNo=" + stockNo + "; [出参：]partName=" + partName + "partName=" + partNo + ";[sql：] + sql", MethodBase.GetCurrentMethod().Name); + } + catch (Exception ex) + { + LogHelper.WriteLogManager(ex); + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + } + } public static DataTable GetColorByStockNo(string stockNo) { DataTable res = new DataTable(); diff --git a/WebService/Properties/Settings.Designer.cs b/WebService/Properties/Settings.Designer.cs index 3706bca..11adacc 100644 --- a/WebService/Properties/Settings.Designer.cs +++ b/WebService/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace WebService.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -26,7 +26,7 @@ namespace WebService.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] - [global::System.Configuration.DefaultSettingValueAttribute("http://10.60.101.2:88/JsonService.asmx")] + [global::System.Configuration.DefaultSettingValueAttribute("http://10.60.101.97:8018/JsonService.asmx")] public string WebService_WebReference_JsonService { get { return ((string)(this["WebService_WebReference_JsonService"])); diff --git a/WebService/Web References/WebReference/Reference.cs b/WebService/Web References/WebReference/Reference.cs index daa64f0..e68bf39 100644 --- a/WebService/Web References/WebReference/Reference.cs +++ b/WebService/Web References/WebReference/Reference.cs @@ -23,7 +23,7 @@ namespace WebService.WebReference { /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="JsonServiceSoap", Namespace="http://tempuri.org/")] @@ -31,6 +31,14 @@ namespace WebService.WebReference { private System.Threading.SendOrPostCallback GetVerOperationCompleted; + private System.Threading.SendOrPostCallback NewLoginOperationCompleted; + + private System.Threading.SendOrPostCallback AddTmpOperationCompleted; + + private System.Threading.SendOrPostCallback ChangeBkOperationCompleted; + + private System.Threading.SendOrPostCallback WriteLogOperationCompleted; + private System.Threading.SendOrPostCallback LoginOperationCompleted; private System.Threading.SendOrPostCallback LogoutOperationCompleted; @@ -49,10 +57,22 @@ namespace WebService.WebReference { private System.Threading.SendOrPostCallback AddDataOperationCompleted; + private System.Threading.SendOrPostCallback IsExistLocationOperationCompleted; + + private System.Threading.SendOrPostCallback IsExistBarcodeOperationCompleted; + private System.Threading.SendOrPostCallback UpdateDataOperationCompleted; + private System.Threading.SendOrPostCallback SaveSeqencingOperationCompleted; + + private System.Threading.SendOrPostCallback AddMesBenzInsertOperationCompleted; + + private System.Threading.SendOrPostCallback GetLuDataByMesOperationCompleted; + private System.Threading.SendOrPostCallback AddMutualDataOperationCompleted; + private System.Threading.SendOrPostCallback AddReturnDataOperationCompleted; + private System.Threading.SendOrPostCallback ReceiveProductsOperationCompleted; private bool useDefaultCredentialsSetExplicitly; @@ -96,6 +116,18 @@ namespace WebService.WebReference { /// public event GetVerCompletedEventHandler GetVerCompleted; + /// + public event NewLoginCompletedEventHandler NewLoginCompleted; + + /// + public event AddTmpCompletedEventHandler AddTmpCompleted; + + /// + public event ChangeBkCompletedEventHandler ChangeBkCompleted; + + /// + public event WriteLogCompletedEventHandler WriteLogCompleted; + /// public event LoginCompletedEventHandler LoginCompleted; @@ -123,12 +155,30 @@ namespace WebService.WebReference { /// public event AddDataCompletedEventHandler AddDataCompleted; + /// + public event IsExistLocationCompletedEventHandler IsExistLocationCompleted; + + /// + public event IsExistBarcodeCompletedEventHandler IsExistBarcodeCompleted; + /// public event UpdateDataCompletedEventHandler UpdateDataCompleted; + /// + public event SaveSeqencingCompletedEventHandler SaveSeqencingCompleted; + + /// + public event AddMesBenzInsertCompletedEventHandler AddMesBenzInsertCompleted; + + /// + public event GetLuDataByMesCompletedEventHandler GetLuDataByMesCompleted; + /// public event AddMutualDataCompletedEventHandler AddMutualDataCompleted; + /// + public event AddReturnDataCompletedEventHandler AddReturnDataCompleted; + /// public event ReceiveProductsCompletedEventHandler ReceiveProductsCompleted; @@ -159,6 +209,136 @@ namespace WebService.WebReference { } } + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/NewLogin", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string NewLogin(string operCode, string password, string mac) { + object[] results = this.Invoke("NewLogin", new object[] { + operCode, + password, + mac}); + return ((string)(results[0])); + } + + /// + public void NewLoginAsync(string operCode, string password, string mac) { + this.NewLoginAsync(operCode, password, mac, null); + } + + /// + public void NewLoginAsync(string operCode, string password, string mac, object userState) { + if ((this.NewLoginOperationCompleted == null)) { + this.NewLoginOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNewLoginOperationCompleted); + } + this.InvokeAsync("NewLogin", new object[] { + operCode, + password, + mac}, this.NewLoginOperationCompleted, userState); + } + + private void OnNewLoginOperationCompleted(object arg) { + if ((this.NewLoginCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.NewLoginCompleted(this, new NewLoginCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/AddTmp", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string AddTmp(string barcode, string partcode) { + object[] results = this.Invoke("AddTmp", new object[] { + barcode, + partcode}); + return ((string)(results[0])); + } + + /// + public void AddTmpAsync(string barcode, string partcode) { + this.AddTmpAsync(barcode, partcode, null); + } + + /// + public void AddTmpAsync(string barcode, string partcode, object userState) { + if ((this.AddTmpOperationCompleted == null)) { + this.AddTmpOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddTmpOperationCompleted); + } + this.InvokeAsync("AddTmp", new object[] { + barcode, + partcode}, this.AddTmpOperationCompleted, userState); + } + + private void OnAddTmpOperationCompleted(object arg) { + if ((this.AddTmpCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddTmpCompleted(this, new AddTmpCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/ChangeBk", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string ChangeBk(string bkCode, string password, string operCode) { + object[] results = this.Invoke("ChangeBk", new object[] { + bkCode, + password, + operCode}); + return ((string)(results[0])); + } + + /// + public void ChangeBkAsync(string bkCode, string password, string operCode) { + this.ChangeBkAsync(bkCode, password, operCode, null); + } + + /// + public void ChangeBkAsync(string bkCode, string password, string operCode, object userState) { + if ((this.ChangeBkOperationCompleted == null)) { + this.ChangeBkOperationCompleted = new System.Threading.SendOrPostCallback(this.OnChangeBkOperationCompleted); + } + this.InvokeAsync("ChangeBk", new object[] { + bkCode, + password, + operCode}, this.ChangeBkOperationCompleted, userState); + } + + private void OnChangeBkOperationCompleted(object arg) { + if ((this.ChangeBkCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ChangeBkCompleted(this, new ChangeBkCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/WriteLog", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string WriteLog(string operCode, string function, string message) { + object[] results = this.Invoke("WriteLog", new object[] { + operCode, + function, + message}); + return ((string)(results[0])); + } + + /// + public void WriteLogAsync(string operCode, string function, string message) { + this.WriteLogAsync(operCode, function, message, null); + } + + /// + public void WriteLogAsync(string operCode, string function, string message, object userState) { + if ((this.WriteLogOperationCompleted == null)) { + this.WriteLogOperationCompleted = new System.Threading.SendOrPostCallback(this.OnWriteLogOperationCompleted); + } + this.InvokeAsync("WriteLog", new object[] { + operCode, + function, + message}, this.WriteLogOperationCompleted, userState); + } + + private void OnWriteLogOperationCompleted(object arg) { + if ((this.WriteLogCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.WriteLogCompleted(this, new WriteLogCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/Login", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public string Login(string operCode, string password) { @@ -426,6 +606,64 @@ namespace WebService.WebReference { } } + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/IsExistLocation", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string IsExistLocation(string ccode) { + object[] results = this.Invoke("IsExistLocation", new object[] { + ccode}); + return ((string)(results[0])); + } + + /// + public void IsExistLocationAsync(string ccode) { + this.IsExistLocationAsync(ccode, null); + } + + /// + public void IsExistLocationAsync(string ccode, object userState) { + if ((this.IsExistLocationOperationCompleted == null)) { + this.IsExistLocationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnIsExistLocationOperationCompleted); + } + this.InvokeAsync("IsExistLocation", new object[] { + ccode}, this.IsExistLocationOperationCompleted, userState); + } + + private void OnIsExistLocationOperationCompleted(object arg) { + if ((this.IsExistLocationCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.IsExistLocationCompleted(this, new IsExistLocationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/IsExistBarcode", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string IsExistBarcode(string bcode) { + object[] results = this.Invoke("IsExistBarcode", new object[] { + bcode}); + return ((string)(results[0])); + } + + /// + public void IsExistBarcodeAsync(string bcode) { + this.IsExistBarcodeAsync(bcode, null); + } + + /// + public void IsExistBarcodeAsync(string bcode, object userState) { + if ((this.IsExistBarcodeOperationCompleted == null)) { + this.IsExistBarcodeOperationCompleted = new System.Threading.SendOrPostCallback(this.OnIsExistBarcodeOperationCompleted); + } + this.InvokeAsync("IsExistBarcode", new object[] { + bcode}, this.IsExistBarcodeOperationCompleted, userState); + } + + private void OnIsExistBarcodeOperationCompleted(object arg) { + if ((this.IsExistBarcodeCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.IsExistBarcodeCompleted(this, new IsExistBarcodeCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/UpdateData", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public string UpdateData(string jsonParam, string strJson) { @@ -457,6 +695,109 @@ namespace WebService.WebReference { } } + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SaveSeqencing", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string SaveSeqencing(string strJson) { + object[] results = this.Invoke("SaveSeqencing", new object[] { + strJson}); + return ((string)(results[0])); + } + + /// + public void SaveSeqencingAsync(string strJson) { + this.SaveSeqencingAsync(strJson, null); + } + + /// + public void SaveSeqencingAsync(string strJson, object userState) { + if ((this.SaveSeqencingOperationCompleted == null)) { + this.SaveSeqencingOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveSeqencingOperationCompleted); + } + this.InvokeAsync("SaveSeqencing", new object[] { + strJson}, this.SaveSeqencingOperationCompleted, userState); + } + + private void OnSaveSeqencingOperationCompleted(object arg) { + if ((this.SaveSeqencingCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SaveSeqencingCompleted(this, new SaveSeqencingCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/AddMesBenzInsert", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string AddMesBenzInsert(string hannpenLoc, string pPartType, string productionNumber, string pInsertType, string pInsertReason, string pUserID, string pUserName, string fromType) { + object[] results = this.Invoke("AddMesBenzInsert", new object[] { + hannpenLoc, + pPartType, + productionNumber, + pInsertType, + pInsertReason, + pUserID, + pUserName, + fromType}); + return ((string)(results[0])); + } + + /// + public void AddMesBenzInsertAsync(string hannpenLoc, string pPartType, string productionNumber, string pInsertType, string pInsertReason, string pUserID, string pUserName, string fromType) { + this.AddMesBenzInsertAsync(hannpenLoc, pPartType, productionNumber, pInsertType, pInsertReason, pUserID, pUserName, fromType, null); + } + + /// + public void AddMesBenzInsertAsync(string hannpenLoc, string pPartType, string productionNumber, string pInsertType, string pInsertReason, string pUserID, string pUserName, string fromType, object userState) { + if ((this.AddMesBenzInsertOperationCompleted == null)) { + this.AddMesBenzInsertOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddMesBenzInsertOperationCompleted); + } + this.InvokeAsync("AddMesBenzInsert", new object[] { + hannpenLoc, + pPartType, + productionNumber, + pInsertType, + pInsertReason, + pUserID, + pUserName, + fromType}, this.AddMesBenzInsertOperationCompleted, userState); + } + + private void OnAddMesBenzInsertOperationCompleted(object arg) { + if ((this.AddMesBenzInsertCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddMesBenzInsertCompleted(this, new AddMesBenzInsertCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/GetLuDataByMes", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string GetLuDataByMes(string productionNumber, string partType) { + object[] results = this.Invoke("GetLuDataByMes", new object[] { + productionNumber, + partType}); + return ((string)(results[0])); + } + + /// + public void GetLuDataByMesAsync(string productionNumber, string partType) { + this.GetLuDataByMesAsync(productionNumber, partType, null); + } + + /// + public void GetLuDataByMesAsync(string productionNumber, string partType, object userState) { + if ((this.GetLuDataByMesOperationCompleted == null)) { + this.GetLuDataByMesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetLuDataByMesOperationCompleted); + } + this.InvokeAsync("GetLuDataByMes", new object[] { + productionNumber, + partType}, this.GetLuDataByMesOperationCompleted, userState); + } + + private void OnGetLuDataByMesOperationCompleted(object arg) { + if ((this.GetLuDataByMesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetLuDataByMesCompleted(this, new GetLuDataByMesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/AddMutualData", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public string AddMutualData(string jsonParam, string strJson) { @@ -488,6 +829,37 @@ namespace WebService.WebReference { } } + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/AddReturnData", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public string AddReturnData(string jsonParam, string strJson) { + object[] results = this.Invoke("AddReturnData", new object[] { + jsonParam, + strJson}); + return ((string)(results[0])); + } + + /// + public void AddReturnDataAsync(string jsonParam, string strJson) { + this.AddReturnDataAsync(jsonParam, strJson, null); + } + + /// + public void AddReturnDataAsync(string jsonParam, string strJson, object userState) { + if ((this.AddReturnDataOperationCompleted == null)) { + this.AddReturnDataOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddReturnDataOperationCompleted); + } + this.InvokeAsync("AddReturnData", new object[] { + jsonParam, + strJson}, this.AddReturnDataOperationCompleted, userState); + } + + private void OnAddReturnDataOperationCompleted(object arg) { + if ((this.AddReturnDataCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddReturnDataCompleted(this, new AddReturnDataCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + /// [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/ReceiveProducts", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] public string ReceiveProducts(string jsonParam) { @@ -537,11 +909,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void GetVerCompletedEventHandler(object sender, GetVerCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetVerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -563,11 +935,115 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void NewLoginCompletedEventHandler(object sender, NewLoginCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class NewLoginCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal NewLoginCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void AddTmpCompletedEventHandler(object sender, AddTmpCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddTmpCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddTmpCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void ChangeBkCompletedEventHandler(object sender, ChangeBkCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ChangeBkCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ChangeBkCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void WriteLogCompletedEventHandler(object sender, WriteLogCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class WriteLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal WriteLogCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void LoginCompletedEventHandler(object sender, LoginCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class LoginCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -589,11 +1065,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void LogoutCompletedEventHandler(object sender, LogoutCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class LogoutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -615,11 +1091,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void ModifyPasswordCompletedEventHandler(object sender, ModifyPasswordCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ModifyPasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -641,11 +1117,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void GetServerTimeCompletedEventHandler(object sender, GetServerTimeCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetServerTimeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -667,11 +1143,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void DecryptCompletedEventHandler(object sender, DecryptCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class DecryptCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -693,11 +1169,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void EncryptCompletedEventHandler(object sender, EncryptCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class EncryptCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -719,11 +1195,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void GetCountCompletedEventHandler(object sender, GetCountCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetCountCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -745,11 +1221,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void GetDataCompletedEventHandler(object sender, GetDataCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class GetDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -771,11 +1247,11 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void AddDataCompletedEventHandler(object sender, AddDataCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class AddDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -797,11 +1273,63 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void IsExistLocationCompletedEventHandler(object sender, IsExistLocationCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class IsExistLocationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal IsExistLocationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void IsExistBarcodeCompletedEventHandler(object sender, IsExistBarcodeCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class IsExistBarcodeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal IsExistBarcodeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void UpdateDataCompletedEventHandler(object sender, UpdateDataCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class UpdateDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -823,11 +1351,89 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void SaveSeqencingCompletedEventHandler(object sender, SaveSeqencingCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SaveSeqencingCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SaveSeqencingCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void AddMesBenzInsertCompletedEventHandler(object sender, AddMesBenzInsertCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddMesBenzInsertCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddMesBenzInsertCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void GetLuDataByMesCompletedEventHandler(object sender, GetLuDataByMesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetLuDataByMesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetLuDataByMesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void AddMutualDataCompletedEventHandler(object sender, AddMutualDataCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class AddMutualDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -849,11 +1455,37 @@ namespace WebService.WebReference { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + public delegate void AddReturnDataCompletedEventHandler(object sender, AddReturnDataCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddReturnDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddReturnDataCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public string Result { + get { + this.RaiseExceptionIfNecessary(); + return ((string)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] public delegate void ReceiveProductsCompletedEventHandler(object sender, ReceiveProductsCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3056.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class ReceiveProductsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/WebService/WebService.csproj b/WebService/WebService.csproj index da27259..b40b104 100644 --- a/WebService/WebService.csproj +++ b/WebService/WebService.csproj @@ -81,10 +81,10 @@ - + MSDiscoCodeGenerator Reference.cs - + Web.config Always @@ -170,10 +170,10 @@ - + Dynamic Web References\WebReference\ - http://10.60.101.2:88/JsonService.asmx + http://10.60.101.97:8018/JsonService.asmx