龙巍PC前端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
kyy
2025-08-25 21dba91c0a8056a25bd428a390f5f20b731e2556 
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaahb.Designer.cs


@@ -49,54 +49,76 @@


            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();


            this.gcMain1 = new DevExpress.XtraGrid.GridControl();


            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();


            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();


            this.repositoryItemCheckEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();


            this.pageBar1 = new UserControls.Data.UcPageBar();


            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();


            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();


            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();


            this.txt_daahb015 = new Gs.DevApp.UserControl.UcLookWorkline();


            this.lbGuid = new System.Windows.Forms.Label();


            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();


            this.txt_daahb013 = new Gs.DevApp.UserControl.UcLookWorkshop();


            this.txt_erpId = new Gs.DevApp.UserControl.UcLookOrg();


            this.txt_daahb001 = new DevExpress.XtraEditors.TextEdit();


            this.txt_daahb009 = new DevExpress.XtraEditors.TextEdit();


            this.txt_createByName = new DevExpress.XtraEditors.TextEdit();


            this.txt_cjr = new DevExpress.XtraEditors.TextEdit();


            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();


            this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();


            this.txt_gds = new DevExpress.XtraEditors.TextEdit();


            this.txt_hbsl = new DevExpress.XtraEditors.TextEdit();


            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();


            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();


            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();


            this.tabMx = new DevExpress.XtraTab.XtraTabControl();


            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();


            this.gcMx1 = new DevExpress.XtraGrid.GridControl();


            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();


            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();


            this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa006 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa016 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();


            this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();


            this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa006 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();


            this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa007 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa009 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();


            this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa017 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1daa019 = new DevExpress.XtraGrid.Columns.GridColumn();


@@ -114,26 +136,21 @@


            this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();


            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();


            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();


            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();


            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();


            this.gcMx2 = new DevExpress.XtraGrid.GridControl();


            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();


            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.picCheckBox = new System.Windows.Forms.PictureBox();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();


            this.txt_gdsl = new DevExpress.XtraEditors.TextEdit();


            this.txt_daahb015 = new Gs.DevApp.UserControl.UcLookWorkline();


            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();


            this.txt_hbds = new DevExpress.XtraEditors.TextEdit();


            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -144,6 +161,8 @@


            this.split1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).BeginInit();


            this.xtraTabPage2.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();


@@ -155,12 +174,24 @@


            this.layoutMx1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.txt_daahb001.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_daahb009.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_cjr.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_gds.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_hbsl.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();


            this.tabMx.SuspendLayout();


            this.tabMxPage1.SuspendLayout();


@@ -174,19 +205,10 @@


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();


            this.xtraTabPage3.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_gdsl.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_hbds.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();


            this.SuspendLayout();


            // 


            // toolBarMenu1


@@ -258,6 +280,9 @@


            this.gcMain1.MainView = this.gridView1;


            this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.gcMain1.Name = "gcMain1";


            this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {


            this.repositoryItemCheckEdit1,


            this.repositoryItemCheckEdit2});


            this.gcMain1.Size = new System.Drawing.Size(985, 402);


            this.gcMain1.TabIndex = 2;


            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


@@ -270,15 +295,20 @@


            this.gridView1.Appearance.Row.Options.UseFont = true;


            this.gridView1.ColumnPanelRowHeight = 39;


            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.gridColumn7,


            this.gv_fstatus,


            this.gridColumn4,


            this.gridColumn1,


            this.gridColumn2,


            this.gv_checkUser,


            this.gv_checkDate,


            this.gv_pba005,


            this.gv_pba006,


            this.gridColumn8,


            this.gridColumn1,


            this.gv_pba009,


            this.gv_checkDate,


            this.gv_checkUser,


            this.gv_pba006,


            this.gv_pba005,


            this.gridColumn9,


            this.gridColumn11,


            this.gridColumn10,


            this.gridColumn4,


            this.gridColumn5});


            this.gridView1.DetailHeight = 272;


            this.gridView1.GridControl = this.gcMain1;


