~tjx/GsMesClient.git

			@@ -40,25 +40,28 @@
			DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
			DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
			this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			@@ -68,10 +71,7 @@
			this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_daa027 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -90,7 +90,6 @@
			this.gv_cust = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -188,6 +187,30 @@
			this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.splitMx99 = new DevExpress.XtraEditors.SplitContainerControl();
			this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
			this.layShuLiang = new DevExpress.XtraDataLayout.DataLayoutControl();
			this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
			this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
			this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
			this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
			this.radOut = new DevExpress.XtraEditors.RadioGroup();
			this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
			this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
			this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
			this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
			this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
			this.txt_zQty = new DevExpress.XtraEditors.TextEdit();
			this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
			this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
			this.gcMx2 = new DevExpress.XtraGrid.GridControl();
			this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -208,23 +231,6 @@
			this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.panMx99 = new System.Windows.Forms.Panel();
			this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
			this.radOut = new DevExpress.XtraEditors.RadioGroup();
			this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
			this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
			this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
			this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
			this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
			this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
			this.txt_zQty = new DevExpress.XtraEditors.TextEdit();
			this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
			this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
			this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
			this.gcMx3 = new DevExpress.XtraGrid.GridControl();
			this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
			@@ -265,8 +271,6 @@
			this.panMx100 = new System.Windows.Forms.Panel();
			this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -338,14 +342,22 @@
			((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
			this.tabMxPage2.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
			this.panMx99.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.splitMx99)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).BeginInit();
			this.splitMx99.Panel1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel2)).BeginInit();
			this.splitMx99.Panel2.SuspendLayout();
			this.splitMx99.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).BeginInit();
			this.layoutMx99.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layShuLiang)).BeginInit();
			this.layShuLiang.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
			@@ -353,11 +365,16 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
			this.xtraTabPage3.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
			@@ -380,8 +397,6 @@
			((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
			this.panMx100.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
			this.SuspendLayout();
			//
			// toolBarMenu1
			@@ -422,6 +437,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";
			@@ -435,8 +451,9 @@
			// split1.Panel2
			//
			this.split1.Panel2.Text = "Panel2";
			this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
			this.split1.Size = new System.Drawing.Size(1267, 708);
			this.split1.SplitterPosition = 696;
			this.split1.SplitterPosition = 0;
			this.split1.TabIndex = 0;
			//
			// gcMain1
			@@ -460,10 +477,7 @@
			this.gridColumn5,
			this.gv_daa027,
			this.gridColumn7,
			this.gridColumn8,
			this.gridColumn9,
			this.gridColumn10,
			this.gridColumn11,
			this.gridColumn12,
			this.gridColumn6,
			this.gridColumn27,
			@@ -482,7 +496,6 @@
			this.gv_cust,
			this.gridColumn1,
			this.gv_daa015,
			this.gridColumn2,
			this.gv_daa009,
			this.gv_prepareTime,
			this.gv_daa028,
			@@ -506,7 +519,7 @@
			// gridColumn5
			//
			this.gridColumn5.Caption = "结案标识";
			this.gridColumn5.FieldName = "jabs";
			this.gridColumn5.FieldName = "jabzChk";
			this.gridColumn5.MaxWidth = 50;
			this.gridColumn5.MinWidth = 50;
			this.gridColumn5.Name = "gridColumn5";
			@@ -543,28 +556,6 @@
			this.gridColumn7.VisibleIndex = 2;
			this.gridColumn7.Width = 50;
			//
			// gridColumn8
			//
			this.gridColumn8.Caption = "是否三天";
			this.gridColumn8.FieldName = "isThree";
			this.gridColumn8.MaxWidth = 50;
			this.gridColumn8.MinWidth = 50;
			this.gridColumn8.Name = "gridColumn8";
			this.gridColumn8.Tag = "query_a.jabs";
			this.gridColumn8.Width = 50;
			//
			// gridColumn9
			//
			this.gridColumn9.Caption = "是否超时";
			this.gridColumn9.FieldName = "isCs";
			this.gridColumn9.MaxWidth = 50;
			this.gridColumn9.MinWidth = 50;
			this.gridColumn9.Name = "gridColumn9";
			this.gridColumn9.Tag = "query_a.jabs";
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 3;
			this.gridColumn9.Width = 50;
			//
			// gridColumn10
			//
			this.gridColumn10.Caption = "是否首检";
			@@ -574,20 +565,8 @@
			this.gridColumn10.Name = "gridColumn10";
			this.gridColumn10.Tag = "query_a.jabs";
			this.gridColumn10.Visible = true;
			this.gridColumn10.VisibleIndex = 4;
			this.gridColumn10.VisibleIndex = 3;
			this.gridColumn10.Width = 50;
			//
			// gridColumn11
			//
			this.gridColumn11.Caption = "是否巡检";
			this.gridColumn11.FieldName = "isXj";
			this.gridColumn11.MaxWidth = 50;
			this.gridColumn11.MinWidth = 50;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Tag = "query_a.jabs";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 5;
			this.gridColumn11.Width = 50;
			//
			// gridColumn12
			//
			@@ -598,7 +577,7 @@
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Tag = "query_a.jabs";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 6;
			this.gridColumn12.VisibleIndex = 4;
			this.gridColumn12.Width = 50;
			//
			// gridColumn6
			@@ -610,7 +589,7 @@
			this.gridColumn6.Name = "gridColumn6";
			this.gridColumn6.Tag = "query_a.jabs";
			this.gridColumn6.Visible = true;
			this.gridColumn6.VisibleIndex = 7;
			this.gridColumn6.VisibleIndex = 5;
			this.gridColumn6.Width = 50;
			//
			// gridColumn27
			@@ -620,20 +599,20 @@
			this.gridColumn27.MinWidth = 25;
			this.gridColumn27.Name = "gridColumn27";
			this.gridColumn27.Visible = true;
			this.gridColumn27.VisibleIndex = 8;
			this.gridColumn27.VisibleIndex = 6;
			this.gridColumn27.Width = 94;
			//
			// gv_daa018
			//
			this.gv_daa018.AppearanceCell.Options.UseFont = true;
			this.gv_daa018.Caption = "工单状态";
			this.gv_daa018.FieldName = "daa018";
			this.gv_daa018.FieldName = "daa018Txt";
			this.gv_daa018.MinWidth = 90;
			this.gv_daa018.Name = "gv_daa018";
			this.gv_daa018.OptionsColumn.AllowEdit = false;
			this.gv_daa018.Tag = "query_a.daa018";
			this.gv_daa018.Visible = true;
			this.gv_daa018.VisibleIndex = 9;
			this.gv_daa018.VisibleIndex = 7;
			this.gv_daa018.Width = 90;
			//
			// gridColoun100
			@@ -644,7 +623,7 @@
			this.gridColoun100.Name = "gridColoun100";
			this.gridColoun100.Tag = "org.fnamber";
			this.gridColoun100.Visible = true;
			this.gridColoun100.VisibleIndex = 10;
			this.gridColoun100.VisibleIndex = 8;
			this.gridColoun100.Width = 250;
			//
			// gv_daa001
			@@ -657,7 +636,7 @@
			this.gv_daa001.OptionsColumn.AllowEdit = false;
			this.gv_daa001.Tag = "query_a.daa001";
			this.gv_daa001.Visible = true;
			this.gv_daa001.VisibleIndex = 11;
			this.gv_daa001.VisibleIndex = 9;
			this.gv_daa001.Width = 120;
			//
			// gv_daa021
			@@ -670,7 +649,7 @@
			this.gv_daa021.OptionsColumn.AllowEdit = false;
			this.gv_daa021.Tag = "query_a.daa021";
			this.gv_daa021.Visible = true;
			this.gv_daa021.VisibleIndex = 12;
			this.gv_daa021.VisibleIndex = 10;
			this.gv_daa021.Width = 100;
			//
			// gridColumn3
			@@ -680,7 +659,7 @@
			this.gridColumn3.MinWidth = 50;
			this.gridColumn3.Name = "gridColumn3";
			this.gridColumn3.Visible = true;
			this.gridColumn3.VisibleIndex = 13;
			this.gridColumn3.VisibleIndex = 11;
			this.gridColumn3.Width = 94;
			//
			// gv_daa003
			@@ -693,7 +672,7 @@
			this.gv_daa003.OptionsColumn.AllowEdit = false;
			this.gv_daa003.Tag = "query_a.daa003";
			this.gv_daa003.Visible = true;
			this.gv_daa003.VisibleIndex = 14;
			this.gv_daa003.VisibleIndex = 12;
			this.gv_daa003.Width = 150;
			//
			// gv_daa004
			@@ -706,7 +685,7 @@
			this.gv_daa004.OptionsColumn.AllowEdit = false;
			this.gv_daa004.Tag = "query_a.daa004";
			this.gv_daa004.Visible = true;
			this.gv_daa004.VisibleIndex = 15;
			this.gv_daa004.VisibleIndex = 13;
			this.gv_daa004.Width = 150;
			//
			// gv_daa008
			@@ -720,7 +699,7 @@
			this.gv_daa008.OptionsColumn.AllowEdit = false;
			this.gv_daa008.Tag = "query_a.daa008";
			this.gv_daa008.Visible = true;
			this.gv_daa008.VisibleIndex = 16;
			this.gv_daa008.VisibleIndex = 14;
			this.gv_daa008.Width = 50;
			//
			// gv_daa011
			@@ -734,7 +713,7 @@
			this.gv_daa011.OptionsColumn.AllowEdit = false;
			this.gv_daa011.Tag = "query_a.daa011";
			this.gv_daa011.Visible = true;
			this.gv_daa011.VisibleIndex = 17;
			this.gv_daa011.VisibleIndex = 15;
			this.gv_daa011.Width = 50;
			//
			// gridColumn4
			@@ -745,7 +724,7 @@
			this.gridColumn4.MinWidth = 50;
			this.gridColumn4.Name = "gridColumn4";
			this.gridColumn4.Visible = true;
			this.gridColumn4.VisibleIndex = 18;
			this.gridColumn4.VisibleIndex = 16;
			this.gridColumn4.Width = 50;
			//
			// gv_daa010
			@@ -759,7 +738,7 @@
			this.gv_daa010.OptionsColumn.AllowEdit = false;
			this.gv_daa010.Tag = "query_a.daa010";
			this.gv_daa010.Visible = true;
			this.gv_daa010.VisibleIndex = 20;
			this.gv_daa010.VisibleIndex = 18;
			this.gv_daa010.Width = 50;
			//
			// gv_daa005
			@@ -773,7 +752,7 @@
			this.gv_daa005.OptionsColumn.AllowEdit = false;
			this.gv_daa005.Tag = "query_a.daa005";
			this.gv_daa005.Visible = true;
			this.gv_daa005.VisibleIndex = 21;
			this.gv_daa005.VisibleIndex = 19;
			this.gv_daa005.Width = 50;
			//
			// gv_cust
			@@ -786,7 +765,7 @@
			this.gv_cust.OptionsColumn.AllowEdit = false;
			this.gv_cust.Tag = "query_a.cust";
			this.gv_cust.Visible = true;
			this.gv_cust.VisibleIndex = 22;
			this.gv_cust.VisibleIndex = 20;
			this.gv_cust.Width = 100;
			//
			// gridColumn1
			@@ -796,7 +775,7 @@
			this.gridColumn1.MinWidth = 50;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 23;
			this.gridColumn1.VisibleIndex = 21;
			this.gridColumn1.Width = 94;
			//
			// gv_daa015
			@@ -809,18 +788,8 @@
			this.gv_daa015.OptionsColumn.AllowEdit = false;
			this.gv_daa015.Tag = "query_a.daa015";
			this.gv_daa015.Visible = true;
			this.gv_daa015.VisibleIndex = 24;
			this.gv_daa015.VisibleIndex = 22;
			this.gv_daa015.Width = 94;
			//
			// gridColumn2
			//
			this.gridColumn2.Caption = "实际线别";
			this.gridColumn2.FieldName = "sjlineName";
			this.gridColumn2.MinWidth = 50;
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 25;
			this.gridColumn2.Width = 94;
			//
			// gv_daa009
			//
			@@ -832,7 +801,7 @@
			this.gv_daa009.OptionsColumn.AllowEdit = false;
			this.gv_daa009.Tag = "query_a.daa009";
			this.gv_daa009.Visible = true;
			this.gv_daa009.VisibleIndex = 19;
			this.gv_daa009.VisibleIndex = 17;
			this.gv_daa009.Width = 94;
			//
			// gv_prepareTime
			@@ -845,7 +814,7 @@
			this.gv_prepareTime.OptionsColumn.AllowEdit = false;
			this.gv_prepareTime.Tag = "query_a.prepare_time";
			this.gv_prepareTime.Visible = true;
			this.gv_prepareTime.VisibleIndex = 26;
			this.gv_prepareTime.VisibleIndex = 23;
			this.gv_prepareTime.Width = 180;
			//
			// gv_daa028
			@@ -858,7 +827,7 @@
			this.gv_daa028.OptionsColumn.AllowEdit = false;
			this.gv_daa028.Tag = "query_a.daa028";
			this.gv_daa028.Visible = true;
			this.gv_daa028.VisibleIndex = 27;
			this.gv_daa028.VisibleIndex = 24;
			this.gv_daa028.Width = 180;
			//
			// gv_daa016
			@@ -871,7 +840,7 @@
			this.gv_daa016.OptionsColumn.AllowEdit = false;
			this.gv_daa016.Tag = "query_a.daa016";
			this.gv_daa016.Visible = true;
			this.gv_daa016.VisibleIndex = 28;
			this.gv_daa016.VisibleIndex = 25;
			this.gv_daa016.Width = 180;
			//
			// gv_daa017
			@@ -884,7 +853,7 @@
			this.gv_daa017.OptionsColumn.AllowEdit = false;
			this.gv_daa017.Tag = "query_a.daa017";
			this.gv_daa017.Visible = true;
			this.gv_daa017.VisibleIndex = 29;
			this.gv_daa017.VisibleIndex = 26;
			this.gv_daa017.Width = 180;
			//
			// gv_mesStartProd
			@@ -897,7 +866,7 @@
			this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
			this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
			this.gv_mesStartProd.Visible = true;
			this.gv_mesStartProd.VisibleIndex = 30;
			this.gv_mesStartProd.VisibleIndex = 27;
			this.gv_mesStartProd.Width = 180;
			//
			// gv_mesEndProd
			@@ -910,7 +879,7 @@
			this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
			this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
			this.gv_mesEndProd.Visible = true;
			this.gv_mesEndProd.VisibleIndex = 31;
			this.gv_mesEndProd.VisibleIndex = 28;
			this.gv_mesEndProd.Width = 180;
			//
			// gridColumn21
			@@ -920,7 +889,7 @@
			this.gridColumn21.MinWidth = 25;
			this.gridColumn21.Name = "gridColumn21";
			this.gridColumn21.Visible = true;
			this.gridColumn21.VisibleIndex = 32;
			this.gridColumn21.VisibleIndex = 29;
			this.gridColumn21.Width = 94;
			//
			// gridColumn22
			@@ -930,7 +899,7 @@
			this.gridColumn22.MinWidth = 25;
			this.gridColumn22.Name = "gridColumn22";
			this.gridColumn22.Visible = true;
			this.gridColumn22.VisibleIndex = 33;
			this.gridColumn22.VisibleIndex = 30;
			this.gridColumn22.Width = 94;
			//
			// gridColumn23
			@@ -948,7 +917,7 @@
			this.gridColumn24.MinWidth = 25;
			this.gridColumn24.Name = "gridColumn24";
			this.gridColumn24.Visible = true;
			this.gridColumn24.VisibleIndex = 34;
			this.gridColumn24.VisibleIndex = 31;
			this.gridColumn24.Width = 94;
			//
			// gridColumn25
			@@ -958,7 +927,7 @@
			this.gridColumn25.MinWidth = 25;
			this.gridColumn25.Name = "gridColumn25";
			this.gridColumn25.Visible = true;
			this.gridColumn25.VisibleIndex = 35;
			this.gridColumn25.VisibleIndex = 32;
			this.gridColumn25.Width = 94;
			//
			// gridColumn26
			@@ -968,7 +937,7 @@
			this.gridColumn26.MinWidth = 25;
			this.gridColumn26.Name = "gridColumn26";
			this.gridColumn26.Visible = true;
			this.gridColumn26.VisibleIndex = 36;
			this.gridColumn26.VisibleIndex = 33;
			this.gridColumn26.Width = 94;
			//
			// pageBar1
			@@ -1006,6 +975,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(1267, 708);
			this.splitMx1.SplitterPosition = 183;
			this.splitMx1.TabIndex = 0;
			@@ -1057,7 +1027,7 @@
			//
			// txt_daa009
			//
			this.txt_daa009.Location = new System.Drawing.Point(420, 147);
			this.txt_daa009.Location = new System.Drawing.Point(420, 152);
			this.txt_daa009.Name = "txt_daa009";
			this.txt_daa009.Properties.Appearance.Options.UseFont = true;
			this.txt_daa009.Size = new System.Drawing.Size(506, 24);
			@@ -1067,7 +1037,7 @@
			//
			// txt_daa013
			//
			this.txt_daa013.Location = new System.Drawing.Point(726, 119);
			this.txt_daa013.Location = new System.Drawing.Point(726, 124);
			this.txt_daa013.Name = "txt_daa013";
			this.txt_daa013.Properties.Appearance.Options.UseFont = true;
			this.txt_daa013.Size = new System.Drawing.Size(200, 24);
			@@ -1077,7 +1047,7 @@
			//
			// txt_daa001
			//
			this.txt_daa001.Location = new System.Drawing.Point(114, 7);
			this.txt_daa001.Location = new System.Drawing.Point(114, 12);
			this.txt_daa001.Name = "txt_daa001";
			this.txt_daa001.Properties.Appearance.Options.UseFont = true;
			this.txt_daa001.Size = new System.Drawing.Size(200, 24);
			@@ -1087,7 +1057,7 @@
			//
			// textEdit1
			//
			this.textEdit1.Location = new System.Drawing.Point(420, 35);
			this.textEdit1.Location = new System.Drawing.Point(420, 40);
			this.textEdit1.Name = "textEdit1";
			this.textEdit1.Properties.Appearance.Options.UseFont = true;
			this.textEdit1.Size = new System.Drawing.Size(200, 24);
			@@ -1097,7 +1067,7 @@
			//
			// txt_daa008
			//
			this.txt_daa008.Location = new System.Drawing.Point(726, 7);
			this.txt_daa008.Location = new System.Drawing.Point(726, 12);
			this.txt_daa008.Name = "txt_daa008";
			this.txt_daa008.Properties.Appearance.Options.UseFont = true;
			this.txt_daa008.Size = new System.Drawing.Size(200, 24);
			@@ -1107,7 +1077,7 @@
			//
			// txt_saleOrderNo
			//
			this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 63);
			this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
			this.txt_saleOrderNo.Name = "txt_saleOrderNo";
			this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
			this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24);
			@@ -1117,7 +1087,7 @@
			//
			// txt_daa028
			//
			this.txt_daa028.Location = new System.Drawing.Point(420, 63);
			this.txt_daa028.Location = new System.Drawing.Point(420, 68);
			this.txt_daa028.Name = "txt_daa028";
			this.txt_daa028.Properties.Appearance.Options.UseFont = true;
			this.txt_daa028.Size = new System.Drawing.Size(200, 24);
			@@ -1127,7 +1097,7 @@
			//
			// txt_mesStartProd
			//
			this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 35);
			this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40);
			this.txt_mesStartProd.Name = "txt_mesStartProd";
			this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
			this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24);
			@@ -1137,7 +1107,7 @@
			//
			// txt_daa014
			//
			this.txt_daa014.Location = new System.Drawing.Point(114, 35);
			this.txt_daa014.Location = new System.Drawing.Point(114, 40);
			this.txt_daa014.Name = "txt_daa014";
			this.txt_daa014.Properties.Appearance.Options.UseFont = true;
			this.txt_daa014.Size = new System.Drawing.Size(200, 24);
			@@ -1147,7 +1117,7 @@
			//
			// txt_daa022Remark
			//
			this.txt_daa022Remark.Location = new System.Drawing.Point(420, 7);
			this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12);
			this.txt_daa022Remark.Name = "txt_daa022Remark";
			this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
			this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24);
			@@ -1157,7 +1127,7 @@
			//
			// txt_daa010
			//
			this.txt_daa010.Location = new System.Drawing.Point(726, 35);
			this.txt_daa010.Location = new System.Drawing.Point(726, 40);
			this.txt_daa010.Name = "txt_daa010";
			this.txt_daa010.Properties.Appearance.Options.UseFont = true;
			this.txt_daa010.Size = new System.Drawing.Size(200, 24);
			@@ -1167,7 +1137,7 @@
			//
			// txt_mesEndProd
			//
			this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 63);
			this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68);
			this.txt_mesEndProd.Name = "txt_mesEndProd";
			this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
			this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24);
			@@ -1177,7 +1147,7 @@
			//
			// txt_daa011
			//
			this.txt_daa011.Location = new System.Drawing.Point(726, 63);
			this.txt_daa011.Location = new System.Drawing.Point(726, 68);
			this.txt_daa011.Name = "txt_daa011";
			this.txt_daa011.Properties.Appearance.Options.UseFont = true;
			this.txt_daa011.Size = new System.Drawing.Size(200, 24);
			@@ -1187,7 +1157,7 @@
			//
			// txt_dptName
			//
			this.txt_dptName.Location = new System.Drawing.Point(726, 91);
			this.txt_dptName.Location = new System.Drawing.Point(726, 96);
			this.txt_dptName.Name = "txt_dptName";
			this.txt_dptName.Properties.Appearance.Options.UseFont = true;
			this.txt_dptName.Size = new System.Drawing.Size(200, 24);
			@@ -1197,7 +1167,7 @@
			//
			// txt_daa016
			//
			this.txt_daa016.Location = new System.Drawing.Point(1032, 91);
			this.txt_daa016.Location = new System.Drawing.Point(1032, 96);
			this.txt_daa016.Name = "txt_daa016";
			this.txt_daa016.Properties.Appearance.Options.UseFont = true;
			this.txt_daa016.Size = new System.Drawing.Size(202, 24);
			@@ -1207,7 +1177,7 @@
			//
			// txt_daa029
			//
			this.txt_daa029.Location = new System.Drawing.Point(114, 91);
			this.txt_daa029.Location = new System.Drawing.Point(114, 96);
			this.txt_daa029.Name = "txt_daa029";
			this.txt_daa029.Properties.Appearance.Options.UseFont = true;
			this.txt_daa029.Size = new System.Drawing.Size(200, 24);
			@@ -1217,7 +1187,7 @@
			//
			// txt_lineName
			//
			this.txt_lineName.Location = new System.Drawing.Point(420, 91);
			this.txt_lineName.Location = new System.Drawing.Point(420, 96);
			this.txt_lineName.Name = "txt_lineName";
			this.txt_lineName.Properties.Appearance.Options.UseFont = true;
			this.txt_lineName.Size = new System.Drawing.Size(200, 24);
			@@ -1227,7 +1197,7 @@
			//
			// txt_daa017
			//
			this.txt_daa017.Location = new System.Drawing.Point(1032, 119);
			this.txt_daa017.Location = new System.Drawing.Point(1032, 124);
			this.txt_daa017.Name = "txt_daa017";
			this.txt_daa017.Properties.Appearance.Options.UseFont = true;
			this.txt_daa017.Size = new System.Drawing.Size(202, 24);
			@@ -1237,7 +1207,7 @@
			//
			// txt_daa003
			//
			this.txt_daa003.Location = new System.Drawing.Point(114, 147);
			this.txt_daa003.Location = new System.Drawing.Point(114, 152);
			this.txt_daa003.Name = "txt_daa003";
			this.txt_daa003.Properties.Appearance.Options.UseFont = true;
			this.txt_daa003.Size = new System.Drawing.Size(200, 24);
			@@ -1247,7 +1217,7 @@
			//
			// txt_dwName
			//
			this.txt_dwName.Location = new System.Drawing.Point(1032, 7);
			this.txt_dwName.Location = new System.Drawing.Point(1032, 12);
			this.txt_dwName.Name = "txt_dwName";
			this.txt_dwName.Properties.Appearance.Options.UseFont = true;
			this.txt_dwName.Size = new System.Drawing.Size(202, 24);
			@@ -1257,7 +1227,7 @@
			//
			// txt_daa004
			//
			this.txt_daa004.Location = new System.Drawing.Point(114, 119);
			this.txt_daa004.Location = new System.Drawing.Point(114, 124);
			this.txt_daa004.Name = "txt_daa004";
			this.txt_daa004.Properties.Appearance.Options.UseFont = true;
			this.txt_daa004.Size = new System.Drawing.Size(200, 24);
			@@ -1267,7 +1237,7 @@
			//
			// txt_daa015
			//
			this.txt_daa015.Location = new System.Drawing.Point(420, 119);
			this.txt_daa015.Location = new System.Drawing.Point(420, 124);
			this.txt_daa015.Name = "txt_daa015";
			this.txt_daa015.Size = new System.Drawing.Size(200, 24);
			this.txt_daa015.StyleController = this.layoutMx1;
			@@ -1952,21 +1922,352 @@
			//
			// tabMxPage2
			//
			this.tabMxPage2.Controls.Add(this.gcMx2);
			this.tabMxPage2.Controls.Add(this.panMx99);
			this.tabMxPage2.Controls.Add(this.splitMx99);
			this.tabMxPage2.Name = "tabMxPage2";
			this.tabMxPage2.Size = new System.Drawing.Size(1265, 481);
			this.tabMxPage2.Text = "托板码明细";
			//
			// splitMx99
			//
			this.splitMx99.Dock = System.Windows.Forms.DockStyle.Fill;
			this.splitMx99.Horizontal = false;
			this.splitMx99.Location = new System.Drawing.Point(0, 0);
			this.splitMx99.Name = "splitMx99";
			//
			// splitMx99.Panel1
			//
			this.splitMx99.Panel1.Controls.Add(this.layoutMx99);
			this.splitMx99.Panel1.Text = "Panel1";
			//
			// splitMx99.Panel2
			//
			this.splitMx99.Panel2.Controls.Add(this.gcMx2);
			this.splitMx99.Panel2.Text = "Panel2";
			this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
			this.splitMx99.Size = new System.Drawing.Size(1265, 481);
			this.splitMx99.SplitterPosition = 83;
			this.splitMx99.TabIndex = 2;
			//
			// layoutMx99
			//
			this.layoutMx99.Controls.Add(this.layShuLiang);
			this.layoutMx99.Controls.Add(this.radOut);
			this.layoutMx99.Controls.Add(this.ucBtnPrint1);
			this.layoutMx99.Controls.Add(this.txt_psnQty_1);
			this.layoutMx99.Controls.Add(this.txt_printRemark);
			this.layoutMx99.Controls.Add(this.txt_kQty);
			this.layoutMx99.Controls.Add(this.txt_yQty);
			this.layoutMx99.Controls.Add(this.txt_zQty);
			this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
			this.layoutMx99.Location = new System.Drawing.Point(0, 0);
			this.layoutMx99.Name = "layoutMx99";
			this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(109, 424, 812, 500);
			this.layoutMx99.Root = this.layoutControlGroup1;
			this.layoutMx99.Size = new System.Drawing.Size(1265, 83);
			this.layoutMx99.TabIndex = 0;
			this.layoutMx99.Text = "layoutControl1";
			//
			// layShuLiang
			//
			this.layShuLiang.Controls.Add(this.txt_iCount_1);
			this.layShuLiang.Controls.Add(this.txt_yuliang_1);
			this.layShuLiang.Location = new System.Drawing.Point(632, 44);
			this.layShuLiang.Name = "layShuLiang";
			this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
			this.layShuLiang.Root = this.layoutControlGroup3;
			this.layShuLiang.Size = new System.Drawing.Size(306, 28);
			this.layShuLiang.TabIndex = 475;
			this.layShuLiang.Text = "dataLayoutControl1";
			//
			// txt_iCount_1
			//
			this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
			this.txt_iCount_1.Name = "txt_iCount_1";
			this.txt_iCount_1.Properties.ReadOnly = true;
			this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
			this.txt_iCount_1.StyleController = this.layShuLiang;
			this.txt_iCount_1.TabIndex = 5;
			//
			// txt_yuliang_1
			//
			this.txt_yuliang_1.Location = new System.Drawing.Point(242, 2);
			this.txt_yuliang_1.Name = "txt_yuliang_1";
			this.txt_yuliang_1.Properties.ReadOnly = true;
			this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
			this.txt_yuliang_1.StyleController = this.layShuLiang;
			this.txt_yuliang_1.TabIndex = 6;
			//
			// layoutControlGroup3
			//
			this.layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			this.layoutControlGroup3.GroupBordersVisible = false;
			this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
			this.layoutControlItem25,
			this.layoutControlItem39});
			this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
			this.layoutControlGroup3.Name = "Root";
			columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition5.Width = 100D;
			columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition6.Width = 100D;
			this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
			columnDefinition5,
			columnDefinition6});
			rowDefinition7.Height = 100D;
			rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
			this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
			rowDefinition7});
			this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
			this.layoutControlGroup3.Size = new System.Drawing.Size(306, 28);
			this.layoutControlGroup3.TextVisible = false;
			//
			// layoutControlItem25
			//
			this.layoutControlItem25.Control = this.txt_iCount_1;
			this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
			this.layoutControlItem25.Name = "layoutControlItem25";
			this.layoutControlItem25.Size = new System.Drawing.Size(153, 28);
			this.layoutControlItem25.Text = "打印整张数";
			this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem39
			//
			this.layoutControlItem39.Control = this.txt_yuliang_1;
			this.layoutControlItem39.CustomizationFormText = "打印余数";
			this.layoutControlItem39.Location = new System.Drawing.Point(153, 0);
			this.layoutControlItem39.Name = "layoutControlItem39";
			this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem39.Size = new System.Drawing.Size(153, 28);
			this.layoutControlItem39.Text = "打印余数";
			this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
			//
			// radOut
			//
			this.radOut.Location = new System.Drawing.Point(943, 10);
			this.radOut.Margin = new System.Windows.Forms.Padding(0);
			this.radOut.Name = "radOut";
			this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
			this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全打"),
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
			this.radOut.Size = new System.Drawing.Size(237, 28);
			this.radOut.StyleController = this.layoutMx99;
			this.radOut.TabIndex = 473;
			//
			// ucBtnPrint1
			//
			this.ucBtnPrint1.guidKey = null;
			this.ucBtnPrint1.Location = new System.Drawing.Point(941, 42);
			this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
			this.ucBtnPrint1.Name = "ucBtnPrint1";
			this.ucBtnPrint1.rptParameter = null;
			this.ucBtnPrint1.Size = new System.Drawing.Size(308, 32);
			this.ucBtnPrint1.TabIndex = 464;
			//
			// txt_psnQty_1
			//
			this.txt_psnQty_1.Location = new System.Drawing.Point(719, 12);
			this.txt_psnQty_1.Name = "txt_psnQty_1";
			this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
			this.txt_psnQty_1.Size = new System.Drawing.Size(219, 24);
			this.txt_psnQty_1.StyleController = this.layoutMx99;
			this.txt_psnQty_1.TabIndex = 330;
			this.txt_psnQty_1.Tag = "readOnly-1";
			//
			// txt_printRemark
			//
			this.txt_printRemark.Location = new System.Drawing.Point(409, 44);
			this.txt_printRemark.Name = "txt_printRemark";
			this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
			this.txt_printRemark.Size = new System.Drawing.Size(219, 24);
			this.txt_printRemark.StyleController = this.layoutMx99;
			this.txt_printRemark.TabIndex = 334;
			this.txt_printRemark.Tag = "readOnly-1";
			//
			// txt_kQty
			//
			this.txt_kQty.EditValue = "";
			this.txt_kQty.Location = new System.Drawing.Point(409, 12);
			this.txt_kQty.Name = "txt_kQty";
			this.txt_kQty.Properties.Appearance.Options.UseFont = true;
			this.txt_kQty.Properties.ReadOnly = true;
			this.txt_kQty.Size = new System.Drawing.Size(219, 24);
			this.txt_kQty.StyleController = this.layoutMx99;
			this.txt_kQty.TabIndex = 472;
			this.txt_kQty.Tag = "readonly";
			//
			// txt_yQty
			//
			this.txt_yQty.Location = new System.Drawing.Point(99, 44);
			this.txt_yQty.Name = "txt_yQty";
			this.txt_yQty.Properties.Appearance.Options.UseFont = true;
			this.txt_yQty.Properties.ReadOnly = true;
			this.txt_yQty.Size = new System.Drawing.Size(219, 24);
			this.txt_yQty.StyleController = this.layoutMx99;
			this.txt_yQty.TabIndex = 470;
			this.txt_yQty.Tag = "readonly";
			//
			// txt_zQty
			//
			this.txt_zQty.Location = new System.Drawing.Point(99, 12);
			this.txt_zQty.Name = "txt_zQty";
			this.txt_zQty.Properties.ReadOnly = true;
			this.txt_zQty.Size = new System.Drawing.Size(219, 24);
			this.txt_zQty.StyleController = this.layoutMx99;
			this.txt_zQty.TabIndex = 474;
			//
			// layoutControlGroup1
			//
			this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			this.layoutControlGroup1.GroupBordersVisible = false;
			this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
			this.layoutControlItem23,
			this.layoutControlItem35,
			this.layoutControlItem26,
			this.layoutControlItem22,
			this.layoutControlItem21,
			this.layoutControlItem24,
			this.layoutControlItem38,
			this.layoutControlItem36});
			this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
			this.layoutControlGroup1.Name = "Root";
			columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition7.Width = 100D;
			columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition8.Width = 100D;
			columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition9.Width = 100D;
			columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition10.Width = 100D;
			columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
			columnDefinition11.Width = 20D;
			this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
			columnDefinition7,
			columnDefinition8,
			columnDefinition9,
			columnDefinition10,
			columnDefinition11});
			rowDefinition8.Height = 100D;
			rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
			rowDefinition9.Height = 100D;
			rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
			this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
			rowDefinition8,
			rowDefinition9});
			this.layoutControlGroup1.Size = new System.Drawing.Size(1280, 84);
			this.layoutControlGroup1.TextVisible = false;
			//
			// layoutControlItem23
			//
			this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem23.Control = this.txt_kQty;
			this.layoutControlItem23.Location = new System.Drawing.Point(310, 0);
			this.layoutControlItem23.Name = "layoutControlItem23";
			this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem23.Size = new System.Drawing.Size(310, 32);
			this.layoutControlItem23.Text = "可打印数量";
			this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem35
			//
			this.layoutControlItem35.Control = this.radOut;
			this.layoutControlItem35.Location = new System.Drawing.Point(930, 0);
			this.layoutControlItem35.MaxSize = new System.Drawing.Size(240, 28);
			this.layoutControlItem35.MinSize = new System.Drawing.Size(240, 28);
			this.layoutControlItem35.Name = "layoutControlItem35";
			this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
			this.layoutControlItem35.Size = new System.Drawing.Size(310, 32);
			this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
			this.layoutControlItem35.Text = "自动计算";
			this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem35.TextVisible = false;
			//
			// layoutControlItem26
			//
			this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem26.Control = this.ucBtnPrint1;
			this.layoutControlItem26.Location = new System.Drawing.Point(930, 32);
			this.layoutControlItem26.Name = "layoutControlItem26";
			this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
			this.layoutControlItem26.Size = new System.Drawing.Size(310, 32);
			this.layoutControlItem26.Text = "报工打印";
			this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem26.TextVisible = false;
			//
			// layoutControlItem22
			//
			this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem22.Control = this.txt_yQty;
			this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
			this.layoutControlItem22.Name = "layoutControlItem22";
			this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem22.Size = new System.Drawing.Size(310, 32);
			this.layoutControlItem22.Text = "已打印数量";
			this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem21
			//
			this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem21.Control = this.txt_printRemark;
			this.layoutControlItem21.Location = new System.Drawing.Point(310, 32);
			this.layoutControlItem21.Name = "layoutControlItem21";
			this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem21.Size = new System.Drawing.Size(310, 32);
			this.layoutControlItem21.Text = "打印备注";
			this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem24
			//
			this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem24.Control = this.txt_psnQty_1;
			this.layoutControlItem24.CustomizationFormText = "内包装数量";
			this.layoutControlItem24.Location = new System.Drawing.Point(620, 0);
			this.layoutControlItem24.Name = "layoutControlItem24";
			this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem24.Size = new System.Drawing.Size(310, 32);
			this.layoutControlItem24.Text = "内包装数量";
			this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem38
			//
			this.layoutControlItem38.Control = this.layShuLiang;
			this.layoutControlItem38.Location = new System.Drawing.Point(620, 32);
			this.layoutControlItem38.Name = "layoutControlItem38";
			this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem38.Size = new System.Drawing.Size(310, 32);
			this.layoutControlItem38.Text = "打印数量";
			this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem38.TextVisible = false;
			//
			// layoutControlItem36
			//
			this.layoutControlItem36.Control = this.txt_zQty;
			this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
			this.layoutControlItem36.Name = "layoutControlItem36";
			this.layoutControlItem36.Size = new System.Drawing.Size(310, 32);
			this.layoutControlItem36.Text = "工单总量";
			this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
			//
			// gcMx2
			//
			this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
			this.gcMx2.Location = new System.Drawing.Point(0, 82);
			this.gcMx2.Location = new System.Drawing.Point(0, 0);
			this.gcMx2.MainView = this.gvMx2;
			this.gcMx2.Name = "gcMx2";
			this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
			this.repositoryItemButtonEdit1});
			this.gcMx2.Size = new System.Drawing.Size(1265, 399);
			this.gcMx2.Size = new System.Drawing.Size(1265, 386);
			this.gcMx2.TabIndex = 0;
			this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
			this.gvMx2});
			@@ -1999,6 +2300,7 @@
			this.gvMx2.Name = "gvMx2";
			this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
			this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
			this.gvMx2.OptionsView.ShowFooter = true;
			this.gvMx2.OptionsView.ShowGroupPanel = false;
			//
			// gvMx2guid
			@@ -2052,6 +2354,8 @@
			this.gvMx2quantity.FieldName = "quantity";
			this.gvMx2quantity.MinWidth = 50;
			this.gvMx2quantity.Name = "gvMx2quantity";
			this.gvMx2quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
			new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计：{0:0.##}")});
			this.gvMx2quantity.Tag = "query_a.QUANTITY";
			this.gvMx2quantity.Visible = true;
			this.gvMx2quantity.VisibleIndex = 3;
			@@ -2196,239 +2500,6 @@
			this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
			this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
			//
			// panMx99
			//
			this.panMx99.Controls.Add(this.layoutMx99);
			this.panMx99.Dock = System.Windows.Forms.DockStyle.Top;
			this.panMx99.Location = new System.Drawing.Point(0, 0);
			this.panMx99.Name = "panMx99";
			this.panMx99.Size = new System.Drawing.Size(1265, 82);
			this.panMx99.TabIndex = 1;
			//
			// layoutMx99
			//
			this.layoutMx99.Controls.Add(this.radOut);
			this.layoutMx99.Controls.Add(this.ucBtnPrint1);
			this.layoutMx99.Controls.Add(this.txt_iCount_1);
			this.layoutMx99.Controls.Add(this.txt_psnQty_1);
			this.layoutMx99.Controls.Add(this.txt_printRemark);
			this.layoutMx99.Controls.Add(this.txt_kQty);
			this.layoutMx99.Controls.Add(this.txt_yQty);
			this.layoutMx99.Controls.Add(this.txt_zQty);
			this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
			this.layoutMx99.Location = new System.Drawing.Point(0, 0);
			this.layoutMx99.Name = "layoutMx99";
			this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(256, 530, 812, 500);
			this.layoutMx99.Root = this.layoutControlGroup1;
			this.layoutMx99.Size = new System.Drawing.Size(1265, 82);
			this.layoutMx99.TabIndex = 0;
			this.layoutMx99.Text = "layoutControl1";
			//
			// radOut
			//
			this.radOut.Location = new System.Drawing.Point(853, 10);
			this.radOut.Margin = new System.Windows.Forms.Padding(0);
			this.radOut.Name = "radOut";
			this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
			this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全自动"),
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "半自动"),
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动")});
			this.radOut.Size = new System.Drawing.Size(248, 31);
			this.radOut.StyleController = this.layoutMx99;
			this.radOut.TabIndex = 473;
			//
			// ucBtnPrint1
			//
			this.ucBtnPrint1.guidKey = null;
			this.ucBtnPrint1.Location = new System.Drawing.Point(851, 41);
			this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
			this.ucBtnPrint1.Name = "ucBtnPrint1";
			this.ucBtnPrint1.rptParameter = null;
			this.ucBtnPrint1.Size = new System.Drawing.Size(278, 31);
			this.ucBtnPrint1.TabIndex = 464;
			//
			// txt_iCount_1
			//
			this.txt_iCount_1.Location = new System.Drawing.Point(659, 43);
			this.txt_iCount_1.Name = "txt_iCount_1";
			this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
			this.txt_iCount_1.Properties.ReadOnly = true;
			this.txt_iCount_1.Size = new System.Drawing.Size(189, 24);
			this.txt_iCount_1.StyleController = this.layoutMx99;
			this.txt_iCount_1.TabIndex = 332;
			this.txt_iCount_1.Tag = "readOnly-1";
			//
			// txt_psnQty_1
			//
			this.txt_psnQty_1.Location = new System.Drawing.Point(659, 12);
			this.txt_psnQty_1.Name = "txt_psnQty_1";
			this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
			this.txt_psnQty_1.Size = new System.Drawing.Size(189, 24);
			this.txt_psnQty_1.StyleController = this.layoutMx99;
			this.txt_psnQty_1.TabIndex = 330;
			this.txt_psnQty_1.Tag = "readOnly-1";
			//
			// txt_printRemark
			//
			this.txt_printRemark.Location = new System.Drawing.Point(379, 43);
			this.txt_printRemark.Name = "txt_printRemark";
			this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
			this.txt_printRemark.Size = new System.Drawing.Size(189, 24);
			this.txt_printRemark.StyleController = this.layoutMx99;
			this.txt_printRemark.TabIndex = 334;
			this.txt_printRemark.Tag = "readOnly-1";
			//
			// txt_kQty
			//
			this.txt_kQty.EditValue = "";
			this.txt_kQty.Location = new System.Drawing.Point(379, 12);
			this.txt_kQty.Name = "txt_kQty";
			this.txt_kQty.Properties.Appearance.Options.UseFont = true;
			this.txt_kQty.Properties.ReadOnly = true;
			this.txt_kQty.Size = new System.Drawing.Size(189, 24);
			this.txt_kQty.StyleController = this.layoutMx99;
			this.txt_kQty.TabIndex = 472;
			this.txt_kQty.Tag = "readonly";
			//
			// txt_yQty
			//
			this.txt_yQty.Location = new System.Drawing.Point(99, 43);
			this.txt_yQty.Name = "txt_yQty";
			this.txt_yQty.Properties.Appearance.Options.UseFont = true;
			this.txt_yQty.Properties.ReadOnly = true;
			this.txt_yQty.Size = new System.Drawing.Size(189, 24);
			this.txt_yQty.StyleController = this.layoutMx99;
			this.txt_yQty.TabIndex = 470;
			this.txt_yQty.Tag = "readonly";
			//
			// txt_zQty
			//
			this.txt_zQty.Location = new System.Drawing.Point(99, 12);
			this.txt_zQty.Name = "txt_zQty";
			this.txt_zQty.Properties.ReadOnly = true;
			this.txt_zQty.Size = new System.Drawing.Size(189, 24);
			this.txt_zQty.StyleController = this.layoutMx99;
			this.txt_zQty.TabIndex = 474;
			//
			// layoutControlGroup1
			//
			this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			this.layoutControlGroup1.GroupBordersVisible = false;
			this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
			this.layoutControlItem23,
			this.layoutControlItem25,
			this.layoutControlItem35,
			this.layoutControlItem26,
			this.layoutControlItem22,
			this.layoutControlItem36,
			this.layoutControlItem21,
			this.layoutControlItem24});
			this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
			this.layoutControlGroup1.Name = "Root";
			columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition5.Width = 100D;
			columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition6.Width = 100D;
			columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition7.Width = 100D;
			columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition8.Width = 100D;
			columnDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize;
			columnDefinition9.Width = 125D;
			this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
			columnDefinition5,
			columnDefinition6,
			columnDefinition7,
			columnDefinition8,
			columnDefinition9});
			rowDefinition7.Height = 100D;
			rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
			rowDefinition8.Height = 100D;
			rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
			this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
			rowDefinition7,
			rowDefinition8});
			this.layoutControlGroup1.Size = new System.Drawing.Size(1265, 82);
			this.layoutControlGroup1.TextVisible = false;
			//
			// layoutControlItem23
			//
			this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem23.Control = this.txt_kQty;
			this.layoutControlItem23.Location = new System.Drawing.Point(280, 0);
			this.layoutControlItem23.Name = "layoutControlItem23";
			this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem23.Size = new System.Drawing.Size(280, 31);
			this.layoutControlItem23.Text = "可打印数量";
			this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem25
			//
			this.layoutControlItem25.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem25.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem25.Control = this.txt_iCount_1;
			this.layoutControlItem25.Location = new System.Drawing.Point(560, 31);
			this.layoutControlItem25.Name = "layoutControlItem25";
			this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem25.Size = new System.Drawing.Size(280, 31);
			this.layoutControlItem25.Text = "打印张数";
			this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem35
			//
			this.layoutControlItem35.Control = this.radOut;
			this.layoutControlItem35.Location = new System.Drawing.Point(840, 0);
			this.layoutControlItem35.MaxSize = new System.Drawing.Size(251, 0);
			this.layoutControlItem35.MinSize = new System.Drawing.Size(221, 20);
			this.layoutControlItem35.Name = "layoutControlItem35";
			this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem35.OptionsTableLayoutItem.ColumnSpan = 2;
			this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
			this.layoutControlItem35.Size = new System.Drawing.Size(405, 31);
			this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
			this.layoutControlItem35.Text = "自动计算";
			this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem35.TextVisible = false;
			//
			// layoutControlItem26
			//
			this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem26.Control = this.ucBtnPrint1;
			this.layoutControlItem26.Location = new System.Drawing.Point(840, 31);
			this.layoutControlItem26.Name = "layoutControlItem26";
			this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
			this.layoutControlItem26.Size = new System.Drawing.Size(280, 31);
			this.layoutControlItem26.Text = "报工打印";
			this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem26.TextVisible = false;
			//
			// layoutControlItem22
			//
			this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem22.Control = this.txt_yQty;
			this.layoutControlItem22.Location = new System.Drawing.Point(0, 31);
			this.layoutControlItem22.Name = "layoutControlItem22";
			this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem22.Size = new System.Drawing.Size(280, 31);
			this.layoutControlItem22.Text = "已打印数量";
			this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem36
			//
			this.layoutControlItem36.Control = this.txt_zQty;
			this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
			this.layoutControlItem36.Name = "layoutControlItem36";
			this.layoutControlItem36.Size = new System.Drawing.Size(280, 31);
			this.layoutControlItem36.Text = "工单总量";
			this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
			//
			// xtraTabPage3
			//
			this.xtraTabPage3.Controls.Add(this.gcMx3);
			@@ -2467,6 +2538,7 @@
			this.gvMx3.Name = "gvMx3";
			this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
			this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
			this.gvMx3.OptionsView.ShowFooter = true;
			this.gvMx3.OptionsView.ShowGroupPanel = false;
			//
			// gridColumn33
			@@ -2510,6 +2582,8 @@
			this.gridColumn37.FieldName = "quantity";
			this.gridColumn37.MinWidth = 50;
			this.gridColumn37.Name = "gridColumn37";
			this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
			new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计：{0:0.##}")});
			this.gridColumn37.Tag = "query_a.QUANTITY";
			this.gridColumn37.Visible = true;
			this.gridColumn37.VisibleIndex = 2;
			@@ -2651,10 +2725,6 @@
			this.layoutControlItem37});
			this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
			this.layoutControlGroup2.Name = "Root";
			columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition10.Width = 100D;
			columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition11.Width = 100D;
			columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition12.Width = 100D;
			columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
			@@ -2663,17 +2733,21 @@
			columnDefinition14.Width = 100D;
			columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition15.Width = 100D;
			columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition16.Width = 100D;
			columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition17.Width = 100D;
			this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
			columnDefinition10,
			columnDefinition11,
			columnDefinition12,
			columnDefinition13,
			columnDefinition14,
			columnDefinition15});
			rowDefinition9.Height = 100D;
			rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
			columnDefinition15,
			columnDefinition16,
			columnDefinition17});
			rowDefinition10.Height = 100D;
			rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
			this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
			rowDefinition9});
			rowDefinition10});
			this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54);
			this.layoutControlGroup2.TextVisible = false;
			//
			@@ -2776,6 +2850,7 @@
			this.gvMx4.Name = "gvMx4";
			this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
			this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
			this.gvMx4.OptionsView.ShowFooter = true;
			this.gvMx4.OptionsView.ShowGroupPanel = false;
			//
			// gridColumn39
			@@ -2819,6 +2894,8 @@
			this.gridColumn44.FieldName = "quantity";
			this.gridColumn44.MinWidth = 50;
			this.gridColumn44.Name = "gridColumn44";
			this.gridColumn44.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
			new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计：{0:0.##}")});
			this.gridColumn44.Tag = "query_a.QUANTITY";
			this.gridColumn44.Visible = true;
			this.gridColumn44.VisibleIndex = 2;
			@@ -2886,32 +2963,6 @@
			this.ucBtnPrint100.rptParameter = null;
			this.ucBtnPrint100.Size = new System.Drawing.Size(232, 32);
			this.ucBtnPrint100.TabIndex = 0;
			//
			// layoutControlItem21
			//
			this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem21.Control = this.txt_printRemark;
			this.layoutControlItem21.Location = new System.Drawing.Point(280, 31);
			this.layoutControlItem21.Name = "layoutControlItem21";
			this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
			this.layoutControlItem21.Text = "打印备注";
			this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem24
			//
			this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
			this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
			this.layoutControlItem24.Control = this.txt_psnQty_1;
			this.layoutControlItem24.CustomizationFormText = "内包装数量";
			this.layoutControlItem24.Location = new System.Drawing.Point(560, 0);
			this.layoutControlItem24.Name = "layoutControlItem24";
			this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
			this.layoutControlItem24.Text = "内包装数量";
			this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
			//
			// Frm_Womdaa
			//
			@@ -2993,14 +3044,22 @@
			((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
			this.tabMxPage2.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
			this.panMx99.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).EndInit();
			this.splitMx99.Panel1.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel2)).EndInit();
			this.splitMx99.Panel2.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.splitMx99)).EndInit();
			this.splitMx99.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).EndInit();
			this.layoutMx99.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layShuLiang)).EndInit();
			this.layShuLiang.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
			@@ -3008,11 +3067,16 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
			this.xtraTabPage3.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
			@@ -3035,8 +3099,6 @@
			((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
			this.panMx100.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
			this.ResumeLayout(false);

			}
			@@ -3050,10 +3112,7 @@
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
			private DevExpress.XtraGrid.Columns.GridColumn gv_daa027;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
			private DevExpress.XtraGrid.Columns.GridColumn gv_daa018;
			@@ -3071,7 +3130,6 @@
			private DevExpress.XtraGrid.Columns.GridColumn gv_cust;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
			private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
			private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
			private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
			private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
			@@ -3182,7 +3240,6 @@
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
			private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
			private System.Windows.Forms.Panel panMx99;
			private DevExpress.XtraLayout.LayoutControl layoutMx99;
			private DevExpress.XtraEditors.TextEdit txt_printRemark;
			private DevExpress.XtraEditors.TextEdit txt_kQty;
			@@ -3190,7 +3247,6 @@
			private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
			private UserControl.UcBtnPrint ucBtnPrint1;
			private DevExpress.XtraEditors.TextEdit txt_iCount_1;
			private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
			@@ -3221,7 +3277,6 @@
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
			private DevExpress.XtraEditors.RadioGroup radOut;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
			private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
			@@ -3239,7 +3294,6 @@
			private UserControl.UcBtnPrint ucBtnPrint100;
			private DevExpress.XtraEditors.TextEdit txt_zQty;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
			private DevExpress.XtraEditors.TextEdit txt_zQty98;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
			@@ -3249,5 +3303,14 @@
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
			private DevExpress.XtraDataLayout.DataLayoutControl layShuLiang;
			private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
			private DevExpress.XtraEditors.TextEdit txt_iCount_1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
			private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
			private DevExpress.XtraEditors.SplitContainerControl splitMx99;
			}
			}