~tjx/GsMesClient.git

			@@ -246,6 +246,9 @@
			this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
			this.gcMain = new DevExpress.XtraGrid.GridControl();
			this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			@@ -255,9 +258,6 @@
			this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
			this.lbGuid = new System.Windows.Forms.Label();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.tabMxPage1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
			@@ -2590,7 +2590,7 @@
			this.gv_unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_unit.AppearanceCell.Options.UseFont = true;
			this.gv_unit.Caption = "单位 ";
			this.gv_unit.FieldName = "unit";
			this.gv_unit.FieldName = "dwName";
			this.gv_unit.MinWidth = 50;
			this.gv_unit.Name = "gv_unit";
			this.gv_unit.OptionsColumn.AllowEdit = false;
			@@ -2662,7 +2662,7 @@
			this.gv_businessStatus.OptionsColumn.AllowEdit = false;
			this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
			this.gv_businessStatus.Visible = true;
			this.gv_businessStatus.VisibleIndex = 8;
			this.gv_businessStatus.VisibleIndex = 9;
			this.gv_businessStatus.Width = 94;
			//
			// lb_orderType
			@@ -2695,7 +2695,7 @@
			this.gv_orderType.OptionsColumn.AllowEdit = false;
			this.gv_orderType.Tag = "query_a.ORDER_TYPE";
			this.gv_orderType.Visible = true;
			this.gv_orderType.VisibleIndex = 7;
			this.gv_orderType.VisibleIndex = 8;
			this.gv_orderType.Width = 94;
			//
			// lb_orderDate
			@@ -2728,7 +2728,7 @@
			this.gv_orderDate.OptionsColumn.AllowEdit = false;
			this.gv_orderDate.Tag = "query_a.ORDER_DATE";
			this.gv_orderDate.Visible = true;
			this.gv_orderDate.VisibleIndex = 6;
			this.gv_orderDate.VisibleIndex = 7;
			this.gv_orderDate.Width = 94;
			//
			// lb_warehouse
			@@ -2761,7 +2761,7 @@
			this.gv_warehouse.OptionsColumn.AllowEdit = false;
			this.gv_warehouse.Tag = "query_a.WAREHOUSE";
			this.gv_warehouse.Visible = true;
			this.gv_warehouse.VisibleIndex = 5;
			this.gv_warehouse.VisibleIndex = 6;
			this.gv_warehouse.Width = 94;
			//
			// lb_smtProcessAttr
			@@ -2914,6 +2914,36 @@
			this.gridView1.OptionsFind.ShowSearchNavButtons = false;
			this.gridView1.OptionsView.ShowAutoFilterRow = true;
			this.gridView1.OptionsView.ShowGroupPanel = false;
			//
			// gridColumn3
			//
			this.gridColumn3.Caption = "产品编码";
			this.gridColumn3.FieldName = "wlbm";
			this.gridColumn3.MinWidth = 100;
			this.gridColumn3.Name = "gridColumn3";
			this.gridColumn3.Visible = true;
			this.gridColumn3.VisibleIndex = 2;
			this.gridColumn3.Width = 100;
			//
			// gridColumn2
			//
			this.gridColumn2.Caption = "物料名称";
			this.gridColumn2.FieldName = "wlmc";
			this.gridColumn2.MinWidth = 150;
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 3;
			this.gridColumn2.Width = 150;
			//
			// gridColumn1
			//
			this.gridColumn1.Caption = "规格型号";
			this.gridColumn1.FieldName = "wlgg";
			this.gridColumn1.MinWidth = 150;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 4;
			this.gridColumn1.Width = 150;
			//
			// xtraTabControl1
			//
			@@ -3118,36 +3148,6 @@
			this.picCheckBox.TabIndex = 8;
			this.picCheckBox.TabStop = false;
			this.picCheckBox.Visible = false;
			//
			// gridColumn1
			//
			this.gridColumn1.Caption = "规格型号";
			this.gridColumn1.FieldName = "wlgg";
			this.gridColumn1.MinWidth = 150;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 4;
			this.gridColumn1.Width = 150;
			//
			// gridColumn2
			//
			this.gridColumn2.Caption = "物料名称";
			this.gridColumn2.FieldName = "wlmc";
			this.gridColumn2.MinWidth = 150;
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 3;
			this.gridColumn2.Width = 150;
			//
			// gridColumn3
			//
			this.gridColumn3.Caption = "产品编码";
			this.gridColumn3.FieldName = "wlbm";
			this.gridColumn3.MinWidth = 100;
			this.gridColumn3.Name = "gridColumn3";
			this.gridColumn3.Visible = true;
			this.gridColumn3.VisibleIndex = 2;
			this.gridColumn3.Width = 100;
			//
			// Frm_ProductionOrder
			//