@@ -288,64 +318,76 @@


            this.gridView1.OptionsView.ShowAutoFilterRow = true;


            this.gridView1.OptionsView.ShowGroupPanel = false;


            // 


            // gridColumn7


            // 


            this.gridColumn7.AppearanceCell.Options.UseFont = true;


            this.gridColumn7.Caption = "发料完成标识";


            this.gridColumn7.FieldName = "completeStatus2";


            this.gridColumn7.MaxWidth = 44;


            this.gridColumn7.MinWidth = 44;


            this.gridColumn7.Name = "gridColumn7";


            this.gridColumn7.Tag = "query_a.complete_status";


            this.gridColumn7.Visible = true;


            this.gridColumn7.VisibleIndex = 12;


            this.gridColumn7.Width = 44;


            // 


            // gv_fstatus


            // 


            this.gv_fstatus.AppearanceCell.Options.UseFont = true;


            this.gv_fstatus.Caption = "审核标识";


            this.gv_fstatus.FieldName = "fstatus";


            this.gv_fstatus.FieldName = "fstatus2";


            this.gv_fstatus.MaxWidth = 44;


            this.gv_fstatus.MinWidth = 44;


            this.gv_fstatus.Name = "gv_fstatus";


            this.gv_fstatus.OptionsColumn.AllowEdit = false;


            this.gv_fstatus.Tag = "query_a.fstatus";


            this.gv_fstatus.Tag = "query_a.fstatus1";


            this.gv_fstatus.Visible = true;


            this.gv_fstatus.VisibleIndex = 0;


            this.gv_fstatus.Width = 44;


            // 


            // gridColumn4


            // gridColumn2


            // 


            this.gridColumn4.Caption = "生产组织";


            this.gridColumn4.FieldName = "fSubsidiary";


            this.gridColumn4.MinWidth = 17;


            this.gridColumn4.Name = "gridColumn4";


            this.gridColumn4.Tag = "org.fnamber";


            this.gridColumn4.Visible = true;


            this.gridColumn4.VisibleIndex = 1;


            this.gridColumn4.Width = 219;


            this.gridColumn2.Caption = "合并单号";


            this.gridColumn2.FieldName = "daahb001";


            this.gridColumn2.MinWidth = 17;


            this.gridColumn2.Name = "gridColumn2";


            this.gridColumn2.OptionsColumn.AllowEdit = false;


            this.gridColumn2.Tag = "query_a.daahb001";


            this.gridColumn2.Visible = true;


            this.gridColumn2.VisibleIndex = 1;


            this.gridColumn2.Width = 86;


            // 


            // gridColumn8


            // 


            this.gridColumn8.Caption = "车间编号";


            this.gridColumn8.FieldName = "daahb013";


            this.gridColumn8.Name = "gridColumn8";


            this.gridColumn8.Visible = true;


            this.gridColumn8.VisibleIndex = 2;


            this.gridColumn8.Width = 49;


            // 


            // gridColumn1


            // 


            this.gridColumn1.Caption = "车间名称";


            this.gridColumn1.FieldName = "dptName";


            this.gridColumn1.FieldName = "daahb013Name";


            this.gridColumn1.MinWidth = 22;


            this.gridColumn1.Name = "gridColumn1";


            this.gridColumn1.Visible = true;


            this.gridColumn1.VisibleIndex = 2;


            this.gridColumn1.Width = 82;


            this.gridColumn1.VisibleIndex = 3;


            this.gridColumn1.Width = 54;


            // 


            // gridColumn2


            // gv_pba009


            // 


            this.gridColumn2.Caption = "合并单号";


            this.gridColumn2.FieldName = "hNo";


            this.gridColumn2.MinWidth = 17;


            this.gridColumn2.Name = "gridColumn2";


            this.gridColumn2.OptionsColumn.AllowEdit = false;


            this.gridColumn2.Visible = true;


            this.gridColumn2.VisibleIndex = 3;


            this.gridColumn2.Width = 131;


            // 


            // gv_checkUser


            // 


            this.gv_checkUser.AppearanceCell.Options.UseFont = true;


            this.gv_checkUser.Caption = "审核人";


            this.gv_checkUser.FieldName = "checkUser";


            this.gv_checkUser.MinWidth = 17;


            this.gv_checkUser.Name = "gv_checkUser";


            this.gv_checkUser.OptionsColumn.AllowEdit = false;


            this.gv_checkUser.Tag = "query_a.check_user";


            this.gv_checkUser.Visible = true;


            this.gv_checkUser.VisibleIndex = 4;


            this.gv_checkUser.Width = 82;


            this.gv_pba009.AppearanceCell.Options.UseFont = true;


            this.gv_pba009.Caption = "备注";


            this.gv_pba009.FieldName = "daah009";


            this.gv_pba009.MinWidth = 17;


            this.gv_pba009.Name = "gv_pba009";


            this.gv_pba009.OptionsColumn.AllowEdit = false;


            this.gv_pba009.Tag = "query_a.daah009";


            this.gv_pba009.Visible = true;


            this.gv_pba009.VisibleIndex = 4;


            this.gv_pba009.Width = 124;


            // 


            // gv_checkDate


            // 


@@ -358,46 +400,85 @@


            this.gv_checkDate.Tag = "query_a.check_date";


            this.gv_checkDate.Visible = true;


            this.gv_checkDate.VisibleIndex = 5;


            this.gv_checkDate.Width = 157;


            this.gv_checkDate.Width = 91;


            // 


            // gv_pba005


            // gv_checkUser


            // 


            this.gv_pba005.AppearanceCell.Options.UseFont = true;


            this.gv_pba005.Caption = "创建人";


            this.gv_pba005.FieldName = "pba005";


            this.gv_pba005.MinWidth = 17;


            this.gv_pba005.Name = "gv_pba005";


            this.gv_pba005.OptionsColumn.AllowEdit = false;


            this.gv_pba005.Tag = "query_a.pba005";


            this.gv_pba005.Visible = true;


            this.gv_pba005.VisibleIndex = 6;


            this.gv_pba005.Width = 82;


            this.gv_checkUser.AppearanceCell.Options.UseFont = true;


            this.gv_checkUser.Caption = "审核人";


            this.gv_checkUser.FieldName = "shr";


            this.gv_checkUser.MinWidth = 17;


            this.gv_checkUser.Name = "gv_checkUser";


            this.gv_checkUser.OptionsColumn.AllowEdit = false;


            this.gv_checkUser.Tag = "query_a.check_user";


            this.gv_checkUser.Visible = true;


            this.gv_checkUser.VisibleIndex = 6;


            this.gv_checkUser.Width = 47;


            // 


            // gv_pba006


            // 


            this.gv_pba006.AppearanceCell.Options.UseFont = true;


            this.gv_pba006.Caption = "创建时间";


            this.gv_pba006.FieldName = "pba006";


            this.gv_pba006.FieldName = "createDate";


            this.gv_pba006.MinWidth = 17;


            this.gv_pba006.Name = "gv_pba006";


            this.gv_pba006.OptionsColumn.AllowEdit = false;


            this.gv_pba006.Tag = "query_a.pba006";


            this.gv_pba006.Visible = true;


            this.gv_pba006.VisibleIndex = 7;


            this.gv_pba006.Width = 157;


            this.gv_pba006.Width = 91;


            // 


            // gv_pba009


            // gv_pba005


            // 


            this.gv_pba009.AppearanceCell.Options.UseFont = true;


            this.gv_pba009.Caption = "备注";


            this.gv_pba009.FieldName = "pba009";


            this.gv_pba009.MinWidth = 17;


            this.gv_pba009.Name = "gv_pba009";


            this.gv_pba009.OptionsColumn.AllowEdit = false;


            this.gv_pba009.Tag = "query_a.pba009";


            this.gv_pba009.Visible = true;


            this.gv_pba009.VisibleIndex = 8;


            this.gv_pba009.Width = 87;


            this.gv_pba005.AppearanceCell.Options.UseFont = true;


            this.gv_pba005.Caption = "创建人";


            this.gv_pba005.FieldName = "cjr";


            this.gv_pba005.MinWidth = 17;


            this.gv_pba005.Name = "gv_pba005";


            this.gv_pba005.OptionsColumn.AllowEdit = false;


            this.gv_pba005.Tag = "query_a.pba005";


            this.gv_pba005.Visible = true;


            this.gv_pba005.VisibleIndex = 8;


            this.gv_pba005.Width = 47;


            // 


            // gridColumn9


            // 


            this.gridColumn9.Caption = "销售订单";


            this.gridColumn9.FieldName = "salesOrder";


            this.gridColumn9.Name = "gridColumn9";


            this.gridColumn9.Tag = "query_a.ssales_order";


            this.gridColumn9.Visible = true;


            this.gridColumn9.VisibleIndex = 9;


            this.gridColumn9.Width = 42;


            // 


            // gridColumn11


            // 


            this.gridColumn11.Caption = "工单总数";


            this.gridColumn11.FieldName = "gds";


            this.gridColumn11.Name = "gridColumn11";


            this.gridColumn11.Visible = true;


            this.gridColumn11.VisibleIndex = 10;


            this.gridColumn11.Width = 42;


            // 


            // gridColumn10


            // 


            this.gridColumn10.Caption = "合并数量";


            this.gridColumn10.FieldName = "hbsl";


            this.gridColumn10.Name = "gridColumn10";


            this.gridColumn10.Visible = true;


            this.gridColumn10.VisibleIndex = 11;


            this.gridColumn10.Width = 42;


            // 


            // gridColumn4


            // 


            this.gridColumn4.Caption = "归属组织";


            this.gridColumn4.FieldName = "fSubsidiary";


            this.gridColumn4.MinWidth = 17;


            this.gridColumn4.Name = "gridColumn4";


            this.gridColumn4.Tag = "org.fnamber";


            this.gridColumn4.Visible = true;


            this.gridColumn4.VisibleIndex = 13;


            this.gridColumn4.Width = 131;


            // 


            // gridColumn5


            // 


