~tjx/GsMesClient.git

			@@ -408,7 +408,9 @@
			// btnGood
			//
			this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
			this.btnGood.Appearance.Font = new System.Drawing.Font("Tahoma", 20F);
			this.btnGood.Appearance.Options.UseBackColor = true;
			this.btnGood.Appearance.Options.UseFont = true;
			this.btnGood.Location = new System.Drawing.Point(416, 116);
			this.btnGood.Name = "btnGood";
			this.btnGood.Size = new System.Drawing.Size(198, 96);
			@@ -419,7 +421,9 @@
			// btnBad
			//
			this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
			this.btnBad.Appearance.Font = new System.Drawing.Font("Tahoma", 20F);
			this.btnBad.Appearance.Options.UseBackColor = true;
			this.btnBad.Appearance.Options.UseFont = true;
			this.btnBad.Location = new System.Drawing.Point(618, 116);
			this.btnBad.Name = "btnBad";
			this.btnBad.Size = new System.Drawing.Size(198, 96);
			@@ -691,7 +695,9 @@
			// simpleButton7
			//
			this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			this.simpleButton7.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
			this.simpleButton7.Appearance.Options.UseBackColor = true;
			this.simpleButton7.Appearance.Options.UseFont = true;
			this.simpleButton7.Location = new System.Drawing.Point(122, 154);
			this.simpleButton7.Name = "simpleButton7";
			this.simpleButton7.Size = new System.Drawing.Size(86, 56);
			@@ -701,7 +707,9 @@
			// simpleButton6
			//
			this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			this.simpleButton6.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
			this.simpleButton6.Appearance.Options.UseBackColor = true;
			this.simpleButton6.Appearance.Options.UseFont = true;
			this.simpleButton6.Location = new System.Drawing.Point(425, 154);
			this.simpleButton6.Name = "simpleButton6";
			this.simpleButton6.Size = new System.Drawing.Size(86, 56);
			@@ -711,7 +719,9 @@
			// simpleButton5
			//
			this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			this.simpleButton5.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
			this.simpleButton5.Appearance.Options.UseBackColor = true;
			this.simpleButton5.Appearance.Options.UseFont = true;
			this.simpleButton5.Location = new System.Drawing.Point(223, 154);
			this.simpleButton5.Name = "simpleButton5";
			this.simpleButton5.Size = new System.Drawing.Size(86, 56);
			@@ -721,7 +731,9 @@
			// simpleButton4
			//
			this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			this.simpleButton4.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
			this.simpleButton4.Appearance.Options.UseBackColor = true;
			this.simpleButton4.Appearance.Options.UseFont = true;
			this.simpleButton4.Location = new System.Drawing.Point(324, 154);
			this.simpleButton4.Name = "simpleButton4";
			this.simpleButton4.Size = new System.Drawing.Size(86, 56);
			@@ -731,7 +743,9 @@
			// simpleButton3
			//
			this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			this.simpleButton3.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
			this.simpleButton3.Appearance.Options.UseBackColor = true;
			this.simpleButton3.Appearance.Options.UseFont = true;
			this.simpleButton3.Location = new System.Drawing.Point(21, 154);
			this.simpleButton3.Name = "simpleButton3";
			this.simpleButton3.Size = new System.Drawing.Size(86, 56);
			@@ -760,16 +774,17 @@
			// lbSum4
			//
			this.lbSum4.AutoSize = true;
			this.lbSum4.Location = new System.Drawing.Point(45, 54);
			this.lbSum4.Font = new System.Drawing.Font("Tahoma", 22F);
			this.lbSum4.Location = new System.Drawing.Point(30, 41);
			this.lbSum4.Name = "lbSum4";
			this.lbSum4.Size = new System.Drawing.Size(16, 18);
			this.lbSum4.Size = new System.Drawing.Size(40, 45);
			this.lbSum4.TabIndex = 1;
			this.lbSum4.Text = "0";
			//
			// label6
			//
			this.label6.AutoSize = true;
			this.label6.Location = new System.Drawing.Point(18, 10);
			this.label6.Location = new System.Drawing.Point(16, 10);
			this.label6.Name = "label6";
			this.label6.Size = new System.Drawing.Size(68, 18);
			this.label6.TabIndex = 0;
			@@ -789,16 +804,17 @@
			// lbSum3
			//
			this.lbSum3.AutoSize = true;
			this.lbSum3.Location = new System.Drawing.Point(45, 54);
			this.lbSum3.Font = new System.Drawing.Font("Tahoma", 22F);
			this.lbSum3.Location = new System.Drawing.Point(30, 41);
			this.lbSum3.Name = "lbSum3";
			this.lbSum3.Size = new System.Drawing.Size(16, 18);
			this.lbSum3.Size = new System.Drawing.Size(40, 45);
			this.lbSum3.TabIndex = 1;
			this.lbSum3.Text = "0";
			//
			// label4
			//
			this.label4.AutoSize = true;
			this.label4.Location = new System.Drawing.Point(18, 10);
			this.label4.Location = new System.Drawing.Point(16, 10);
			this.label4.Name = "label4";
			this.label4.Size = new System.Drawing.Size(68, 18);
			this.label4.TabIndex = 0;
			@@ -818,9 +834,10 @@
			// lbSum2
			//
			this.lbSum2.AutoSize = true;
			this.lbSum2.Location = new System.Drawing.Point(45, 54);
			this.lbSum2.Font = new System.Drawing.Font("Tahoma", 22F);
			this.lbSum2.Location = new System.Drawing.Point(34, 41);
			this.lbSum2.Name = "lbSum2";
			this.lbSum2.Size = new System.Drawing.Size(16, 18);
			this.lbSum2.Size = new System.Drawing.Size(40, 45);
			this.lbSum2.TabIndex = 1;
			this.lbSum2.Text = "0";
			//
			@@ -847,16 +864,17 @@
			// lbSum1
			//
			this.lbSum1.AutoSize = true;
			this.lbSum1.Location = new System.Drawing.Point(45, 54);
			this.lbSum1.Font = new System.Drawing.Font("Tahoma", 22F);
			this.lbSum1.Location = new System.Drawing.Point(31, 41);
			this.lbSum1.Name = "lbSum1";
			this.lbSum1.Size = new System.Drawing.Size(16, 18);
			this.lbSum1.Size = new System.Drawing.Size(40, 45);
			this.lbSum1.TabIndex = 1;
			this.lbSum1.Text = "0";
			//
			// label1
			//
			this.label1.AutoSize = true;
			this.label1.Location = new System.Drawing.Point(18, 10);
			this.label1.Location = new System.Drawing.Point(17, 10);
			this.label1.Name = "label1";
			this.label1.Size = new System.Drawing.Size(68, 18);
			this.label1.TabIndex = 0;
			@@ -879,7 +897,7 @@
			this.tabMxPage1.Controls.Add(this.gcMx1);
			this.tabMxPage1.Name = "tabMxPage1";
			this.tabMxPage1.Size = new System.Drawing.Size(1365, 346);
			this.tabMxPage1.Text = "良品名称";
			this.tabMxPage1.Text = "良品明细";
			//
			// gcMx1
			//
			@@ -1223,7 +1241,7 @@
			//
			// gridColumn20
			//
			this.gridColumn20.Caption = "结果";
			this.gridColumn20.Caption = "维修结果";
			this.gridColumn20.FieldName = "checkResult";
			this.gridColumn20.MinWidth = 25;
			this.gridColumn20.Name = "gridColumn20";
			@@ -1256,7 +1274,7 @@
			//
			// gridColumn23
			//
			this.gridColumn23.Caption = "不良项目";
			this.gridColumn23.Caption = "不良原因";
			this.gridColumn23.FieldName = "badReson";
			this.gridColumn23.MinWidth = 25;
			this.gridColumn23.Name = "gridColumn23";
			@@ -1270,8 +1288,6 @@
			this.gridColumn25.MinWidth = 25;
			this.gridColumn25.Name = "gridColumn25";
			this.gridColumn25.OptionsColumn.ReadOnly = true;
			this.gridColumn25.Visible = true;
			this.gridColumn25.VisibleIndex = 12;
			this.gridColumn25.Width = 94;
			//
			// Frm_Work01