From fdc017bffe579b0855743b68c58e3ba7571b8ad1 Mon Sep 17 00:00:00 2001 From: kyy <3283105747@qq.com> Date: 星期一, 01 九月 2025 18:12:23 +0800 Subject: [PATCH] 1、优化条码删除报错 2、采购入库三联打印 --- DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 454 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 315 insertions(+), 139 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs index 69ce2e2..993cd4d 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs @@ -109,18 +109,29 @@ this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); + this.repositoryItemLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit(); + this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -169,6 +180,9 @@ this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit(); @@ -177,9 +191,13 @@ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -191,9 +209,10 @@ this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(987, 62); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -201,10 +220,11 @@ // xtraTabControl1 // this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); + this.xtraTabControl1.Location = new System.Drawing.Point(0, 62); + this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(987, 468); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -213,8 +233,9 @@ // xtraTabPage1 // this.xtraTabPage1.Controls.Add(this.split1); + this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(985, 442); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -223,6 +244,7 @@ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); + this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.split1.Name = "split1"; // // split1.Panel1 @@ -235,17 +257,19 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1126, 570); + this.split1.Size = new System.Drawing.Size(985, 442); this.split1.SplitterPosition = 0; this.split1.TabIndex = 4; // // gcMain1 // this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; + this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1126, 519); + this.gcMain1.Size = new System.Drawing.Size(985, 402); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -255,7 +279,7 @@ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridView1.Appearance.Row.Options.UseFont = true; - this.gridView1.ColumnPanelRowHeight = 50; + this.gridView1.ColumnPanelRowHeight = 39; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_fstatus, this.gridColumn4, @@ -274,8 +298,9 @@ this.gridColumn17, this.gridColumn18, this.gridColumn19}); + this.gridView1.DetailHeight = 272; this.gridView1.GridControl = this.gcMain1; - this.gridView1.IndicatorWidth = 50; + this.gridView1.IndicatorWidth = 44; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; @@ -286,196 +311,202 @@ this.gv_fstatus.AppearanceCell.Options.UseFont = true; this.gv_fstatus.Caption = "瀹℃牳"; this.gv_fstatus.FieldName = "chkStatus"; - this.gv_fstatus.MaxWidth = 50; - this.gv_fstatus.MinWidth = 50; + 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.Visible = true; this.gv_fstatus.VisibleIndex = 0; - this.gv_fstatus.Width = 50; + this.gv_fstatus.Width = 44; // // gridColumn4 // this.gridColumn4.Caption = "涓婚敭GUID"; this.gridColumn4.FieldName = "guid"; + this.gridColumn4.MinWidth = 17; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Tag = "org.fnamber"; - this.gridColumn4.Width = 250; + this.gridColumn4.Width = 219; // // gridColumn1 // this.gridColumn1.Caption = "绫诲埆"; this.gridColumn1.FieldName = "fType"; - this.gridColumn1.MinWidth = 25; + this.gridColumn1.MinWidth = 22; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 15; - this.gridColumn1.Width = 94; + this.gridColumn1.Width = 82; // // gridColumn2 // this.gridColumn2.Caption = "寤虹珛鑰�"; this.gridColumn2.FieldName = "createBy"; + this.gridColumn2.MinWidth = 17; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 10; - this.gridColumn2.Width = 150; + this.gridColumn2.Width = 131; // // gv_checkUser // this.gv_checkUser.AppearanceCell.Options.UseFont = true; this.gv_checkUser.Caption = "寤虹珛鏃堕棿"; this.gv_checkUser.FieldName = "createDate"; + 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 = 11; - this.gv_checkUser.Width = 94; + this.gv_checkUser.Width = 82; // // gv_checkDate // this.gv_checkDate.AppearanceCell.Options.UseFont = true; this.gv_checkDate.Caption = "瀹℃牳鑰�"; this.gv_checkDate.FieldName = "checkBy"; + this.gv_checkDate.MinWidth = 17; this.gv_checkDate.Name = "gv_checkDate"; this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.check_date"; this.gv_checkDate.Visible = true; this.gv_checkDate.VisibleIndex = 12; - this.gv_checkDate.Width = 180; + this.gv_checkDate.Width = 157; // // gv_pba005 // this.gv_pba005.AppearanceCell.Options.UseFont = true; this.gv_pba005.Caption = "瀹℃牳鏃堕棿"; this.gv_pba005.FieldName = "checkDate"; + 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 = 13; - this.gv_pba005.Width = 94; + this.gv_pba005.Width = 82; // // gridColumn8 // this.gridColumn8.Caption = "鐗╂枡缂栫爜"; this.gridColumn8.FieldName = "itemNo"; - this.gridColumn8.MinWidth = 25; + this.gridColumn8.MinWidth = 22; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 5; - this.gridColumn8.Width = 94; + this.gridColumn8.Width = 82; // // gridColumn9 // this.gridColumn9.Caption = "鐗╂枡鍚嶇О"; this.gridColumn9.FieldName = "itemName"; - this.gridColumn9.MinWidth = 25; + this.gridColumn9.MinWidth = 22; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 6; - this.gridColumn9.Width = 94; + this.gridColumn9.Width = 82; // // gridColumn10 // this.gridColumn10.Caption = "鐗╂枡瑙勬牸"; this.gridColumn10.FieldName = "itemModel"; - this.gridColumn10.MinWidth = 25; + this.gridColumn10.MinWidth = 22; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 7; - this.gridColumn10.Width = 94; + this.gridColumn10.Width = 82; // // gridColumn11 // this.gridColumn11.Caption = "渚涘簲鍟�"; this.gridColumn11.FieldName = "gysName"; - this.gridColumn11.MinWidth = 25; + this.gridColumn11.MinWidth = 22; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 8; - this.gridColumn11.Width = 94; + this.gridColumn11.Width = 82; // // gridColumn12 // this.gridColumn12.Caption = "鍒拌揣鏃ユ湡"; this.gridColumn12.FieldName = "dhdDate"; - this.gridColumn12.MinWidth = 25; + this.gridColumn12.MinWidth = 22; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; this.gridColumn12.VisibleIndex = 4; - this.gridColumn12.Width = 94; + this.gridColumn12.Width = 82; // // gridColumn13 // this.gridColumn13.Caption = "鍒拌揣鍗曞彿"; this.gridColumn13.FieldName = "dhdNo"; - this.gridColumn13.MinWidth = 25; + this.gridColumn13.MinWidth = 22; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 3; - this.gridColumn13.Width = 94; + this.gridColumn13.Width = 82; // // gridColumn3 // this.gridColumn3.Caption = "鐗╂枡ID"; this.gridColumn3.FieldName = "itemId"; - this.gridColumn3.MinWidth = 25; + this.gridColumn3.MinWidth = 22; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 14; - this.gridColumn3.Width = 94; + this.gridColumn3.Width = 82; // // gridColumn17 // this.gridColumn17.Caption = "寮傚父鍗曞彿"; this.gridColumn17.FieldName = "fBillNo"; - this.gridColumn17.MinWidth = 25; + this.gridColumn17.MinWidth = 22; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; this.gridColumn17.VisibleIndex = 1; - this.gridColumn17.Width = 94; + this.gridColumn17.Width = 82; // // gridColumn18 // this.gridColumn18.Caption = "OA澶勭悊鐘舵��"; this.gridColumn18.FieldName = "oaCheckStatusTxt"; - this.gridColumn18.MinWidth = 25; + this.gridColumn18.MinWidth = 22; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; this.gridColumn18.VisibleIndex = 2; - this.gridColumn18.Width = 94; + this.gridColumn18.Width = 82; // // gridColumn19 // this.gridColumn19.Caption = "OA澶勭悊鏃堕棿"; this.gridColumn19.FieldName = "oaCheckDate"; - this.gridColumn19.MinWidth = 25; + this.gridColumn19.MinWidth = 22; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; this.gridColumn19.VisibleIndex = 9; - this.gridColumn19.Width = 94; + this.gridColumn19.Width = 82; // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 519); - this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.pageBar1.Location = new System.Drawing.Point(0, 402); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1126, 39); + this.pageBar1.Size = new System.Drawing.Size(985, 30); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // // xtraTabPage2 // this.xtraTabPage2.Controls.Add(this.splitMx1); + this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(985, 442); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -483,6 +514,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); + this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 @@ -495,8 +527,8 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 163; + this.splitMx1.Size = new System.Drawing.Size(985, 442); + this.splitMx1.SplitterPosition = 127; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -518,107 +550,119 @@ this.layoutControlItem9, this.layoutControlItem24}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); + this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(598, 453, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 163); + this.layoutMx1.Size = new System.Drawing.Size(985, 127); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(840, 99); + this.lbGuid.Location = new System.Drawing.Point(735, 77); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(274, 40); + this.lbGuid.Size = new System.Drawing.Size(240, 31); this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; // // txt_fType // - this.txt_fType.Location = new System.Drawing.Point(927, 12); + this.txt_fType.Location = new System.Drawing.Point(795, 12); + this.txt_fType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fType.Name = "txt_fType"; - this.txt_fType.Size = new System.Drawing.Size(187, 24); + this.txt_fType.Size = new System.Drawing.Size(161, 20); this.txt_fType.StyleController = this.layoutMx1; this.txt_fType.TabIndex = 462; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(99, 40); + this.txt_itemNo.Location = new System.Drawing.Point(84, 36); + this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_itemNo.Name = "txt_itemNo"; - this.txt_itemNo.Size = new System.Drawing.Size(185, 24); + this.txt_itemNo.Size = new System.Drawing.Size(161, 20); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 464; // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(375, 40); + this.txt_itemName.Location = new System.Drawing.Point(321, 36); + this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_itemName.Name = "txt_itemName"; - this.txt_itemName.Size = new System.Drawing.Size(185, 24); + this.txt_itemName.Size = new System.Drawing.Size(161, 20); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 465; // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(651, 40); + this.txt_itemModel.Location = new System.Drawing.Point(558, 36); + this.txt_itemModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_itemModel.Name = "txt_itemModel"; - this.txt_itemModel.Size = new System.Drawing.Size(463, 24); + this.txt_itemModel.Size = new System.Drawing.Size(398, 20); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 466; // // txt_dhdNo // - this.txt_dhdNo.Location = new System.Drawing.Point(375, 12); + this.txt_dhdNo.Location = new System.Drawing.Point(321, 12); + this.txt_dhdNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_dhdNo.Name = "txt_dhdNo"; - this.txt_dhdNo.Size = new System.Drawing.Size(185, 24); + this.txt_dhdNo.Size = new System.Drawing.Size(161, 20); this.txt_dhdNo.StyleController = this.layoutMx1; this.txt_dhdNo.TabIndex = 467; // // txt_gysNo // - this.txt_gysNo.Location = new System.Drawing.Point(99, 68); + this.txt_gysNo.Location = new System.Drawing.Point(84, 60); + this.txt_gysNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_gysNo.Name = "txt_gysNo"; - this.txt_gysNo.Size = new System.Drawing.Size(185, 24); + this.txt_gysNo.Size = new System.Drawing.Size(161, 20); this.txt_gysNo.StyleController = this.layoutMx1; this.txt_gysNo.TabIndex = 468; // // txt_gysName // - this.txt_gysName.Location = new System.Drawing.Point(375, 68); + this.txt_gysName.Location = new System.Drawing.Point(321, 60); + this.txt_gysName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_gysName.Name = "txt_gysName"; - this.txt_gysName.Size = new System.Drawing.Size(461, 24); + this.txt_gysName.Size = new System.Drawing.Size(398, 20); this.txt_gysName.StyleController = this.layoutMx1; this.txt_gysName.TabIndex = 469; // // txt_guid // - this.txt_guid.Location = new System.Drawing.Point(927, 180); + this.txt_guid.Location = new System.Drawing.Point(811, 140); + this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_guid.Name = "txt_guid"; - this.txt_guid.Size = new System.Drawing.Size(187, 24); + this.txt_guid.Size = new System.Drawing.Size(164, 20); this.txt_guid.StyleController = this.layoutMx1; this.txt_guid.TabIndex = 477; // // txt_fBillNo // - this.txt_fBillNo.Location = new System.Drawing.Point(99, 12); + this.txt_fBillNo.Location = new System.Drawing.Point(84, 12); + this.txt_fBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fBillNo.Name = "txt_fBillNo"; - this.txt_fBillNo.Size = new System.Drawing.Size(185, 24); + this.txt_fBillNo.Size = new System.Drawing.Size(161, 20); this.txt_fBillNo.StyleController = this.layoutMx1; this.txt_fBillNo.TabIndex = 478; // // txt_dhdDate // - this.txt_dhdDate.Location = new System.Drawing.Point(651, 12); + this.txt_dhdDate.Location = new System.Drawing.Point(558, 12); + this.txt_dhdDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_dhdDate.Name = "txt_dhdDate"; - this.txt_dhdDate.Size = new System.Drawing.Size(185, 24); + this.txt_dhdDate.Size = new System.Drawing.Size(161, 20); this.txt_dhdDate.StyleController = this.layoutMx1; this.txt_dhdDate.TabIndex = 481; // // txt_fngDesc // - this.txt_fngDesc.Location = new System.Drawing.Point(99, 97); + this.txt_fngDesc.Location = new System.Drawing.Point(84, 84); + this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fngDesc.Name = "txt_fngDesc"; - this.txt_fngDesc.Size = new System.Drawing.Size(1015, 54); + this.txt_fngDesc.Size = new System.Drawing.Size(872, 44); this.txt_fngDesc.StyleController = this.layoutMx1; this.txt_fngDesc.TabIndex = 485; // @@ -643,7 +687,7 @@ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem24.Size = new System.Drawing.Size(278, 34); this.layoutControlItem24.Text = "涓婚敭Guid"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(50, 20); + this.layoutControlItem24.TextSize = new System.Drawing.Size(44, 16); // // Root // @@ -691,7 +735,7 @@ rowDefinition3, rowDefinition4, rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1126, 163); + this.Root.Size = new System.Drawing.Size(968, 140); this.Root.TextVisible = false; // // layoutControlItem2 @@ -699,114 +743,115 @@ this.layoutControlItem2.Control = this.txt_fBillNo; this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem2.Size = new System.Drawing.Size(237, 24); this.layoutControlItem2.Text = "寮傚父缂栧彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_dhdNo; - this.layoutControlItem14.Location = new System.Drawing.Point(276, 0); + this.layoutControlItem14.Location = new System.Drawing.Point(237, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem14.Size = new System.Drawing.Size(237, 24); this.layoutControlItem14.Text = "鍒拌揣鍗曞彿"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_dhdDate; - this.layoutControlItem4.Location = new System.Drawing.Point(552, 0); + this.layoutControlItem4.Location = new System.Drawing.Point(474, 0); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem4.Size = new System.Drawing.Size(237, 24); this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_itemNo; - this.layoutControlItem11.Location = new System.Drawing.Point(0, 28); + this.layoutControlItem11.Location = new System.Drawing.Point(0, 24); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem11.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem11.Size = new System.Drawing.Size(237, 24); this.layoutControlItem11.Text = "鐗╂枡缂栧彿"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_fType; - this.layoutControlItem1.Location = new System.Drawing.Point(828, 0); + this.layoutControlItem1.Location = new System.Drawing.Point(711, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem1.Size = new System.Drawing.Size(278, 28); + this.layoutControlItem1.Size = new System.Drawing.Size(237, 24); this.layoutControlItem1.Text = "寮傚父绫诲瀷"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_itemName; - this.layoutControlItem12.Location = new System.Drawing.Point(276, 28); + this.layoutControlItem12.Location = new System.Drawing.Point(237, 24); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem12.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem12.Size = new System.Drawing.Size(237, 24); this.layoutControlItem12.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_itemModel; - this.layoutControlItem13.Location = new System.Drawing.Point(552, 28); + this.layoutControlItem13.Location = new System.Drawing.Point(474, 24); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem13.Size = new System.Drawing.Size(554, 28); + this.layoutControlItem13.Size = new System.Drawing.Size(474, 24); this.layoutControlItem13.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_gysNo; - this.layoutControlItem15.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem15.Location = new System.Drawing.Point(0, 48); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem15.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem15.Size = new System.Drawing.Size(237, 24); this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_gysName; - this.layoutControlItem16.Location = new System.Drawing.Point(276, 56); + this.layoutControlItem16.Location = new System.Drawing.Point(237, 48); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem16.Size = new System.Drawing.Size(552, 29); + this.layoutControlItem16.Size = new System.Drawing.Size(474, 24); this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 14); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_fngDesc; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 85); + this.layoutControlItem3.Location = new System.Drawing.Point(0, 72); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(1106, 58); + this.layoutControlItem3.Size = new System.Drawing.Size(948, 48); this.layoutControlItem3.Text = "寮傚父鎻忚堪"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14); // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMx.Location = new System.Drawing.Point(0, 0); + this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1126, 395); + this.tabMx.Size = new System.Drawing.Size(985, 305); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -814,23 +859,31 @@ // tabMxPage1 // this.tabMxPage1.Controls.Add(this.gcMx1); + this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 363); + this.tabMxPage1.Size = new System.Drawing.Size(983, 279); this.tabMxPage1.Text = "寮傚父鏄庣粏"; // // gcMx1 // this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; + this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemDateEdit1, this.repositoryItemDateEdit2, this.repositoryItemButtonEdit1, this.rptJYBZ, - this.repositoryItemDateEdit3}); - this.gcMx1.Size = new System.Drawing.Size(1124, 363); + this.repositoryItemDateEdit3, + this.repositoryItemLookUpEdit1, + this.repositoryItemComboBox1, + this.repositoryItemSearchLookUpEdit1, + this.repositoryItemComboBox2, + this.repositoryItemComboBox3}); + this.gcMx1.Size = new System.Drawing.Size(983, 279); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -839,7 +892,7 @@ // this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true; this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.gvMx1.ColumnPanelRowHeight = 50; + this.gvMx1.ColumnPanelRowHeight = 39; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1guid, this.caaGuid, @@ -853,7 +906,12 @@ this.gvMx1reporttime, this.gridColumn14, this.gridColumn15, - this.gridColumn16}); + this.gridColumn16, + this.gridColumn20, + this.gridColumn21, + this.gridColumn22, + this.gridColumn23}); + this.gvMx1.DetailHeight = 272; this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -865,115 +923,126 @@ this.gvMx1guid.AppearanceCell.Options.UseFont = true; this.gvMx1guid.Caption = "guid"; this.gvMx1guid.FieldName = "guid"; - this.gvMx1guid.MinWidth = 50; + this.gvMx1guid.MinWidth = 44; this.gvMx1guid.Name = "gvMx1guid"; this.gvMx1guid.OptionsColumn.ReadOnly = true; this.gvMx1guid.Tag = "query_a.guid"; - this.gvMx1guid.Width = 94; + this.gvMx1guid.Width = 82; // // caaGuid // this.caaGuid.Caption = "鐖朵翰GUID"; this.caaGuid.FieldName = "pGuid"; - this.caaGuid.MinWidth = 25; + this.caaGuid.MinWidth = 22; this.caaGuid.Name = "caaGuid"; this.caaGuid.OptionsColumn.ReadOnly = true; - this.caaGuid.Width = 94; + this.caaGuid.Width = 82; // // gvMx1daa002 // this.gvMx1daa002.AppearanceCell.Options.UseFont = true; this.gvMx1daa002.Caption = "搴忓彿"; this.gvMx1daa002.FieldName = "fSeq"; - this.gvMx1daa002.MinWidth = 50; + 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 = 50; + this.gvMx1daa002.Width = 44; // // gridColumn5 // this.gridColumn5.Caption = "妫�楠屽崟鍙�"; this.gridColumn5.FieldName = "releaseNo"; - this.gridColumn5.MinWidth = 25; + this.gridColumn5.MinWidth = 22; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 1; - this.gridColumn5.Width = 94; + this.gridColumn5.Width = 82; // // gridColumn6 // this.gridColumn6.Caption = "妫�楠屾棩鏈�"; this.gridColumn6.FieldName = "jyDate"; - this.gridColumn6.MinWidth = 25; + this.gridColumn6.MinWidth = 22; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 4; - this.gridColumn6.Width = 94; + this.gridColumn6.Width = 82; // // gvMx1daa005 // this.gvMx1daa005.AppearanceCell.Options.UseFont = true; this.gvMx1daa005.Caption = "鎵规鏁伴噺"; this.gvMx1daa005.FieldName = "batchQty"; - this.gvMx1daa005.MinWidth = 50; + this.gvMx1daa005.MinWidth = 44; this.gvMx1daa005.Name = "gvMx1daa005"; this.gvMx1daa005.OptionsColumn.ReadOnly = true; this.gvMx1daa005.Tag = "query_a.daa005"; this.gvMx1daa005.Visible = true; this.gvMx1daa005.VisibleIndex = 2; - this.gvMx1daa005.Width = 50; + this.gvMx1daa005.Width = 44; // // gridColumn7 // this.gridColumn7.Caption = "鎶芥牱鏁�"; this.gridColumn7.FieldName = "chouQty"; - this.gridColumn7.MinWidth = 25; + this.gridColumn7.MinWidth = 22; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 3; - this.gridColumn7.Width = 94; + this.gridColumn7.Width = 82; // // gvMx1daa004 // this.gvMx1daa004.AppearanceCell.Options.UseFont = true; this.gvMx1daa004.Caption = "涓嶈壇鏁�"; this.gvMx1daa004.FieldName = "badQty"; - this.gvMx1daa004.MinWidth = 50; + this.gvMx1daa004.MinWidth = 44; this.gvMx1daa004.Name = "gvMx1daa004"; this.gvMx1daa004.OptionsColumn.ReadOnly = true; this.gvMx1daa004.Tag = "query_a.daa004"; this.gvMx1daa004.Visible = true; this.gvMx1daa004.VisibleIndex = 5; - this.gvMx1daa004.Width = 50; + this.gvMx1daa004.Width = 44; // // gvMx1daa008 // this.gvMx1daa008.AppearanceCell.Options.UseFont = true; this.gvMx1daa008.Caption = "涓嶈壇鐜�"; this.gvMx1daa008.FieldName = "badProb"; - this.gvMx1daa008.MaxWidth = 50; - this.gvMx1daa008.MinWidth = 50; + this.gvMx1daa008.MaxWidth = 44; + this.gvMx1daa008.MinWidth = 44; this.gvMx1daa008.Name = "gvMx1daa008"; this.gvMx1daa008.OptionsColumn.ReadOnly = true; this.gvMx1daa008.Tag = "query_a.daa008"; this.gvMx1daa008.Visible = true; this.gvMx1daa008.VisibleIndex = 6; - this.gvMx1daa008.Width = 50; + this.gvMx1daa008.Width = 44; // // gvMx1reporttime // this.gvMx1reporttime.AppearanceCell.Options.UseFont = true; this.gvMx1reporttime.Caption = "閫夊埆绫诲瀷"; + this.gvMx1reporttime.ColumnEdit = this.repositoryItemComboBox2; this.gvMx1reporttime.FieldName = "chooseType"; - this.gvMx1reporttime.MinWidth = 50; + this.gvMx1reporttime.MinWidth = 44; this.gvMx1reporttime.Name = "gvMx1reporttime"; this.gvMx1reporttime.Tag = "edit"; this.gvMx1reporttime.Visible = true; this.gvMx1reporttime.VisibleIndex = 7; - this.gvMx1reporttime.Width = 102; + this.gvMx1reporttime.Width = 89; + // + // repositoryItemComboBox2 + // + this.repositoryItemComboBox2.AutoHeight = false; + this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemComboBox2.Items.AddRange(new object[] { + "閫夊埆绫诲埆1", + "閫夊埆绫诲埆2"}); + this.repositoryItemComboBox2.Name = "repositoryItemComboBox2"; // // gridColumn14 // @@ -982,32 +1051,97 @@ this.gridColumn14.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridColumn14.AppearanceHeader.Options.UseForeColor = true; this.gridColumn14.Caption = "澶勭疆鎰忚"; + this.gridColumn14.ColumnEdit = this.repositoryItemComboBox1; this.gridColumn14.FieldName = "handResult"; - this.gridColumn14.MinWidth = 25; + this.gridColumn14.MinWidth = 22; this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { + new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.None, "handResult", "", "1"), + new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.None, "handResult", "", "2")}); + this.gridColumn14.Tag = "edit"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 8; - this.gridColumn14.Width = 94; + this.gridColumn14.Width = 82; + // + // repositoryItemComboBox1 + // + this.repositoryItemComboBox1.AutoHeight = false; + this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemComboBox1.Items.AddRange(new object[] { + "閫�璐�", + "鐗归噰鐩存帴浣跨敤"}); + this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; // // gridColumn15 // this.gridColumn15.Caption = "閫夊埆鏁伴噺"; this.gridColumn15.FieldName = "chooseQty"; - this.gridColumn15.MinWidth = 25; + this.gridColumn15.MinWidth = 22; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 9; - this.gridColumn15.Width = 94; + this.gridColumn15.VisibleIndex = 10; + this.gridColumn15.Width = 82; // // gridColumn16 // this.gridColumn16.Caption = "涓嶅悎鏍兼弿杩�"; this.gridColumn16.FieldName = "fngDesc"; - this.gridColumn16.MinWidth = 25; + this.gridColumn16.MinWidth = 22; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 10; - this.gridColumn16.Width = 94; + this.gridColumn16.VisibleIndex = 11; + this.gridColumn16.Width = 82; + // + // gridColumn20 + // + this.gridColumn20.Caption = "鍚堟牸鍏ュ簱鏁�"; + this.gridColumn20.FieldName = "okRkqty"; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Tag = ""; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 12; + this.gridColumn20.Width = 66; + // + // gridColumn21 + // + this.gridColumn21.Caption = "宸ュ簾鍏ュ簱鏁�"; + this.gridColumn21.FieldName = "gfRkqty"; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Tag = "edit"; + this.gridColumn21.Visible = true; + this.gridColumn21.VisibleIndex = 13; + this.gridColumn21.Width = 66; + // + // gridColumn22 + // + this.gridColumn22.Caption = "鏂欏簾鍏ュ簱鏁�"; + this.gridColumn22.FieldName = "lfRkqty"; + this.gridColumn22.Name = "gridColumn22"; + this.gridColumn22.Tag = "edit"; + this.gridColumn22.Visible = true; + this.gridColumn22.VisibleIndex = 14; + this.gridColumn22.Width = 66; + // + // gridColumn23 + // + this.gridColumn23.Caption = "閫�鏂欐柟寮�"; + this.gridColumn23.ColumnEdit = this.repositoryItemComboBox3; + this.gridColumn23.FieldName = "process"; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.Tag = "edit"; + this.gridColumn23.Visible = true; + this.gridColumn23.VisibleIndex = 9; + // + // repositoryItemComboBox3 + // + this.repositoryItemComboBox3.AutoHeight = false; + this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemComboBox3.Items.AddRange(new object[] { + "閫�鏂欒ˉ鏂�", + "閫�鏂欏苟鎵f"}); + this.repositoryItemComboBox3.Name = "repositoryItemComboBox3"; // // repositoryItemDateEdit1 // @@ -1055,11 +1189,34 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3"; // + // repositoryItemLookUpEdit1 + // + this.repositoryItemLookUpEdit1.AutoHeight = false; + this.repositoryItemLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEdit1.Name = "repositoryItemLookUpEdit1"; + // + // repositoryItemSearchLookUpEdit1 + // + this.repositoryItemSearchLookUpEdit1.AutoHeight = false; + this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1"; + this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View; + // + // repositoryItemSearchLookUpEdit1View + // + this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; + this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View"; + this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false; + this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false; + // // picCheckBox // - this.picCheckBox.Location = new System.Drawing.Point(1024, 55); + this.picCheckBox.Location = new System.Drawing.Point(896, 43); + this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.picCheckBox.Name = "picCheckBox"; - this.picCheckBox.Size = new System.Drawing.Size(100, 50); + this.picCheckBox.Size = new System.Drawing.Size(88, 39); this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picCheckBox.TabIndex = 7; this.picCheckBox.TabStop = false; @@ -1081,12 +1238,13 @@ // // MesQcExceptional // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1128, 682); + this.ClientSize = new System.Drawing.Size(987, 530); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "MesQcExceptional"; this.Text = "IQC寮傚父鎶ュ憡"; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); @@ -1137,6 +1295,9 @@ this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit(); @@ -1145,9 +1306,13 @@ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit(); this.ResumeLayout(false); } @@ -1230,5 +1395,16 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit1; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; + private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1; + private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View; + private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3; } } \ No newline at end of file -- Gitblit v1.9.3