@@ -406,6 +487,16 @@


            this.gridColumn5.MinWidth = 22;


            this.gridColumn5.Name = "gridColumn5";


            this.gridColumn5.Width = 82;


            // 


            // repositoryItemCheckEdit1


            // 


            this.repositoryItemCheckEdit1.AutoHeight = false;


            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";


            // 


            // repositoryItemCheckEdit2


            // 


            this.repositoryItemCheckEdit2.AutoHeight = false;


            this.repositoryItemCheckEdit2.Name = "repositoryItemCheckEdit2";


            // 


            // pageBar1


            // 


@@ -458,11 +549,11 @@


            this.layoutMx1.Controls.Add(this.txt_erpId);


            this.layoutMx1.Controls.Add(this.txt_daahb001);


            this.layoutMx1.Controls.Add(this.txt_daahb009);


            this.layoutMx1.Controls.Add(this.txt_createByName);


            this.layoutMx1.Controls.Add(this.txt_cjr);


            this.layoutMx1.Controls.Add(this.txt_createDate);


            this.layoutMx1.Controls.Add(this.txt_fstatus);


            this.layoutMx1.Controls.Add(this.txt_gdsl);


            this.layoutMx1.Controls.Add(this.txt_hbds);


            this.layoutMx1.Controls.Add(this.txt_gds);


            this.layoutMx1.Controls.Add(this.txt_hbsl);


            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {


            this.layoutControlItem9});


@@ -474,6 +565,15 @@


            this.layoutMx1.Size = new System.Drawing.Size(985, 176);


            this.layoutMx1.TabIndex = 0;


            this.layoutMx1.Text = "layoutControl1";


            // 


            // txt_daahb015


            // 


            this.txt_daahb015.IsReadly = false;


            this.txt_daahb015.Location = new System.Drawing.Point(317, 64);


            this.txt_daahb015.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_daahb015.Name = "txt_daahb015";


            this.txt_daahb015.Size = new System.Drawing.Size(173, 20);


            this.txt_daahb015.TabIndex = 463;


            // 


            // lbGuid


            // 


@@ -487,78 +587,78 @@


            // btnSelect


            // 


            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;


            this.btnSelect.Location = new System.Drawing.Point(11, 116);


            this.btnSelect.Location = new System.Drawing.Point(12, 116);


            this.btnSelect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.btnSelect.Name = "btnSelect";


            this.btnSelect.Size = new System.Drawing.Size(88, 20);


            this.btnSelect.StyleController = this.layoutMx1;


            this.btnSelect.TabIndex = 456;


            this.btnSelect.Text = "选取投料单";


            this.btnSelect.Text = "选取工单";


            // 


            // txt_daahb013


            // 


            this.txt_daahb013.IsReadly = false;


            this.txt_daahb013.Location = new System.Drawing.Point(73, 63);


            this.txt_daahb013.Location = new System.Drawing.Point(76, 64);


            this.txt_daahb013.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_daahb013.Name = "txt_daahb013";


            this.txt_daahb013.Size = new System.Drawing.Size(175, 20);


            this.txt_daahb013.Size = new System.Drawing.Size(173, 20);


            this.txt_daahb013.TabIndex = 459;


            // 


            // txt_erpId


            // 


            this.txt_erpId.IsReadly = false;


            this.txt_erpId.Location = new System.Drawing.Point(73, 10);


            this.txt_erpId.Location = new System.Drawing.Point(76, 12);


            this.txt_erpId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_erpId.Name = "txt_erpId";


            this.txt_erpId.Size = new System.Drawing.Size(175, 20);


            this.txt_erpId.Size = new System.Drawing.Size(173, 20);


            this.txt_erpId.TabIndex = 460;


            // 


            // txt_daahb001


            // 


            this.txt_daahb001.Location = new System.Drawing.Point(314, 10);


            this.txt_daahb001.Location = new System.Drawing.Point(317, 12);


            this.txt_daahb001.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_daahb001.Name = "txt_daahb001";


            this.txt_daahb001.Properties.Appearance.Options.UseFont = true;


            this.txt_daahb001.Size = new System.Drawing.Size(176, 20);


            this.txt_daahb001.Size = new System.Drawing.Size(173, 20);


            this.txt_daahb001.StyleController = this.layoutMx1;


            this.txt_daahb001.TabIndex = 458;


            this.txt_daahb001.Tag = "readonly";


            // 


            // txt_daahb009


            // 


            this.txt_daahb009.Location = new System.Drawing.Point(314, 116);


            this.txt_daahb009.Location = new System.Drawing.Point(317, 116);


            this.txt_daahb009.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_daahb009.Name = "txt_daahb009";


            this.txt_daahb009.Properties.Appearance.Options.UseFont = true;


            this.txt_daahb009.Size = new System.Drawing.Size(418, 20);


            this.txt_daahb009.Size = new System.Drawing.Size(414, 20);


            this.txt_daahb009.StyleController = this.layoutMx1;


            this.txt_daahb009.TabIndex = 240;


            // 


            // txt_createByName


            // txt_cjr


            // 


            this.txt_createByName.Location = new System.Drawing.Point(798, 63);


            this.txt_createByName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_createByName.Name = "txt_createByName";


            this.txt_createByName.Properties.Appearance.Options.UseFont = true;


            this.txt_createByName.Size = new System.Drawing.Size(176, 20);


            this.txt_createByName.StyleController = this.layoutMx1;


            this.txt_createByName.TabIndex = 273;


            this.txt_createByName.Tag = "readonly";


            this.txt_cjr.Location = new System.Drawing.Point(799, 64);


            this.txt_cjr.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_cjr.Name = "txt_cjr";


            this.txt_cjr.Properties.Appearance.Options.UseFont = true;


            this.txt_cjr.Size = new System.Drawing.Size(174, 20);


            this.txt_cjr.StyleController = this.layoutMx1;


            this.txt_cjr.TabIndex = 273;


            this.txt_cjr.Tag = "readonly";


            // 


            // txt_createDate


            // 


            this.txt_createDate.Location = new System.Drawing.Point(556, 63);


            this.txt_createDate.Location = new System.Drawing.Point(558, 64);


            this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_createDate.Name = "txt_createDate";


            this.txt_createDate.Properties.Appearance.Options.UseFont = true;


            this.txt_createDate.Size = new System.Drawing.Size(176, 20);


            this.txt_createDate.Size = new System.Drawing.Size(173, 20);


            this.txt_createDate.StyleController = this.layoutMx1;


            this.txt_createDate.TabIndex = 267;


            this.txt_createDate.Tag = "readonly";


            // 


            // txt_fstatus


            // 


            this.txt_fstatus.Location = new System.Drawing.Point(736, 116);


            this.txt_fstatus.Location = new System.Drawing.Point(735, 116);


            this.txt_fstatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_fstatus.Name = "txt_fstatus";


            this.txt_fstatus.Properties.Caption = "审核状态";


