~tjx/GsMesClient.git

			@@ -116,6 +116,7 @@
			this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
			this.gcMx2 = new DevExpress.XtraGrid.GridControl();
			this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
			@@ -135,6 +136,7 @@
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -234,6 +236,7 @@
			// split1
			//
			this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
			this.split1.Horizontal = false;
			this.split1.Location = new System.Drawing.Point(0, 0);
			this.split1.Name = "split1";
			@@ -247,8 +250,9 @@
			// split1.Panel2
			//
			this.split1.Panel2.Text = "Panel2";
			this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
			this.split1.Size = new System.Drawing.Size(1126, 570);
			this.split1.SplitterPosition = 558;
			this.split1.SplitterPosition = 0;
			this.split1.TabIndex = 3;
			//
			// gcMain1
			@@ -285,7 +289,8 @@
			this.gv_reason,
			this.gv_fmrmode,
			this.gridColumn7,
			this.gridColumn18});
			this.gridColumn18,
			this.gridColumn19});
			this.gridView1.GridControl = this.gcMain1;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			@@ -518,6 +523,7 @@
			//
			this.splitMx1.Panel2.Controls.Add(this.tabMx);
			this.splitMx1.Panel2.Text = "Panel2";
			this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
			this.splitMx1.Size = new System.Drawing.Size(1126, 570);
			this.splitMx1.SplitterPosition = 137;
			this.splitMx1.TabIndex = 0;
			@@ -952,7 +958,8 @@
			this.gvMx2lineK3id,
			this.gvMx2itemOutId,
			this.gridColumn14,
			this.gridColumn15});
			this.gridColumn15,
			this.gridColumn11});
			this.gvMx1.GridControl = this.gcMx1;
			this.gvMx1.Name = "gvMx1";
			this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
			@@ -984,12 +991,12 @@
			//
			this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
			this.gvMx2pbillNo.Caption = "到货单号";
			this.gvMx2pbillNo.FieldName = "pbillNo";
			this.gvMx2pbillNo.FieldName = "dhdh";
			this.gvMx2pbillNo.Name = "gvMx2pbillNo";
			this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
			this.gvMx2pbillNo.Tag = "query_a.pbill_no";
			this.gvMx2pbillNo.Visible = true;
			this.gvMx2pbillNo.VisibleIndex = 0;
			this.gvMx2pbillNo.VisibleIndex = 9;
			this.gvMx2pbillNo.Width = 94;
			//
			// gvMx2workLine
			@@ -1000,8 +1007,6 @@
			this.gvMx2workLine.Name = "gvMx2workLine";
			this.gvMx2workLine.OptionsColumn.ReadOnly = true;
			this.gvMx2workLine.Tag = "query_a.work_line";
			this.gvMx2workLine.Visible = true;
			this.gvMx2workLine.VisibleIndex = 1;
			this.gvMx2workLine.Width = 94;
			//
			// gvMx2itemNo
			@@ -1013,7 +1018,7 @@
			this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
			this.gvMx2itemNo.Tag = "query_a.item_no";
			this.gvMx2itemNo.Visible = true;
			this.gvMx2itemNo.VisibleIndex = 2;
			this.gvMx2itemNo.VisibleIndex = 0;
			this.gvMx2itemNo.Width = 94;
			//
			// gridColumn5
			@@ -1023,7 +1028,7 @@
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.OptionsColumn.ReadOnly = true;
			this.gridColumn5.Visible = true;
			this.gridColumn5.VisibleIndex = 3;
			this.gridColumn5.VisibleIndex = 1;
			this.gridColumn5.Width = 94;
			//
			// gridColumn6
			@@ -1033,7 +1038,7 @@
			this.gridColumn6.Name = "gridColumn6";
			this.gridColumn6.OptionsColumn.ReadOnly = true;
			this.gridColumn6.Visible = true;
			this.gridColumn6.VisibleIndex = 4;
			this.gridColumn6.VisibleIndex = 2;
			this.gridColumn6.Width = 94;
			//
			// gvMx2quantity
			@@ -1048,7 +1053,7 @@
			this.gvMx2quantity.Name = "gvMx2quantity";
			this.gvMx2quantity.Tag = "query_a.quantity";
			this.gvMx2quantity.Visible = true;
			this.gvMx2quantity.VisibleIndex = 5;
			this.gvMx2quantity.VisibleIndex = 3;
			this.gvMx2quantity.Width = 94;
			//
			// gvMx2tlQty
			@@ -1060,7 +1065,7 @@
			this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
			this.gvMx2tlQty.Tag = "query_a.tl_qty";
			this.gvMx2tlQty.Visible = true;
			this.gvMx2tlQty.VisibleIndex = 6;
			this.gvMx2tlQty.VisibleIndex = 4;
			this.gvMx2tlQty.Width = 94;
			//
			// gvMx2depotCode
			@@ -1072,7 +1077,7 @@
			this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
			this.gvMx2depotCode.Tag = "query_a.depot_code";
			this.gvMx2depotCode.Visible = true;
			this.gvMx2depotCode.VisibleIndex = 7;
			this.gvMx2depotCode.VisibleIndex = 5;
			this.gvMx2depotCode.Width = 94;
			//
			// gvMx2remark
			@@ -1084,7 +1089,7 @@
			this.gvMx2remark.OptionsColumn.ReadOnly = true;
			this.gvMx2remark.Tag = "query_a.remark";
			this.gvMx2remark.Visible = true;
			this.gvMx2remark.VisibleIndex = 8;
			this.gvMx2remark.VisibleIndex = 6;
			this.gvMx2remark.Width = 94;
			//
			// gvMx2ebelnK3id
			@@ -1095,8 +1100,6 @@
			this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
			this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
			this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
			this.gvMx2ebelnK3id.Visible = true;
			this.gvMx2ebelnK3id.VisibleIndex = 9;
			this.gvMx2ebelnK3id.Width = 94;
			//
			// gvMx2lineK3id
			@@ -1107,8 +1110,6 @@
			this.gvMx2lineK3id.Name = "gvMx2lineK3id";
			this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
			this.gvMx2lineK3id.Tag = "query_a.line_k3id";
			this.gvMx2lineK3id.Visible = true;
			this.gvMx2lineK3id.VisibleIndex = 10;
			this.gvMx2lineK3id.Width = 94;
			//
			// gvMx2itemOutId
			@@ -1128,7 +1129,7 @@
			this.gridColumn14.MinWidth = 25;
			this.gridColumn14.Name = "gridColumn14";
			this.gridColumn14.Visible = true;
			this.gridColumn14.VisibleIndex = 11;
			this.gridColumn14.VisibleIndex = 7;
			this.gridColumn14.Width = 94;
			//
			// gridColumn15
			@@ -1138,8 +1139,18 @@
			this.gridColumn15.MinWidth = 25;
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 12;
			this.gridColumn15.VisibleIndex = 8;
			this.gridColumn15.Width = 94;
			//
			// gridColumn11
			//
			this.gridColumn11.Caption = "入库单号";
			this.gridColumn11.FieldName = "rkdh";
			this.gridColumn11.MinWidth = 25;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 10;
			this.gridColumn11.Width = 94;
			//
			// xtraTabPage3
			//
			@@ -1337,6 +1348,14 @@
			this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
			this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
			//
			// gridColumn19
			//
			this.gridColumn19.Caption = "主键GUID";
			this.gridColumn19.FieldName = "guid";
			this.gridColumn19.MinWidth = 25;
			this.gridColumn19.Name = "gridColumn19";
			this.gridColumn19.Width = 94;
			//
			// Frm_MesCgthSqDj
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			@@ -1507,5 +1526,7 @@
			private DevExpress.XtraLayout.LayoutControlItem lab_createBy;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
			private DevExpress.Utils.ToolTipController tips;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
			}
			}