~tjx/GsMesClient.git

			@@ -267,7 +267,7 @@
			this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.layoutMx1.Location = new System.Drawing.Point(0, 0);
			this.layoutMx1.Name = "layoutMx1";
			this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
			this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(544, 408, 812, 500);
			this.layoutMx1.Root = this.Root;
			this.layoutMx1.Size = new System.Drawing.Size(828, 229);
			this.layoutMx1.TabIndex = 0;
			@@ -277,6 +277,7 @@
			//
			this.txt_gdbh.Location = new System.Drawing.Point(111, 12);
			this.txt_gdbh.Name = "txt_gdbh";
			this.txt_gdbh.Properties.Appearance.Options.UseFont = true;
			this.txt_gdbh.Properties.ReadOnly = true;
			this.txt_gdbh.Size = new System.Drawing.Size(99, 24);
			this.txt_gdbh.StyleController = this.layoutMx1;
			@@ -409,6 +410,7 @@
			//
			this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
			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);
			@@ -420,6 +422,7 @@
			//
			this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
			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);
			@@ -460,6 +463,8 @@
			this.layDianJian});
			this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
			this.Root.Name = "Root";
			this.Root.OptionsPrint.AppearanceGroupCaption.Options.UseFont = true;
			this.Root.OptionsPrint.AppearanceItem.Options.UseFont = true;
			columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition1.Width = 100D;
			columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
			@@ -497,9 +502,12 @@
			//
			// layoutControlItem1
			//
			this.layoutControlItem1.AppearanceItemCaption.Options.UseFont = true;
			this.layoutControlItem1.AppearanceItemCaptionDisabled.Options.UseFont = true;
			this.layoutControlItem1.Control = this.txt_gdbh;
			this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
			this.layoutControlItem1.Name = "layoutControlItem1";
			this.layoutControlItem1.OptionsPrint.AppearanceItem.Options.UseFont = true;
			this.layoutControlItem1.Size = new System.Drawing.Size(202, 34);
			this.layoutControlItem1.Text = "工单编号";
			this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
			@@ -692,6 +700,7 @@
			//
			this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			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);
			@@ -702,6 +711,7 @@
			//
			this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			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);
			@@ -712,6 +722,7 @@
			//
			this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			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);
			@@ -722,6 +733,7 @@
			//
			this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			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);
			@@ -732,6 +744,7 @@
			//
			this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			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);
			@@ -883,7 +896,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
			//
			@@ -931,39 +944,34 @@
			//
			// gvMx2status
			//
			this.gvMx2status.AppearanceCell.Options.UseFont = true;
			this.gvMx2status.Caption = "工单编号";
			this.gvMx2status.FieldName = "gdbh";
			this.gvMx2status.MinWidth = 10;
			this.gvMx2status.Name = "gvMx2status";
			this.gvMx2status.OptionsColumn.ReadOnly = true;
			this.gvMx2status.Tag = "query_a.status";
			this.gvMx2status.Visible = true;
			this.gvMx2status.VisibleIndex = 0;
			this.gvMx2status.Width = 50;
			//
			// gvMx2pbillNo
			//
			this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
			this.gvMx2pbillNo.Caption = "追溯码";
			this.gvMx2pbillNo.FieldName = "barCode";
			this.gvMx2pbillNo.Name = "gvMx2pbillNo";
			this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
			this.gvMx2pbillNo.Tag = "query_a.pbill_no";
			this.gvMx2pbillNo.Visible = true;
			this.gvMx2pbillNo.VisibleIndex = 1;
			this.gvMx2pbillNo.VisibleIndex = 0;
			this.gvMx2pbillNo.Width = 94;
			//
			// gvMx2itemNo
			//
			this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
			this.gvMx2itemNo.Caption = "物料编码";
			this.gvMx2itemNo.FieldName = "itemNo";
			this.gvMx2itemNo.Name = "gvMx2itemNo";
			this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
			this.gvMx2itemNo.Tag = "query_a.item_no";
			this.gvMx2itemNo.Visible = true;
			this.gvMx2itemNo.VisibleIndex = 2;
			this.gvMx2itemNo.VisibleIndex = 1;
			this.gvMx2itemNo.Width = 94;
			//
			// gridColumn5
			@@ -972,8 +980,6 @@
			this.gridColumn5.FieldName = "itemName";
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.OptionsColumn.ReadOnly = true;
			this.gridColumn5.Visible = true;
			this.gridColumn5.VisibleIndex = 3;
			this.gridColumn5.Width = 94;
			//
			// gridColumn6
			@@ -992,19 +998,18 @@
			this.gridColumn3.Name = "gridColumn3";
			this.gridColumn3.OptionsColumn.ReadOnly = true;
			this.gridColumn3.Visible = true;
			this.gridColumn3.VisibleIndex = 5;
			this.gridColumn3.VisibleIndex = 3;
			this.gridColumn3.Width = 94;
			//
			// gvMx2tlQty
			//
			this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
			this.gvMx2tlQty.Caption = "单位";
			this.gvMx2tlQty.FieldName = "dwName";
			this.gvMx2tlQty.Name = "gvMx2tlQty";
			this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
			this.gvMx2tlQty.Tag = "query_a.tl_qty";
			this.gvMx2tlQty.Visible = true;
			this.gvMx2tlQty.VisibleIndex = 4;
			this.gvMx2tlQty.VisibleIndex = 2;
			this.gvMx2tlQty.Width = 94;
			//
			// gridColumn2
			@@ -1015,7 +1020,7 @@
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.OptionsColumn.ReadOnly = true;
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 6;
			this.gridColumn2.VisibleIndex = 4;
			this.gridColumn2.Width = 94;
			//
			// gridColumn1
			@@ -1035,7 +1040,7 @@
			this.gridColumn4.Name = "gridColumn4";
			this.gridColumn4.OptionsColumn.ReadOnly = true;
			this.gridColumn4.Visible = true;
			this.gridColumn4.VisibleIndex = 7;
			this.gridColumn4.VisibleIndex = 5;
			this.gridColumn4.Width = 94;
			//
			// gridColumn14
			@@ -1046,7 +1051,7 @@
			this.gridColumn14.Name = "gridColumn14";
			this.gridColumn14.OptionsColumn.ReadOnly = true;
			this.gridColumn14.Visible = true;
			this.gridColumn14.VisibleIndex = 8;
			this.gridColumn14.VisibleIndex = 6;
			this.gridColumn14.Width = 94;
			//
			// gridColumn15
			@@ -1057,7 +1062,7 @@
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.OptionsColumn.ReadOnly = true;
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 9;
			this.gridColumn15.VisibleIndex = 7;
			this.gridColumn15.Width = 94;
			//
			// gridColumn24
			@@ -1068,7 +1073,7 @@
			this.gridColumn24.Name = "gridColumn24";
			this.gridColumn24.OptionsColumn.ReadOnly = true;
			this.gridColumn24.Visible = true;
			this.gridColumn24.VisibleIndex = 10;
			this.gridColumn24.VisibleIndex = 8;
			this.gridColumn24.Width = 94;
			//
			// tabMxPage2
			@@ -1125,7 +1130,6 @@
			//
			// gridColumn8
			//
			this.gridColumn8.AppearanceCell.Options.UseFont = true;
			this.gridColumn8.Caption = "工单编号";
			this.gridColumn8.FieldName = "gdbh";
			this.gridColumn8.MinWidth = 10;
			@@ -1138,7 +1142,6 @@
			//
			// gridColumn9
			//
			this.gridColumn9.AppearanceCell.Options.UseFont = true;
			this.gridColumn9.Caption = "追溯码";
			this.gridColumn9.FieldName = "barCode";
			this.gridColumn9.Name = "gridColumn9";
			@@ -1150,7 +1153,6 @@
			//
			// gridColumn10
			//
			this.gridColumn10.AppearanceCell.Options.UseFont = true;
			this.gridColumn10.Caption = "物料编码";
			this.gridColumn10.FieldName = "itemNo";
			this.gridColumn10.Name = "gridColumn10";
			@@ -1193,7 +1195,6 @@
			//
			// gridColumn17
			//
			this.gridColumn17.AppearanceCell.Options.UseFont = true;
			this.gridColumn17.Caption = "单位";
			this.gridColumn17.FieldName = "dwName";
			this.gridColumn17.Name = "gridColumn17";
			@@ -1227,7 +1228,7 @@
			//
			// gridColumn20
			//
			this.gridColumn20.Caption = "结果";
			this.gridColumn20.Caption = "维修结果";
			this.gridColumn20.FieldName = "checkResult";
			this.gridColumn20.MinWidth = 25;
			this.gridColumn20.Name = "gridColumn20";
			@@ -1260,7 +1261,7 @@
			//
			// gridColumn23
			//
			this.gridColumn23.Caption = "不良项目";
			this.gridColumn23.Caption = "不良原因";
			this.gridColumn23.FieldName = "badReson";
			this.gridColumn23.MinWidth = 25;
			this.gridColumn23.Name = "gridColumn23";
			@@ -1274,8 +1275,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