@@ -566,6 +666,22 @@


            this.txt_fstatus.StyleController = this.layoutMx1;


            this.txt_fstatus.TabIndex = 461;


            this.txt_fstatus.Tag = "readonly";


            // 


            // txt_gds


            // 


            this.txt_gds.Location = new System.Drawing.Point(558, 12);


            this.txt_gds.Name = "txt_gds";


            this.txt_gds.Size = new System.Drawing.Size(173, 20);


            this.txt_gds.StyleController = this.layoutMx1;


            this.txt_gds.TabIndex = 462;


            // 


            // txt_hbsl


            // 


            this.txt_hbsl.Location = new System.Drawing.Point(799, 12);


            this.txt_hbsl.Name = "txt_hbsl";


            this.txt_hbsl.Size = new System.Drawing.Size(174, 20);


            this.txt_hbsl.StyleController = this.layoutMx1;


            this.txt_hbsl.TabIndex = 464;


            // 


            // layoutControlItem9


            // 


@@ -626,16 +742,123 @@


            // layoutControlItem8


            // 


            this.layoutControlItem8.Control = this.btnSelect;


            this.layoutControlItem8.Location = new System.Drawing.Point(0, 106);


            this.layoutControlItem8.Location = new System.Drawing.Point(0, 104);


            this.layoutControlItem8.MaxSize = new System.Drawing.Size(92, 24);


            this.layoutControlItem8.MinSize = new System.Drawing.Size(92, 24);


            this.layoutControlItem8.Name = "layoutControlItem8";


            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem8.Size = new System.Drawing.Size(241, 54);


            this.layoutControlItem8.Size = new System.Drawing.Size(241, 52);


            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;


            this.layoutControlItem8.Text = "选择投料单";


            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem8.TextVisible = false;


            // 


            // layoutControlItem7


            // 


            this.layoutControlItem7.Control = this.txt_daahb009;


            this.layoutControlItem7.Location = new System.Drawing.Point(241, 104);


            this.layoutControlItem7.Name = "layoutControlItem7";


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;


            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem7.Size = new System.Drawing.Size(482, 52);


            this.layoutControlItem7.Text = "备注";


            this.layoutControlItem7.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem4


            // 


            this.layoutControlItem4.Control = this.txt_daahb013;


            this.layoutControlItem4.Location = new System.Drawing.Point(0, 52);


            this.layoutControlItem4.Name = "layoutControlItem4";


            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem4.Size = new System.Drawing.Size(241, 52);


            this.layoutControlItem4.Text = "工作车间";


            this.layoutControlItem4.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem1


            // 


            this.layoutControlItem1.Control = this.txt_erpId;


            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);


            this.layoutControlItem1.Name = "layoutControlItem1";


            this.layoutControlItem1.Size = new System.Drawing.Size(241, 52);


            this.layoutControlItem1.Text = "生产组织";


            this.layoutControlItem1.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem2


            // 


            this.layoutControlItem2.Control = this.txt_daahb001;


            this.layoutControlItem2.CustomizationFormText = "合并单号";


            this.layoutControlItem2.Location = new System.Drawing.Point(241, 0);


            this.layoutControlItem2.Name = "layoutControlItem2";


            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem2.Size = new System.Drawing.Size(241, 52);


            this.layoutControlItem2.Text = "合并单号";


            this.layoutControlItem2.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem3


            // 


            this.layoutControlItem3.Control = this.txt_createDate;


            this.layoutControlItem3.Location = new System.Drawing.Point(482, 52);


            this.layoutControlItem3.Name = "layoutControlItem3";


            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem3.Size = new System.Drawing.Size(241, 52);


            this.layoutControlItem3.Text = "创建日期 ";


            this.layoutControlItem3.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem5


            // 


            this.layoutControlItem5.Control = this.txt_cjr;


            this.layoutControlItem5.Location = new System.Drawing.Point(723, 52);


            this.layoutControlItem5.Name = "layoutControlItem5";


            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem5.Size = new System.Drawing.Size(242, 52);


            this.layoutControlItem5.Text = "创建人员";


            this.layoutControlItem5.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem10


            // 


            this.layoutControlItem10.Control = this.txt_gds;


            this.layoutControlItem10.Location = new System.Drawing.Point(482, 0);


            this.layoutControlItem10.Name = "layoutControlItem10";


            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem10.Size = new System.Drawing.Size(241, 52);


            this.layoutControlItem10.Text = "工单数量";


            this.layoutControlItem10.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem11


            // 


            this.layoutControlItem11.Control = this.txt_daahb015;


            this.layoutControlItem11.Location = new System.Drawing.Point(241, 52);


            this.layoutControlItem11.Name = "layoutControlItem11";


            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem11.Size = new System.Drawing.Size(241, 52);


            this.layoutControlItem11.Text = "生产线体";


            this.layoutControlItem11.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem6


            // 


            this.layoutControlItem6.Control = this.txt_fstatus;


            this.layoutControlItem6.Location = new System.Drawing.Point(723, 104);


            this.layoutControlItem6.Name = "layoutControlItem6";


            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem6.Size = new System.Drawing.Size(242, 52);


            this.layoutControlItem6.Text = "审核状态";


            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem6.TextVisible = false;


            // 


            // layoutControlItem12


            // 


            this.layoutControlItem12.Control = this.txt_hbsl;


            this.layoutControlItem12.Location = new System.Drawing.Point(723, 0);


            this.layoutControlItem12.Name = "layoutControlItem12";


            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem12.Size = new System.Drawing.Size(242, 52);


            this.layoutControlItem12.Text = "合并数量";


            this.layoutControlItem12.TextSize = new System.Drawing.Size(52, 14);


            // 


            // tabMx


            // 


