~tjx/GsMesClient.git

			@@ -1087,7 +1087,7 @@
			// gvMx1returnFlag
			//
			this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
			this.gvMx1returnFlag.Caption = "退货标识";
			this.gvMx1returnFlag.Caption = "退货";
			this.gvMx1returnFlag.FieldName = "returnFlag";
			this.gvMx1returnFlag.MinWidth = 25;
			this.gvMx1returnFlag.Name = "gvMx1returnFlag";
			@@ -1096,7 +1096,7 @@
			this.gvMx1returnFlag.UnboundDataType = typeof(bool);
			this.gvMx1returnFlag.Visible = true;
			this.gvMx1returnFlag.VisibleIndex = 0;
			this.gvMx1returnFlag.Width = 50;
			this.gvMx1returnFlag.Width = 26;
			//
			// gvMx1urgentFlag
			//
			@@ -1105,7 +1105,7 @@
			this.gvMx1urgentFlag.AppearanceCell.Options.UseForeColor = true;
			this.gvMx1urgentFlag.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
			this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
			this.gvMx1urgentFlag.Caption = "急料标识";
			this.gvMx1urgentFlag.Caption = "急料";
			this.gvMx1urgentFlag.FieldName = "urgentFlag";
			this.gvMx1urgentFlag.MinWidth = 25;
			this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
			@@ -1113,7 +1113,7 @@
			this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
			this.gvMx1urgentFlag.Visible = true;
			this.gvMx1urgentFlag.VisibleIndex = 1;
			this.gvMx1urgentFlag.Width = 50;
			this.gvMx1urgentFlag.Width = 25;
			//
			// gvMx1isdepsIn
			//
			@@ -1138,7 +1138,7 @@
			this.gvMx1checkStates.Tag = "query_a.check_states";
			this.gvMx1checkStates.Visible = true;
			this.gvMx1checkStates.VisibleIndex = 2;
			this.gvMx1checkStates.Width = 90;
			this.gvMx1checkStates.Width = 48;
			//
			// gvMx1checkRes
			//
			@@ -1151,7 +1151,7 @@
			this.gvMx1checkRes.Tag = "query_a.check_res";
			this.gvMx1checkRes.Visible = true;
			this.gvMx1checkRes.VisibleIndex = 3;
			this.gvMx1checkRes.Width = 90;
			this.gvMx1checkRes.Width = 48;
			//
			// gvMx1ebeln
			//
			@@ -1174,7 +1174,7 @@
			this.gridColumn8.Name = "gridColumn8";
			this.gridColumn8.Visible = true;
			this.gridColumn8.VisibleIndex = 5;
			this.gridColumn8.Width = 70;
			this.gridColumn8.Width = 37;
			//
			// gvMx1boardStyle
			//
			@@ -1187,7 +1187,7 @@
			this.gvMx1boardStyle.Tag = "query_a.board_style";
			this.gvMx1boardStyle.Visible = true;
			this.gvMx1boardStyle.VisibleIndex = 6;
			this.gvMx1boardStyle.Width = 180;
			this.gvMx1boardStyle.Width = 96;
			//
			// gvMx1ebelnQty
			//
			@@ -1200,7 +1200,7 @@
			this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
			this.gvMx1ebelnQty.Visible = true;
			this.gvMx1ebelnQty.VisibleIndex = 7;
			this.gvMx1ebelnQty.Width = 80;
			this.gvMx1ebelnQty.Width = 42;
			//
			// gvMx1subQty
			//
			@@ -1213,7 +1213,7 @@
			this.gvMx1subQty.Tag = "query_a.sub_qty";
			this.gvMx1subQty.Visible = true;
			this.gvMx1subQty.VisibleIndex = 9;
			this.gvMx1subQty.Width = 80;
			this.gvMx1subQty.Width = 42;
			//
			// gvMx1quantity
			//
			@@ -1229,7 +1229,7 @@
			this.gvMx1quantity.Tag = "yz_quantity_0_edit";
			this.gvMx1quantity.Visible = true;
			this.gvMx1quantity.VisibleIndex = 10;
			this.gvMx1quantity.Width = 80;
			this.gvMx1quantity.Width = 42;
			//
			// gvMx1memo
			//
			@@ -1246,7 +1246,7 @@
			this.gvMx1memo.Tag = "edit";
			this.gvMx1memo.Visible = true;
			this.gvMx1memo.VisibleIndex = 11;
			this.gvMx1memo.Width = 180;
			this.gvMx1memo.Width = 96;
			//
			// gvMx1okRkqty
			//
			@@ -1259,7 +1259,7 @@
			this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
			this.gvMx1okRkqty.Visible = true;
			this.gvMx1okRkqty.VisibleIndex = 8;
			this.gvMx1okRkqty.Width = 80;
			this.gvMx1okRkqty.Width = 42;
			//
			// gvMx1checkDate
			//
			@@ -1290,7 +1290,7 @@
			this.gridColumn9.OptionsColumn.ReadOnly = true;
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 12;
			this.gridColumn9.Width = 50;
			this.gridColumn9.Width = 26;
			//
			// gridColumn7
			//
			@@ -1301,7 +1301,7 @@
			this.gridColumn7.OptionsColumn.ReadOnly = true;
			this.gridColumn7.Visible = true;
			this.gridColumn7.VisibleIndex = 13;
			this.gridColumn7.Width = 50;
			this.gridColumn7.Width = 26;
			//
			// gridColumn6
			//
			@@ -1312,7 +1312,7 @@
			this.gridColumn6.OptionsColumn.ReadOnly = true;
			this.gridColumn6.Visible = true;
			this.gridColumn6.VisibleIndex = 14;
			this.gridColumn6.Width = 180;
			this.gridColumn6.Width = 96;
			//
			// gridColumn10
			//
			@@ -1322,7 +1322,7 @@
			this.gridColumn10.Name = "gridColumn10";
			this.gridColumn10.Visible = true;
			this.gridColumn10.VisibleIndex = 18;
			this.gridColumn10.Width = 94;
			this.gridColumn10.Width = 25;
			//
			// gridColumn12
			//
			@@ -1332,7 +1332,7 @@
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 19;
			this.gridColumn12.Width = 94;
			this.gridColumn12.Width = 25;
			//
			// gridColumn13
			//
			@@ -1342,7 +1342,7 @@
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 20;
			this.gridColumn13.Width = 94;
			this.gridColumn13.Width = 25;
			//
			// gvBtnAlawys
			//
			@@ -1402,7 +1402,7 @@
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 15;
			this.gridColumn15.Width = 94;
			this.gridColumn15.Width = 50;
			//
			// gridColumn16
			//
			@@ -1412,7 +1412,7 @@
			this.gridColumn16.Name = "gridColumn16";
			this.gridColumn16.Visible = true;
			this.gridColumn16.VisibleIndex = 16;
			this.gridColumn16.Width = 94;
			this.gridColumn16.Width = 50;
			//
			// gridColumn2
			//
			@@ -1422,7 +1422,7 @@
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 17;
			this.gridColumn2.Width = 94;
			this.gridColumn2.Width = 26;
			//
			// gridColumn17
			//
			@@ -1432,7 +1432,7 @@
			this.gridColumn17.Name = "gridColumn17";
			this.gridColumn17.Visible = true;
			this.gridColumn17.VisibleIndex = 23;
			this.gridColumn17.Width = 94;
			this.gridColumn17.Width = 26;
			//
			// rptHistory
			//