@@ -685,19 +908,21 @@


            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.gvMx1guid,


            this.caaGuid,


            this.gvMx1daa002,


            this.gvMx1daa010,


            this.gridColumn6,


            this.gvMx1fstatus,


            this.gvMx1daa005,


            this.gvMx1daa003,


            this.gvMx1daa004,


            this.gvMx1daa016,


            this.gvMx1daa018,


            this.gvMx1daa008,


            this.gvMx1daa006,


            this.gvMx1daa016,


            this.gvMx1daa018,


            this.gvMx1daa012,


            this.gvMx1daa002,


            this.gvMx1daa007,


            this.gvMx1daa009,


            this.gvMx1daa011,


            this.gvMx1daa012,


            this.gvMx1reporttime,


            this.gvMx1daa017,


            this.gvMx1daa019,


@@ -714,8 +939,6 @@


            this.gvMx1daa014,


            this.gvMx1machineNo,


            this.gridColumn3,


            this.gvMx1fstatus,


            this.gridColumn6,


            this.gvMxDel});


            this.gvMx1.DetailHeight = 272;


            this.gvMx1.GridControl = this.gcMx1;


@@ -744,19 +967,6 @@


            this.caaGuid.OptionsColumn.ReadOnly = true;


            this.caaGuid.Width = 82;


            // 


            // gvMx1daa002


            // 


            this.gvMx1daa002.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa002.Caption = "工单单号";


            this.gvMx1daa002.FieldName = "daa001";


            this.gvMx1daa002.MinWidth = 44;


            this.gvMx1daa002.Name = "gvMx1daa002";


            this.gvMx1daa002.OptionsColumn.ReadOnly = true;


            this.gvMx1daa002.Tag = "query_a.daa002";


            this.gvMx1daa002.Visible = true;


            this.gvMx1daa002.VisibleIndex = 0;


            this.gvMx1daa002.Width = 44;


            // 


            // gvMx1daa010


            // 


            this.gvMx1daa010.AppearanceCell.Options.UseFont = true;


@@ -770,10 +980,33 @@


            this.gvMx1daa010.VisibleIndex = 1;


            this.gvMx1daa010.Width = 44;


            // 


            // gridColumn6


            // 


            this.gridColumn6.Caption = "序号";


            this.gridColumn6.FieldName = "scheduleOrder";


            this.gridColumn6.MinWidth = 22;


            this.gridColumn6.Name = "gridColumn6";


            this.gridColumn6.Visible = true;


            this.gridColumn6.VisibleIndex = 16;


            this.gridColumn6.Width = 82;


            // 


            // gvMx1fstatus


            // 


            this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;


            this.gvMx1fstatus.Caption = "销售订单";


            this.gvMx1fstatus.FieldName = "caa015";


            this.gvMx1fstatus.MinWidth = 44;


            this.gvMx1fstatus.Name = "gvMx1fstatus";


            this.gvMx1fstatus.OptionsColumn.ReadOnly = true;


            this.gvMx1fstatus.Tag = "query_a.fstatus";


            this.gvMx1fstatus.Visible = true;


            this.gvMx1fstatus.VisibleIndex = 15;


            this.gvMx1fstatus.Width = 66;


            // 


            // gvMx1daa005


            // 


            this.gvMx1daa005.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa005.Caption = "物料编码";


            this.gvMx1daa005.Caption = "产品编码";


            this.gvMx1daa005.FieldName = "itemNo";


            this.gvMx1daa005.MinWidth = 44;


            this.gvMx1daa005.Name = "gvMx1daa005";


@@ -809,62 +1042,10 @@


            this.gvMx1daa004.VisibleIndex = 4;


            this.gvMx1daa004.Width = 44;


            // 


            // gvMx1daa016


            // 


            this.gvMx1daa016.AppearanceCell.ForeColor = System.Drawing.Color.Blue;


            this.gvMx1daa016.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true;


            this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;


            this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true;


            this.gvMx1daa016.Caption = "预计开工日时间";


            this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;


            this.gvMx1daa016.FieldName = "mesStartProd";


            this.gvMx1daa016.MinWidth = 44;


            this.gvMx1daa016.Name = "gvMx1daa016";


            this.gvMx1daa016.Tag = "edit";


            this.gvMx1daa016.Visible = true;


            this.gvMx1daa016.VisibleIndex = 5;


            this.gvMx1daa016.Width = 68;


            // 


            // repositoryItemDateEdit2


            // 


            this.repositoryItemDateEdit2.AutoHeight = false;


            this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";


            // 


            // gvMx1daa018


            // 


            this.gvMx1daa018.AppearanceCell.ForeColor = System.Drawing.Color.Blue;


            this.gvMx1daa018.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa018.AppearanceCell.Options.UseForeColor = true;


            this.gvMx1daa018.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;


            this.gvMx1daa018.AppearanceHeader.Options.UseForeColor = true;


            this.gvMx1daa018.Caption = "预计完工时间";


            this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;


            this.gvMx1daa018.FieldName = "mesEndProd";


            this.gvMx1daa018.MinWidth = 44;


            this.gvMx1daa018.Name = "gvMx1daa018";


            this.gvMx1daa018.Tag = "edit";


            this.gvMx1daa018.Visible = true;


            this.gvMx1daa018.VisibleIndex = 6;


            this.gvMx1daa018.Width = 44;


            // 


            // repositoryItemDateEdit3


            // 


            this.repositoryItemDateEdit3.AutoHeight = false;


            this.repositoryItemDateEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.repositoryItemDateEdit3.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";


            // 


            // gvMx1daa008


            // 


            this.gvMx1daa008.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa008.Caption = "工单总数";


            this.gvMx1daa008.Caption = "工单数量";


            this.gvMx1daa008.FieldName = "caa012";


            this.gvMx1daa008.MaxWidth = 44;


            this.gvMx1daa008.MinWidth = 44;


@@ -888,6 +1069,101 @@


            this.gvMx1daa006.Visible = true;


            this.gvMx1daa006.VisibleIndex = 8;


            this.gvMx1daa006.Width = 44;


            // 


            // gvMx1daa016


            // 


            this.gvMx1daa016.AppearanceCell.ForeColor = System.Drawing.Color.Black;


            this.gvMx1daa016.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true;


            this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Black;


            this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true;


            this.gvMx1daa016.Caption = "预计开工时间";


            this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;


            this.gvMx1daa016.FieldName = "mesStartProd";


            this.gvMx1daa016.MinWidth = 44;


            this.gvMx1daa016.Name = "gvMx1daa016";


            this.gvMx1daa016.OptionsColumn.ReadOnly = true;


            this.gvMx1daa016.Tag = "";


            this.gvMx1daa016.Visible = true;


            this.gvMx1daa016.VisibleIndex = 5;


            this.gvMx1daa016.Width = 68;


            // 


            // repositoryItemDateEdit2


            // 


            this.repositoryItemDateEdit2.AutoHeight = false;


            this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";


            // 


            // gvMx1daa018


            // 


            this.gvMx1daa018.AppearanceCell.ForeColor = System.Drawing.Color.Black;


            this.gvMx1daa018.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa018.AppearanceCell.Options.UseForeColor = true;


            this.gvMx1daa018.AppearanceHeader.ForeColor = System.Drawing.Color.Black;


            this.gvMx1daa018.AppearanceHeader.Options.UseForeColor = true;


            this.gvMx1daa018.Caption = "预计完工时间";


            this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;


            this.gvMx1daa018.FieldName = "mesEndProd";


            this.gvMx1daa018.MinWidth = 44;


            this.gvMx1daa018.Name = "gvMx1daa018";


            this.gvMx1daa018.OptionsColumn.ReadOnly = true;


            this.gvMx1daa018.Tag = "";


            this.gvMx1daa018.Visible = true;


            this.gvMx1daa018.VisibleIndex = 6;


            this.gvMx1daa018.Width = 44;


            // 


            // repositoryItemDateEdit3


            // 


            this.repositoryItemDateEdit3.AutoHeight = false;


            this.repositoryItemDateEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.repositoryItemDateEdit3.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";


            // 


            // gvMx1daa012


            // 


            this.gvMx1daa012.AppearanceCell.ForeColor = System.Drawing.Color.Black;


            this.gvMx1daa012.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa012.AppearanceCell.Options.UseForeColor = true;


            this.gvMx1daa012.AppearanceHeader.ForeColor = System.Drawing.Color.Black;


            this.gvMx1daa012.AppearanceHeader.Options.UseForeColor = true;


            this.gvMx1daa012.Caption = "生产线别";


            this.gvMx1daa012.ColumnEdit = this.rptJYBZ;


            this.gvMx1daa012.FieldName = "scxb";


            this.gvMx1daa012.MinWidth = 131;


            this.gvMx1daa012.Name = "gvMx1daa012";


            this.gvMx1daa012.OptionsColumn.ReadOnly = true;


            this.gvMx1daa012.Tag = "";


            this.gvMx1daa012.Visible = true;


            this.gvMx1daa012.VisibleIndex = 12;


            this.gvMx1daa012.Width = 134;


            // 


            // rptJYBZ


            // 


            this.rptJYBZ.AutoHeight = false;


            this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.rptJYBZ.Name = "rptJYBZ";


            this.rptJYBZ.NullText = "-请选择-";


            this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;


            this.rptJYBZ.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);


            // 


            // gvMx1daa002


            // 


            this.gvMx1daa002.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa002.Caption = "工单单号";


            this.gvMx1daa002.FieldName = "daa001";


            this.gvMx1daa002.MinWidth = 44;


            this.gvMx1daa002.Name = "gvMx1daa002";


            this.gvMx1daa002.OptionsColumn.ReadOnly = true;


            this.gvMx1daa002.Tag = "query_a.daa002";


            this.gvMx1daa002.Visible = true;


            this.gvMx1daa002.VisibleIndex = 0;


            this.gvMx1daa002.Width = 44;


            // 


            // gvMx1daa007


            // 


@@ -933,33 +1209,6 @@


            this.gvMx1daa011.Visible = true;


            this.gvMx1daa011.VisibleIndex = 11;


            this.gvMx1daa011.Width = 52;


            // 


            // gvMx1daa012


            // 


            this.gvMx1daa012.AppearanceCell.ForeColor = System.Drawing.Color.Blue;


            this.gvMx1daa012.AppearanceCell.Options.UseFont = true;


            this.gvMx1daa012.AppearanceCell.Options.UseForeColor = true;


            this.gvMx1daa012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;


            this.gvMx1daa012.AppearanceHeader.Options.UseForeColor = true;


            this.gvMx1daa012.Caption = "线别编码";


            this.gvMx1daa012.ColumnEdit = this.rptJYBZ;


            this.gvMx1daa012.FieldName = "daa015LineName";


            this.gvMx1daa012.MinWidth = 131;


            this.gvMx1daa012.Name = "gvMx1daa012";


            this.gvMx1daa012.Tag = "edit";


            this.gvMx1daa012.Visible = true;


            this.gvMx1daa012.VisibleIndex = 12;


            this.gvMx1daa012.Width = 134;


            // 


            // rptJYBZ


            // 


            this.rptJYBZ.AutoHeight = false;


            this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


            this.rptJYBZ.Name = "rptJYBZ";


            this.rptJYBZ.NullText = "-请选择-";


            this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;


            this.rptJYBZ.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);


            // 


            // gvMx1reporttime


            // 


@@ -1164,29 +1413,6 @@


            this.gridColumn3.Name = "gridColumn3";


            this.gridColumn3.Width = 82;


            // 


            // gvMx1fstatus


            // 


            this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;


            this.gvMx1fstatus.Caption = "需求单号";


            this.gvMx1fstatus.FieldName = "caa015";


            this.gvMx1fstatus.MinWidth = 44;


            this.gvMx1fstatus.Name = "gvMx1fstatus";


            this.gvMx1fstatus.OptionsColumn.ReadOnly = true;


            this.gvMx1fstatus.Tag = "query_a.fstatus";


            this.gvMx1fstatus.Visible = true;


            this.gvMx1fstatus.VisibleIndex = 15;


            this.gvMx1fstatus.Width = 66;


            // 


            // gridColumn6


            // 


            this.gridColumn6.Caption = "次序";


            this.gridColumn6.FieldName = "scheduleOrder";


            this.gridColumn6.MinWidth = 22;


            this.gridColumn6.Name = "gridColumn6";


            this.gridColumn6.Visible = true;


            this.gridColumn6.VisibleIndex = 16;


            this.gridColumn6.Width = 82;


            // 


            // gvMxDel


            // 


            this.gvMxDel.Caption = "移出";


@@ -1208,6 +1434,138 @@


            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;


            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);


            // 


            // xtraTabPage3


            // 


            this.xtraTabPage3.Controls.Add(this.gcMx2);


            this.xtraTabPage3.Name = "xtraTabPage3";


            this.xtraTabPage3.Size = new System.Drawing.Size(983, 230);


            this.xtraTabPage3.Text = "合并工单明细";


            // 


            // gcMx2


            // 


            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.gcMx2.Location = new System.Drawing.Point(0, 0);


            this.gcMx2.MainView = this.gvMx2;


            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.gcMx2.Name = "gcMx2";


            this.gcMx2.Size = new System.Drawing.Size(983, 230);


            this.gcMx2.TabIndex = 1;


            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gvMx2});


            // 


            // gvMx2


            // 


            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;


            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;


            this.gvMx2.ColumnPanelRowHeight = 39;


            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.gridColumn12,


            this.gridColumn15,


            this.gridColumn17,


            this.gridColumn18,


            this.gridColumn19,


            this.gridColumn14,


            this.gridColumn13,


            this.gridColumn21});


            this.gvMx2.DetailHeight = 272;


            this.gvMx2.GridControl = this.gcMx2;


            this.gvMx2.Name = "gvMx2";


            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;


            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;


            this.gvMx2.OptionsView.ShowGroupPanel = false;


            // 


            // gridColumn12


            // 


            this.gridColumn12.AppearanceCell.Options.UseFont = true;


            this.gridColumn12.Caption = "明细Guid";


            this.gridColumn12.FieldName = "guid";


            this.gridColumn12.MinWidth = 44;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.OptionsColumn.ReadOnly = true;


            this.gridColumn12.Tag = "query_a.guid";


            this.gridColumn12.Width = 82;


            // 


            // gridColumn15


            // 


            this.gridColumn15.Caption = "序号";


            this.gridColumn15.FieldName = "xh";


            this.gridColumn15.MinWidth = 22;


            this.gridColumn15.Name = "gridColumn15";


            this.gridColumn15.Visible = true;


            this.gridColumn15.VisibleIndex = 0;


            this.gridColumn15.Width = 90;


            // 


            // gridColumn17


            // 


            this.gridColumn17.AppearanceCell.Options.UseFont = true;


            this.gridColumn17.Caption = "物料编码";


            this.gridColumn17.FieldName = "itemNo";


            this.gridColumn17.MinWidth = 44;


            this.gridColumn17.Name = "gridColumn17";


            this.gridColumn17.OptionsColumn.ReadOnly = true;


            this.gridColumn17.Tag = "query_a.daa005";


            this.gridColumn17.Visible = true;


            this.gridColumn17.VisibleIndex = 1;


            this.gridColumn17.Width = 171;


            // 


            // gridColumn18


            // 


            this.gridColumn18.AppearanceCell.Options.UseFont = true;


            this.gridColumn18.Caption = "物料名称";


            this.gridColumn18.FieldName = "itemName";


            this.gridColumn18.MinWidth = 44;


            this.gridColumn18.Name = "gridColumn18";


            this.gridColumn18.OptionsColumn.ReadOnly = true;


            this.gridColumn18.Tag = "query_a.daa003";


            this.gridColumn18.Visible = true;


            this.gridColumn18.VisibleIndex = 2;


            this.gridColumn18.Width = 142;


            // 


            // gridColumn19


            // 


            this.gridColumn19.AppearanceCell.Options.UseFont = true;


            this.gridColumn19.Caption = "物料规格";


            this.gridColumn19.FieldName = "itemModel";


            this.gridColumn19.MinWidth = 44;


            this.gridColumn19.Name = "gridColumn19";


            this.gridColumn19.OptionsColumn.ReadOnly = true;


            this.gridColumn19.Tag = "query_a.daa004";


            this.gridColumn19.Visible = true;


            this.gridColumn19.VisibleIndex = 3;


            this.gridColumn19.Width = 253;


            // 


            // gridColumn14


            // 


            this.gridColumn14.Caption = "需领用量";


            this.gridColumn14.FieldName = "xlyl";


            this.gridColumn14.Name = "gridColumn14";


            this.gridColumn14.Visible = true;


            this.gridColumn14.VisibleIndex = 6;


            // 


            // gridColumn13


            // 


            this.gridColumn13.Caption = "已领用量";


            this.gridColumn13.FieldName = "ylyl";


            this.gridColumn13.Name = "gridColumn13";


            this.gridColumn13.Visible = true;


            this.gridColumn13.VisibleIndex = 4;


            this.gridColumn13.Width = 214;


            // 


            // gridColumn21


            // 


            this.gridColumn21.AppearanceCell.Options.UseFont = true;


            this.gridColumn21.Caption = "单位";


            this.gridColumn21.FieldName = "dw";


            this.gridColumn21.MaxWidth = 44;


            this.gridColumn21.MinWidth = 44;


            this.gridColumn21.Name = "gridColumn21";


            this.gridColumn21.OptionsColumn.ReadOnly = true;


            this.gridColumn21.Tag = "query_a.daa006";


            this.gridColumn21.Visible = true;


            this.gridColumn21.VisibleIndex = 5;


            this.gridColumn21.Width = 44;


            // 


            // picCheckBox


            // 


            this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));


@@ -1219,144 +1577,6 @@


            this.picCheckBox.TabIndex = 7;


            this.picCheckBox.TabStop = false;


            this.picCheckBox.Visible = false;


            // 


            // xtraTabPage3


            // 


            this.xtraTabPage3.Name = "xtraTabPage3";


            this.xtraTabPage3.Size = new System.Drawing.Size(983, 321);


            this.xtraTabPage3.Text = "合并工单明细";


            // 


            // txt_gdsl


            // 


            this.txt_gdsl.Location = new System.Drawing.Point(556, 10);


            this.txt_gdsl.Name = "txt_gdsl";


            this.txt_gdsl.Size = new System.Drawing.Size(176, 20);


            this.txt_gdsl.StyleController = this.layoutMx1;


            this.txt_gdsl.TabIndex = 462;


            // 


            // txt_daahb015


            // 


            this.txt_daahb015.IsReadly = false;


            this.txt_daahb015.Location = new System.Drawing.Point(314, 63);


            this.txt_daahb015.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);


            this.txt_daahb015.Name = "txt_daahb015";


            this.txt_daahb015.Size = new System.Drawing.Size(176, 20);


            this.txt_daahb015.TabIndex = 463;


            // 


            // layoutControlItem7


            // 


            this.layoutControlItem7.Control = this.txt_daahb009;


            this.layoutControlItem7.Location = new System.Drawing.Point(241, 106);


            this.layoutControlItem7.Name = "layoutControlItem7";


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;


            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem7.Size = new System.Drawing.Size(484, 54);


            this.layoutControlItem7.Text = "备注";


            this.layoutControlItem7.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem4


            // 


            this.layoutControlItem4.Control = this.txt_daahb013;


            this.layoutControlItem4.Location = new System.Drawing.Point(0, 53);


            this.layoutControlItem4.Name = "layoutControlItem4";


            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem4.Size = new System.Drawing.Size(241, 53);


            this.layoutControlItem4.Text = "工作车间";


            this.layoutControlItem4.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem1


            // 


            this.layoutControlItem1.Control = this.txt_erpId;


            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);


            this.layoutControlItem1.Name = "layoutControlItem1";


            this.layoutControlItem1.Size = new System.Drawing.Size(241, 53);


            this.layoutControlItem1.Text = "生产组织";


            this.layoutControlItem1.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem2


            // 


            this.layoutControlItem2.Control = this.txt_daahb001;


            this.layoutControlItem2.CustomizationFormText = "合并单号";


            this.layoutControlItem2.Location = new System.Drawing.Point(241, 0);


            this.layoutControlItem2.Name = "layoutControlItem2";


            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem2.Size = new System.Drawing.Size(242, 53);


            this.layoutControlItem2.Text = "合并单号";


            this.layoutControlItem2.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem3


            // 


            this.layoutControlItem3.Control = this.txt_createDate;


            this.layoutControlItem3.Location = new System.Drawing.Point(483, 53);


            this.layoutControlItem3.Name = "layoutControlItem3";


            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem3.Size = new System.Drawing.Size(242, 53);


            this.layoutControlItem3.Text = "创建日期 ";


            this.layoutControlItem3.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem5


            // 


            this.layoutControlItem5.Control = this.txt_createByName;


            this.layoutControlItem5.Location = new System.Drawing.Point(725, 53);


            this.layoutControlItem5.Name = "layoutControlItem5";


            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem5.Size = new System.Drawing.Size(242, 53);


            this.layoutControlItem5.Text = "创建人员";


            this.layoutControlItem5.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem10


            // 


            this.layoutControlItem10.Control = this.txt_gdsl;


            this.layoutControlItem10.Location = new System.Drawing.Point(483, 0);


            this.layoutControlItem10.Name = "layoutControlItem10";


            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem10.Size = new System.Drawing.Size(242, 53);


            this.layoutControlItem10.Text = "工单数量";


            this.layoutControlItem10.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem11


            // 


            this.layoutControlItem11.Control = this.txt_daahb015;


            this.layoutControlItem11.Location = new System.Drawing.Point(241, 53);


            this.layoutControlItem11.Name = "layoutControlItem11";


            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem11.Size = new System.Drawing.Size(242, 53);


            this.layoutControlItem11.Text = "生产线体";


            this.layoutControlItem11.TextSize = new System.Drawing.Size(52, 14);


            // 


            // layoutControlItem6


            // 


            this.layoutControlItem6.Control = this.txt_fstatus;


            this.layoutControlItem6.Location = new System.Drawing.Point(725, 106);


            this.layoutControlItem6.Name = "layoutControlItem6";


            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem6.Size = new System.Drawing.Size(242, 54);


            this.layoutControlItem6.Text = "审核状态";


            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem6.TextVisible = false;


            // 


            // txt_hbds


            // 


            this.txt_hbds.Location = new System.Drawing.Point(798, 10);


            this.txt_hbds.Name = "txt_hbds";


            this.txt_hbds.Size = new System.Drawing.Size(176, 20);


            this.txt_hbds.StyleController = this.layoutMx1;


            this.txt_hbds.TabIndex = 464;


            // 


            // layoutControlItem12


            // 


            this.layoutControlItem12.Control = this.txt_hbds;


            this.layoutControlItem12.Location = new System.Drawing.Point(725, 0);


            this.layoutControlItem12.Name = "layoutControlItem12";


            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem12.Size = new System.Drawing.Size(242, 53);


            this.layoutControlItem12.Text = "合并单数";


            this.layoutControlItem12.TextSize = new System.Drawing.Size(52, 14);


            // 


            // Frm_Womdaahb


            // 


@@ -1379,6 +1599,8 @@


            this.split1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).EndInit();


            this.xtraTabPage2.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();


            this.splitMx1.Panel1.ResumeLayout(false);


@@ -1390,12 +1612,24 @@


            this.layoutMx1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.txt_daahb001.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_daahb009.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_cjr.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_gds.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_hbsl.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();


            this.tabMx.ResumeLayout(false);


            this.tabMxPage1.ResumeLayout(false);


@@ -1409,19 +1643,10 @@


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();


            this.xtraTabPage3.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_gdsl.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_hbds.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();


            this.ResumeLayout(false);




        }


@@ -1452,7 +1677,7 @@


        private DevExpress.XtraEditors.TextEdit txt_daahb001;


        private DevExpress.XtraEditors.SimpleButton btnSelect;


        private System.Windows.Forms.Label lbGuid;


        private DevExpress.XtraEditors.TextEdit txt_createByName;


        private DevExpress.XtraEditors.TextEdit txt_cjr;


        private DevExpress.XtraEditors.TextEdit txt_createDate;


        private DevExpress.XtraEditors.TextEdit txt_daahb009;


        private DevExpress.XtraEditors.CheckEdit txt_fstatus;


@@ -1505,7 +1730,7 @@


        private DevExpress.Utils.ToolTipController tips;


        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;


        private UserControl.UcLookWorkline txt_daahb015;


        private DevExpress.XtraEditors.TextEdit txt_gdsl;


        private DevExpress.XtraEditors.TextEdit txt_gds;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;


@@ -1514,8 +1739,25 @@


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;


        private DevExpress.XtraEditors.TextEdit txt_hbds;


        private DevExpress.XtraEditors.TextEdit txt_hbsl;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;


        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;


        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit2;


        private DevExpress.XtraGrid.GridControl gcMx2;


        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;


    }


}