From c1c501a803a66d410771fa5ab9aac162f2d5e717 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 29 十月 2025 14:33:38 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 59 ++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.resx | 3
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql4.cs | 35 +
DevApp/Gs.DevApp/Gs.DevApp.csproj | 1
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 1316 ++++++++++++++++++++++++++++++++++++++++++------------
6 files changed, 1,122 insertions(+), 294 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index 155a95d..610f48a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -30,23 +30,28 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -204,8 +209,56 @@
this.bandedGridColumn22 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
+ this.gridSplitContainer1 = new DevExpress.XtraGrid.GridSplitContainer();
+ this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx3 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+ this.aqlType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.aqlTypeCr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.aqlTypeMa = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.aqlTypeMi = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gvMx3guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gvMx3aql1Id = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.repositoryItemComboBox9 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.advBandedGridView3 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+ this.gridBand61 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn45 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand62 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn46 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand63 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn47 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn48 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn49 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn50 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn51 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn52 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn53 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn54 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn55 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn56 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn57 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn58 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn59 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn60 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn61 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn62 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand64 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn63 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand65 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn64 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn65 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn66 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.bandedGridColumn26 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.bandedGridColumn23 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand40 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand42 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand48 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand49 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand50 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -266,7 +319,19 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.advBandedGridView1)).BeginInit();
+ this.tabMxPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridSplitContainer1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridSplitContainer1.Panel1)).BeginInit();
+ this.gridSplitContainer1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridSplitContainer1.Panel2)).BeginInit();
+ this.gridSplitContainer1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.advBandedGridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -278,9 +343,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(5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1748, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(2185, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -288,10 +354,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, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1748, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(2185, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -300,8 +367,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1746, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(2183, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -310,6 +378,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(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -322,17 +391,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1746, 570);
+ this.split1.Size = new System.Drawing.Size(2183, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1746, 519);
+ this.gcMain1.Size = new System.Drawing.Size(2183, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -351,8 +422,9 @@
this.gv_foneCheckor,
this.gv_foneCheckdate,
this.gv_memo});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -363,142 +435,143 @@
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "guid ";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
+ this.gv_guid.MinWidth = 62;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 117;
//
// gv_isenabled
//
this.gv_isenabled.AppearanceCell.Options.UseFont = true;
this.gv_isenabled.Caption = "鏄惁鍙敤";
this.gv_isenabled.FieldName = "isenabled";
- this.gv_isenabled.MinWidth = 50;
+ this.gv_isenabled.MinWidth = 62;
this.gv_isenabled.Name = "gv_isenabled";
this.gv_isenabled.OptionsColumn.AllowEdit = false;
this.gv_isenabled.Tag = "query_a.ISENABLED";
- this.gv_isenabled.Width = 94;
+ this.gv_isenabled.Width = 117;
//
// gv_foneChecked
//
this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
this.gv_foneChecked.Caption = "瀹℃牳鏍囪";
this.gv_foneChecked.FieldName = "foneChecked";
- this.gv_foneChecked.MinWidth = 50;
+ this.gv_foneChecked.MinWidth = 62;
this.gv_foneChecked.Name = "gv_foneChecked";
this.gv_foneChecked.OptionsColumn.AllowEdit = false;
this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
this.gv_foneChecked.Visible = true;
this.gv_foneChecked.VisibleIndex = 0;
- this.gv_foneChecked.Width = 94;
+ this.gv_foneChecked.Width = 117;
//
// gv_fversion
//
this.gv_fversion.AppearanceCell.Options.UseFont = true;
this.gv_fversion.Caption = "鐗堟湰鍙�";
this.gv_fversion.FieldName = "fversion";
- this.gv_fversion.MinWidth = 50;
+ this.gv_fversion.MinWidth = 62;
this.gv_fversion.Name = "gv_fversion";
this.gv_fversion.OptionsColumn.AllowEdit = false;
this.gv_fversion.Tag = "query_a.FVERSION";
- this.gv_fversion.Width = 94;
+ this.gv_fversion.Width = 117;
//
// gv_sampleSizeNo
//
this.gv_sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gv_sampleSizeNo.Caption = "鏍囧噯缂栫爜";
this.gv_sampleSizeNo.FieldName = "sampleSizeNo";
- this.gv_sampleSizeNo.MinWidth = 50;
+ this.gv_sampleSizeNo.MinWidth = 62;
this.gv_sampleSizeNo.Name = "gv_sampleSizeNo";
this.gv_sampleSizeNo.OptionsColumn.AllowEdit = false;
this.gv_sampleSizeNo.Tag = "query_a.SAMPLE_SIZE_NO";
this.gv_sampleSizeNo.Visible = true;
this.gv_sampleSizeNo.VisibleIndex = 1;
- this.gv_sampleSizeNo.Width = 150;
+ this.gv_sampleSizeNo.Width = 187;
//
// gv_sampleSizeName
//
this.gv_sampleSizeName.AppearanceCell.Options.UseFont = true;
this.gv_sampleSizeName.Caption = "鏍囧噯鍚嶇О";
this.gv_sampleSizeName.FieldName = "sampleSizeName";
- this.gv_sampleSizeName.MinWidth = 50;
+ this.gv_sampleSizeName.MinWidth = 62;
this.gv_sampleSizeName.Name = "gv_sampleSizeName";
this.gv_sampleSizeName.OptionsColumn.AllowEdit = false;
this.gv_sampleSizeName.Tag = "query_a.SAMPLE_SIZE_NAME";
this.gv_sampleSizeName.Visible = true;
this.gv_sampleSizeName.VisibleIndex = 2;
- this.gv_sampleSizeName.Width = 94;
+ this.gv_sampleSizeName.Width = 117;
//
// gv_createName
//
this.gv_createName.AppearanceCell.Options.UseFont = true;
this.gv_createName.Caption = "鍒朵綔浜哄鍚�";
this.gv_createName.FieldName = "createBy";
- this.gv_createName.MinWidth = 50;
+ this.gv_createName.MinWidth = 62;
this.gv_createName.Name = "gv_createName";
this.gv_createName.OptionsColumn.AllowEdit = false;
this.gv_createName.Tag = "query_a.CREATE_NAME";
this.gv_createName.Visible = true;
this.gv_createName.VisibleIndex = 4;
- this.gv_createName.Width = 94;
+ this.gv_createName.Width = 117;
//
// gv_foneCheckor
//
this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckor.Caption = "瀹℃牳浜�";
this.gv_foneCheckor.FieldName = "foneCheckor";
- this.gv_foneCheckor.MinWidth = 50;
+ this.gv_foneCheckor.MinWidth = 62;
this.gv_foneCheckor.Name = "gv_foneCheckor";
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
this.gv_foneCheckor.VisibleIndex = 5;
- this.gv_foneCheckor.Width = 94;
+ this.gv_foneCheckor.Width = 117;
//
// gv_foneCheckdate
//
this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckdate.Caption = "瀹℃牳鏃ユ湡";
this.gv_foneCheckdate.FieldName = "foneCheckdate";
- this.gv_foneCheckdate.MinWidth = 50;
+ this.gv_foneCheckdate.MinWidth = 62;
this.gv_foneCheckdate.Name = "gv_foneCheckdate";
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
this.gv_foneCheckdate.VisibleIndex = 6;
- this.gv_foneCheckdate.Width = 200;
+ this.gv_foneCheckdate.Width = 250;
//
// gv_memo
//
this.gv_memo.AppearanceCell.Options.UseFont = true;
this.gv_memo.Caption = "澶囨敞淇℃伅";
this.gv_memo.FieldName = "memo";
- this.gv_memo.MinWidth = 50;
+ this.gv_memo.MinWidth = 62;
this.gv_memo.Name = "gv_memo";
this.gv_memo.OptionsColumn.AllowEdit = false;
this.gv_memo.Tag = "query_a.MEMO";
this.gv_memo.Visible = true;
this.gv_memo.VisibleIndex = 3;
- this.gv_memo.Width = 94;
+ this.gv_memo.Width = 117;
//
// 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, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1746, 39);
+ this.pageBar1.Size = new System.Drawing.Size(2183, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1746, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(2183, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -506,6 +579,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(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -518,7 +592,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(1746, 570);
+ this.splitMx1.Size = new System.Drawing.Size(2183, 698);
+ this.splitMx1.SplitterPosition = 122;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -539,113 +614,125 @@
this.layoutControlItem14,
this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(898, 472, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1746, 100);
+ this.layoutMx1.Size = new System.Drawing.Size(2183, 122);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1305, 97);
+ this.lbGuid.Location = new System.Drawing.Point(1631, 119);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(429, 39);
+ this.lbGuid.Size = new System.Drawing.Size(536, 48);
this.lbGuid.TabIndex = 277;
this.lbGuid.Text = "lbGuid";
//
// txt_sampleSizeNo
//
- this.txt_sampleSizeNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_sampleSizeNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_sampleSizeNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_sampleSizeNo.Name = "txt_sampleSizeNo";
this.txt_sampleSizeNo.Properties.Appearance.Options.UseFont = true;
- this.txt_sampleSizeNo.Size = new System.Drawing.Size(350, 24);
+ this.txt_sampleSizeNo.Size = new System.Drawing.Size(452, 28);
this.txt_sampleSizeNo.StyleController = this.layoutMx1;
this.txt_sampleSizeNo.TabIndex = 226;
//
// txt_sampleSizeName
//
- this.txt_sampleSizeName.Location = new System.Drawing.Point(84, 40);
+ this.txt_sampleSizeName.Location = new System.Drawing.Point(96, 46);
+ this.txt_sampleSizeName.Margin = new System.Windows.Forms.Padding(4);
this.txt_sampleSizeName.Name = "txt_sampleSizeName";
this.txt_sampleSizeName.Properties.Appearance.Options.UseFont = true;
- this.txt_sampleSizeName.Size = new System.Drawing.Size(350, 24);
+ this.txt_sampleSizeName.Size = new System.Drawing.Size(452, 28);
this.txt_sampleSizeName.StyleController = this.layoutMx1;
this.txt_sampleSizeName.TabIndex = 228;
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(510, 64);
+ this.txt_fversion.Location = new System.Drawing.Point(638, 78);
+ this.txt_fversion.Margin = new System.Windows.Forms.Padding(4);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
- this.txt_fversion.Size = new System.Drawing.Size(350, 24);
+ this.txt_fversion.Size = new System.Drawing.Size(438, 28);
this.txt_fversion.StyleController = this.layoutMx1;
this.txt_fversion.TabIndex = 273;
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(84, 68);
+ this.txt_memo.Location = new System.Drawing.Point(96, 80);
+ this.txt_memo.Margin = new System.Windows.Forms.Padding(4);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(350, 24);
+ this.txt_memo.Size = new System.Drawing.Size(452, 28);
this.txt_memo.StyleController = this.layoutMx1;
this.txt_memo.TabIndex = 231;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(510, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(636, 12);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(350, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(453, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 213;
this.txt_createBy.Tag = "readOnly";
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(936, 40);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(1177, 46);
+ this.txt_foneCheckdate.Margin = new System.Windows.Forms.Padding(4);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckdate.Size = new System.Drawing.Size(350, 24);
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(453, 28);
this.txt_foneCheckdate.StyleController = this.layoutMx1;
this.txt_foneCheckdate.TabIndex = 247;
this.txt_foneCheckdate.Tag = "readOnly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(510, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(636, 46);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(350, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(453, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 216;
this.txt_createDate.Tag = "readOnly";
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(936, 12);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(1177, 12);
+ this.txt_foneCheckor.Margin = new System.Windows.Forms.Padding(4);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckor.Size = new System.Drawing.Size(350, 24);
+ this.txt_foneCheckor.Size = new System.Drawing.Size(453, 28);
this.txt_foneCheckor.StyleController = this.layoutMx1;
this.txt_foneCheckor.TabIndex = 243;
this.txt_foneCheckor.Tag = "readOnly";
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(864, 68);
+ this.txt_foneChecked.Location = new System.Drawing.Point(1093, 80);
+ this.txt_foneChecked.Margin = new System.Windows.Forms.Padding(4);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_foneChecked.Size = new System.Drawing.Size(422, 24);
+ this.txt_foneChecked.Size = new System.Drawing.Size(537, 27);
this.txt_foneChecked.StyleController = this.layoutMx1;
this.txt_foneChecked.TabIndex = 274;
this.txt_foneChecked.Tag = "readOnly";
//
// txt_isenabled
//
- this.txt_isenabled.Location = new System.Drawing.Point(438, 68);
+ this.txt_isenabled.Location = new System.Drawing.Point(552, 80);
+ this.txt_isenabled.Margin = new System.Windows.Forms.Padding(4);
this.txt_isenabled.Name = "txt_isenabled";
this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
- this.txt_isenabled.Size = new System.Drawing.Size(422, 24);
+ this.txt_isenabled.Size = new System.Drawing.Size(537, 27);
this.txt_isenabled.StyleController = this.layoutMx1;
this.txt_isenabled.TabIndex = 276;
this.txt_isenabled.Tag = "readOnly";
@@ -671,7 +758,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem6.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem6.Text = "鐗堟湰鍙�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 22);
//
// Root
//
@@ -689,30 +776,30 @@
this.layoutControlItem13});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1725, 104);
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(2183, 122);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -720,80 +807,80 @@
this.layoutControlItem1.Control = this.txt_sampleSizeNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(540, 34);
this.layoutControlItem1.Text = "鏍囧噯缂栫爜";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_sampleSizeName;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 34);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(540, 34);
this.layoutControlItem2.Text = "鏍囧噯鍚嶇О";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_memo;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 68);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(540, 34);
this.layoutControlItem3.Text = "澶囨敞淇℃伅";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_createBy;
- this.layoutControlItem4.Location = new System.Drawing.Point(426, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(540, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(541, 34);
this.layoutControlItem4.Text = "鍒朵綔浜哄憳";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_createDate;
- this.layoutControlItem5.Location = new System.Drawing.Point(426, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(540, 34);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(541, 34);
this.layoutControlItem5.Text = "鍒朵綔鏃堕棿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_foneCheckor;
- this.layoutControlItem9.Location = new System.Drawing.Point(852, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(1081, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(541, 34);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_foneCheckdate;
- this.layoutControlItem10.Location = new System.Drawing.Point(852, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1081, 34);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(541, 34);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_foneChecked;
- this.layoutControlItem11.Location = new System.Drawing.Point(852, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1081, 68);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(541, 34);
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -801,11 +888,11 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_isenabled;
- this.layoutControlItem13.Location = new System.Drawing.Point(426, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(540, 68);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(541, 34);
this.layoutControlItem13.Text = "鍙敤鏍囪瘑";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
@@ -814,26 +901,31 @@
//
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(4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1746, 458);
+ this.tabMx.Size = new System.Drawing.Size(2183, 561);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
- this.tabMxPage2});
+ this.tabMxPage2,
+ this.tabMxPage3});
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1744, 426);
+ this.tabMxPage1.Size = new System.Drawing.Size(2181, 523);
this.tabMxPage1.Text = "鏍锋湰閲忓瓧鐮�";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
@@ -844,7 +936,7 @@
this.repositoryItemComboBox6,
this.repositoryItemComboBox7,
this.repositoryItemComboBox8});
- this.gcMx1.Size = new System.Drawing.Size(1744, 426);
+ this.gcMx1.Size = new System.Drawing.Size(2181, 523);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -860,7 +952,7 @@
this.gridBand9,
this.gridBand13,
this.gridBand14});
- this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.ColumnPanelRowHeight = 61;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
this.gvMx1guid,
this.gvMx1aql1Id,
@@ -875,6 +967,7 @@
this.gvMx1flevelIii,
this.gvMx1memo,
this.gvMxDel});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -887,39 +980,41 @@
//
this.gridBand2.Caption = "鎵归噺寮�濮�";
this.gridBand2.Columns.Add(this.gvMx1lotFrom);
+ this.gridBand2.MinWidth = 12;
this.gridBand2.Name = "gridBand2";
this.gridBand2.VisibleIndex = 0;
- this.gridBand2.Width = 113;
+ this.gridBand2.Width = 141;
//
// gvMx1lotFrom
//
this.gvMx1lotFrom.AppearanceCell.Options.UseFont = true;
this.gvMx1lotFrom.Caption = "鎵归噺寮�濮�";
this.gvMx1lotFrom.FieldName = "lotFrom";
- this.gvMx1lotFrom.MinWidth = 80;
+ this.gvMx1lotFrom.MinWidth = 100;
this.gvMx1lotFrom.Name = "gvMx1lotFrom";
this.gvMx1lotFrom.Tag = "yz_quantity_0_edit";
this.gvMx1lotFrom.Visible = true;
- this.gvMx1lotFrom.Width = 113;
+ this.gvMx1lotFrom.Width = 141;
//
// gridBand3
//
this.gridBand3.Caption = "鎵归噺缁撴潫";
this.gridBand3.Columns.Add(this.gvMx1lotTo);
+ this.gridBand3.MinWidth = 12;
this.gridBand3.Name = "gridBand3";
this.gridBand3.VisibleIndex = 1;
- this.gridBand3.Width = 109;
+ this.gridBand3.Width = 136;
//
// gvMx1lotTo
//
this.gvMx1lotTo.AppearanceCell.Options.UseFont = true;
this.gvMx1lotTo.Caption = "鎵归噺缁撴潫";
this.gvMx1lotTo.FieldName = "lotTo";
- this.gvMx1lotTo.MinWidth = 80;
+ this.gvMx1lotTo.MinWidth = 100;
this.gvMx1lotTo.Name = "gvMx1lotTo";
this.gvMx1lotTo.Tag = "yz_quantity_0_edit";
this.gvMx1lotTo.Visible = true;
- this.gvMx1lotTo.Width = 109;
+ this.gvMx1lotTo.Width = 136;
//
// gridBand4
//
@@ -931,9 +1026,10 @@
this.gridBand6,
this.gridBand7,
this.gridBand8});
+ this.gridBand4.MinWidth = 12;
this.gridBand4.Name = "gridBand4";
this.gridBand4.VisibleIndex = 2;
- this.gridBand4.Width = 416;
+ this.gridBand4.Width = 520;
//
// gridBand5
//
@@ -941,7 +1037,7 @@
this.gridBand5.Columns.Add(this.gvMx1flevelS1);
this.gridBand5.Name = "gridBand5";
this.gridBand5.VisibleIndex = 0;
- this.gridBand5.Width = 104;
+ this.gridBand5.Width = 130;
//
// gvMx1flevelS1
//
@@ -949,11 +1045,11 @@
this.gvMx1flevelS1.Caption = "鐗规畩妫�楠屾按骞硘S-1";
this.gvMx1flevelS1.ColumnEdit = this.repositoryItemComboBox2;
this.gvMx1flevelS1.FieldName = "flevelS1";
- this.gvMx1flevelS1.MinWidth = 80;
+ this.gvMx1flevelS1.MinWidth = 100;
this.gvMx1flevelS1.Name = "gvMx1flevelS1";
this.gvMx1flevelS1.Tag = "edit";
this.gvMx1flevelS1.Visible = true;
- this.gvMx1flevelS1.Width = 104;
+ this.gvMx1flevelS1.Width = 130;
//
// repositoryItemComboBox2
//
@@ -968,7 +1064,7 @@
this.gridBand6.Columns.Add(this.gvMx1flevelS2);
this.gridBand6.Name = "gridBand6";
this.gridBand6.VisibleIndex = 1;
- this.gridBand6.Width = 104;
+ this.gridBand6.Width = 130;
//
// gvMx1flevelS2
//
@@ -976,11 +1072,11 @@
this.gvMx1flevelS2.Caption = "鐗规畩妫�楠屾按骞硘S-2";
this.gvMx1flevelS2.ColumnEdit = this.repositoryItemComboBox3;
this.gvMx1flevelS2.FieldName = "flevelS2";
- this.gvMx1flevelS2.MinWidth = 80;
+ this.gvMx1flevelS2.MinWidth = 100;
this.gvMx1flevelS2.Name = "gvMx1flevelS2";
this.gvMx1flevelS2.Tag = "edit";
this.gvMx1flevelS2.Visible = true;
- this.gvMx1flevelS2.Width = 104;
+ this.gvMx1flevelS2.Width = 130;
//
// repositoryItemComboBox3
//
@@ -995,7 +1091,7 @@
this.gridBand7.Columns.Add(this.gvMx1flevelS3);
this.gridBand7.Name = "gridBand7";
this.gridBand7.VisibleIndex = 2;
- this.gridBand7.Width = 104;
+ this.gridBand7.Width = 130;
//
// gvMx1flevelS3
//
@@ -1003,11 +1099,11 @@
this.gvMx1flevelS3.Caption = "鐗规畩妫�楠屾按骞硘S-3";
this.gvMx1flevelS3.ColumnEdit = this.repositoryItemComboBox4;
this.gvMx1flevelS3.FieldName = "flevelS3";
- this.gvMx1flevelS3.MinWidth = 80;
+ this.gvMx1flevelS3.MinWidth = 100;
this.gvMx1flevelS3.Name = "gvMx1flevelS3";
this.gvMx1flevelS3.Tag = "edit";
this.gvMx1flevelS3.Visible = true;
- this.gvMx1flevelS3.Width = 104;
+ this.gvMx1flevelS3.Width = 130;
//
// repositoryItemComboBox4
//
@@ -1022,7 +1118,7 @@
this.gridBand8.Columns.Add(this.gvMx1flevelS4);
this.gridBand8.Name = "gridBand8";
this.gridBand8.VisibleIndex = 3;
- this.gridBand8.Width = 104;
+ this.gridBand8.Width = 130;
//
// gvMx1flevelS4
//
@@ -1030,11 +1126,11 @@
this.gvMx1flevelS4.Caption = "鐗规畩妫�楠屾按骞硘S-4";
this.gvMx1flevelS4.ColumnEdit = this.repositoryItemComboBox5;
this.gvMx1flevelS4.FieldName = "flevelS4";
- this.gvMx1flevelS4.MinWidth = 80;
+ this.gvMx1flevelS4.MinWidth = 100;
this.gvMx1flevelS4.Name = "gvMx1flevelS4";
this.gvMx1flevelS4.Tag = "edit";
this.gvMx1flevelS4.Visible = true;
- this.gvMx1flevelS4.Width = 104;
+ this.gvMx1flevelS4.Width = 130;
//
// repositoryItemComboBox5
//
@@ -1052,9 +1148,10 @@
this.gridBand10,
this.gridBand11,
this.gridBand12});
+ this.gridBand9.MinWidth = 12;
this.gridBand9.Name = "gridBand9";
this.gridBand9.VisibleIndex = 3;
- this.gridBand9.Width = 312;
+ this.gridBand9.Width = 390;
//
// gridBand10
//
@@ -1062,7 +1159,7 @@
this.gridBand10.Columns.Add(this.gvMx1flevelI);
this.gridBand10.Name = "gridBand10";
this.gridBand10.VisibleIndex = 0;
- this.gridBand10.Width = 104;
+ this.gridBand10.Width = 130;
//
// gvMx1flevelI
//
@@ -1070,11 +1167,11 @@
this.gvMx1flevelI.Caption = "涓�鑸楠屾按骞硘I";
this.gvMx1flevelI.ColumnEdit = this.repositoryItemComboBox6;
this.gvMx1flevelI.FieldName = "flevelI";
- this.gvMx1flevelI.MinWidth = 80;
+ this.gvMx1flevelI.MinWidth = 100;
this.gvMx1flevelI.Name = "gvMx1flevelI";
this.gvMx1flevelI.Tag = "edit";
this.gvMx1flevelI.Visible = true;
- this.gvMx1flevelI.Width = 104;
+ this.gvMx1flevelI.Width = 130;
//
// repositoryItemComboBox6
//
@@ -1089,7 +1186,7 @@
this.gridBand11.Columns.Add(this.gvMx1flevelIi);
this.gridBand11.Name = "gridBand11";
this.gridBand11.VisibleIndex = 1;
- this.gridBand11.Width = 104;
+ this.gridBand11.Width = 130;
//
// gvMx1flevelIi
//
@@ -1097,11 +1194,11 @@
this.gvMx1flevelIi.Caption = "涓�鑸楠屾按骞硘II";
this.gvMx1flevelIi.ColumnEdit = this.repositoryItemComboBox7;
this.gvMx1flevelIi.FieldName = "flevelIi";
- this.gvMx1flevelIi.MinWidth = 80;
+ this.gvMx1flevelIi.MinWidth = 100;
this.gvMx1flevelIi.Name = "gvMx1flevelIi";
this.gvMx1flevelIi.Tag = "edit";
this.gvMx1flevelIi.Visible = true;
- this.gvMx1flevelIi.Width = 104;
+ this.gvMx1flevelIi.Width = 130;
//
// repositoryItemComboBox7
//
@@ -1116,7 +1213,7 @@
this.gridBand12.Columns.Add(this.gvMx1flevelIii);
this.gridBand12.Name = "gridBand12";
this.gridBand12.VisibleIndex = 2;
- this.gridBand12.Width = 104;
+ this.gridBand12.Width = 130;
//
// gvMx1flevelIii
//
@@ -1124,11 +1221,11 @@
this.gvMx1flevelIii.Caption = "涓�鑸楠屾按骞硘III";
this.gvMx1flevelIii.ColumnEdit = this.repositoryItemComboBox8;
this.gvMx1flevelIii.FieldName = "flevelIii";
- this.gvMx1flevelIii.MinWidth = 80;
+ this.gvMx1flevelIii.MinWidth = 100;
this.gvMx1flevelIii.Name = "gvMx1flevelIii";
this.gvMx1flevelIii.Tag = "edit";
this.gvMx1flevelIii.Visible = true;
- this.gvMx1flevelIii.Width = 104;
+ this.gvMx1flevelIii.Width = 130;
//
// repositoryItemComboBox8
//
@@ -1141,45 +1238,47 @@
//
this.gridBand13.Caption = "澶囨敞";
this.gridBand13.Columns.Add(this.gvMx1memo);
+ this.gridBand13.MinWidth = 12;
this.gridBand13.Name = "gridBand13";
this.gridBand13.VisibleIndex = 4;
- this.gridBand13.Width = 104;
+ this.gridBand13.Width = 130;
//
// gvMx1memo
//
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
this.gvMx1memo.Caption = "澶囨敞";
this.gvMx1memo.FieldName = "memo";
- this.gvMx1memo.MinWidth = 80;
+ this.gvMx1memo.MinWidth = 100;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "edit";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.Width = 104;
+ this.gvMx1memo.Width = 130;
//
// gridBand14
//
this.gridBand14.Caption = "绉诲嚭";
this.gridBand14.Columns.Add(this.gvMxDel);
+ this.gridBand14.MinWidth = 12;
this.gridBand14.Name = "gridBand14";
this.gridBand14.VisibleIndex = 5;
- this.gridBand14.Width = 116;
+ this.gridBand14.Width = 145;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 50;
+ this.gvMxDel.MinWidth = 62;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.Width = 116;
+ this.gvMxDel.Width = 145;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1189,38 +1288,41 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 62;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 117;
//
// gvMx1aql1Id
//
this.gvMx1aql1Id.AppearanceCell.Options.UseFont = true;
this.gvMx1aql1Id.Caption = "AQL鎶芥牱鍩哄噯ID";
this.gvMx1aql1Id.FieldName = "aql1Id";
- this.gvMx1aql1Id.MinWidth = 50;
+ this.gvMx1aql1Id.MinWidth = 62;
this.gvMx1aql1Id.Name = "gvMx1aql1Id";
this.gvMx1aql1Id.Tag = "query_a.AQL1_ID";
- this.gvMx1aql1Id.Width = 94;
+ this.gvMx1aql1Id.Width = 117;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1744, 426);
+ this.tabMxPage2.Size = new System.Drawing.Size(2181, 523);
this.tabMxPage2.Text = "鎶芥牱鏂规";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemComboBox1,
this.repositoryItemButtonEdit2});
- this.gcMx2.Size = new System.Drawing.Size(1744, 426);
+ this.gcMx2.Size = new System.Drawing.Size(2181, 523);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2,
@@ -1236,7 +1338,7 @@
this.gridBand21,
this.gridBand22,
this.gridBand23});
- this.gvMx2.ColumnPanelRowHeight = 50;
+ this.gvMx2.ColumnPanelRowHeight = 61;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
this.gvMx2guid,
this.gvMx2aql1Id,
@@ -1260,6 +1362,7 @@
this.gvMx2aql1000,
this.gvMx2memo,
this.gvMxDel2});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1274,50 +1377,52 @@
this.gridBand19.Columns.Add(this.gvMx2fsampleSizeWord);
this.gridBand19.Columns.Add(this.gvMx2guid);
this.gridBand19.Columns.Add(this.gvMx2aql1Id);
+ this.gridBand19.MinWidth = 12;
this.gridBand19.Name = "gridBand19";
this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 114;
+ this.gridBand19.Width = 142;
//
// gvMx2fsampleSizeWord
//
this.gvMx2fsampleSizeWord.AppearanceCell.Options.UseFont = true;
this.gvMx2fsampleSizeWord.Caption = "鏍锋湰澶у皬";
this.gvMx2fsampleSizeWord.FieldName = "fsampleSizeWord";
- this.gvMx2fsampleSizeWord.MinWidth = 80;
+ this.gvMx2fsampleSizeWord.MinWidth = 100;
this.gvMx2fsampleSizeWord.Name = "gvMx2fsampleSizeWord";
this.gvMx2fsampleSizeWord.Tag = "yz_quantity_0_edit";
this.gvMx2fsampleSizeWord.Visible = true;
- this.gvMx2fsampleSizeWord.Width = 114;
+ this.gvMx2fsampleSizeWord.Width = 142;
//
// gvMx2guid
//
this.gvMx2guid.AppearanceCell.Options.UseFont = true;
this.gvMx2guid.Caption = "guid ";
this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 50;
+ this.gvMx2guid.MinWidth = 62;
this.gvMx2guid.Name = "gvMx2guid";
this.gvMx2guid.RowIndex = 1;
this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 100;
+ this.gvMx2guid.Width = 125;
//
// gvMx2aql1Id
//
this.gvMx2aql1Id.AppearanceCell.Options.UseFont = true;
this.gvMx2aql1Id.Caption = "AQL鎶芥牱鍩哄噯ID";
this.gvMx2aql1Id.FieldName = "aql1Id";
- this.gvMx2aql1Id.MinWidth = 50;
+ this.gvMx2aql1Id.MinWidth = 62;
this.gvMx2aql1Id.Name = "gvMx2aql1Id";
this.gvMx2aql1Id.RowIndex = 1;
this.gvMx2aql1Id.Tag = "query_a.AQL1_ID";
- this.gvMx2aql1Id.Width = 94;
+ this.gvMx2aql1Id.Width = 117;
//
// gridBand20
//
this.gridBand20.Caption = "鏍锋湰澶у皬瀛楃爜";
this.gridBand20.Columns.Add(this.gvMx2sampleSizeWord);
+ this.gridBand20.MinWidth = 12;
this.gridBand20.Name = "gridBand20";
this.gridBand20.VisibleIndex = 1;
- this.gridBand20.Width = 110;
+ this.gridBand20.Width = 137;
//
// gvMx2sampleSizeWord
//
@@ -1325,11 +1430,11 @@
this.gvMx2sampleSizeWord.Caption = "鏍锋湰澶у皬瀛楃爜";
this.gvMx2sampleSizeWord.ColumnEdit = this.repositoryItemComboBox1;
this.gvMx2sampleSizeWord.FieldName = "sampleSizeWord";
- this.gvMx2sampleSizeWord.MinWidth = 100;
+ this.gvMx2sampleSizeWord.MinWidth = 125;
this.gvMx2sampleSizeWord.Name = "gvMx2sampleSizeWord";
this.gvMx2sampleSizeWord.Tag = "edit";
this.gvMx2sampleSizeWord.Visible = true;
- this.gvMx2sampleSizeWord.Width = 110;
+ this.gvMx2sampleSizeWord.Width = 137;
//
// repositoryItemComboBox1
//
@@ -1361,9 +1466,10 @@
this.gridBand24,
this.gridBand39});
this.gridBand21.ImageOptions.Alignment = System.Drawing.StringAlignment.Center;
+ this.gridBand21.MinWidth = 12;
this.gridBand21.Name = "gridBand21";
this.gridBand21.VisibleIndex = 2;
- this.gridBand21.Width = 1280;
+ this.gridBand21.Width = 1600;
//
// gridBand30
//
@@ -1371,18 +1477,18 @@
this.gridBand30.Columns.Add(this.gvMx2aql00010);
this.gridBand30.Name = "gridBand30";
this.gridBand30.VisibleIndex = 0;
- this.gridBand30.Width = 80;
+ this.gridBand30.Width = 100;
//
// gvMx2aql00010
//
this.gvMx2aql00010.AppearanceCell.Options.UseFont = true;
this.gvMx2aql00010.Caption = "0.010";
this.gvMx2aql00010.FieldName = "aql00010";
- this.gvMx2aql00010.MinWidth = 50;
+ this.gvMx2aql00010.MinWidth = 62;
this.gvMx2aql00010.Name = "gvMx2aql00010";
this.gvMx2aql00010.Tag = "yz_quantity_0_edit";
this.gvMx2aql00010.Visible = true;
- this.gvMx2aql00010.Width = 80;
+ this.gvMx2aql00010.Width = 100;
//
// gridBand29
//
@@ -1390,18 +1496,18 @@
this.gridBand29.Columns.Add(this.gvMx2aql00015);
this.gridBand29.Name = "gridBand29";
this.gridBand29.VisibleIndex = 1;
- this.gridBand29.Width = 80;
+ this.gridBand29.Width = 100;
//
// gvMx2aql00015
//
this.gvMx2aql00015.AppearanceCell.Options.UseFont = true;
this.gvMx2aql00015.Caption = "0.015";
this.gvMx2aql00015.FieldName = "aql00015";
- this.gvMx2aql00015.MinWidth = 50;
+ this.gvMx2aql00015.MinWidth = 62;
this.gvMx2aql00015.Name = "gvMx2aql00015";
this.gvMx2aql00015.Tag = "yz_quantity_0_edit";
this.gvMx2aql00015.Visible = true;
- this.gvMx2aql00015.Width = 80;
+ this.gvMx2aql00015.Width = 100;
//
// gridBand28
//
@@ -1409,18 +1515,18 @@
this.gridBand28.Columns.Add(this.gvMx2aql00025);
this.gridBand28.Name = "gridBand28";
this.gridBand28.VisibleIndex = 2;
- this.gridBand28.Width = 80;
+ this.gridBand28.Width = 100;
//
// gvMx2aql00025
//
this.gvMx2aql00025.AppearanceCell.Options.UseFont = true;
this.gvMx2aql00025.Caption = "0.025";
this.gvMx2aql00025.FieldName = "aql00025";
- this.gvMx2aql00025.MinWidth = 50;
+ this.gvMx2aql00025.MinWidth = 62;
this.gvMx2aql00025.Name = "gvMx2aql00025";
this.gvMx2aql00025.Tag = "yz_quantity_0_edit";
this.gvMx2aql00025.Visible = true;
- this.gvMx2aql00025.Width = 80;
+ this.gvMx2aql00025.Width = 100;
//
// gridBand27
//
@@ -1428,18 +1534,18 @@
this.gridBand27.Columns.Add(this.gvMx2aql00040);
this.gridBand27.Name = "gridBand27";
this.gridBand27.VisibleIndex = 3;
- this.gridBand27.Width = 80;
+ this.gridBand27.Width = 100;
//
// gvMx2aql00040
//
this.gvMx2aql00040.AppearanceCell.Options.UseFont = true;
this.gvMx2aql00040.Caption = "0.040";
this.gvMx2aql00040.FieldName = "aql00040";
- this.gvMx2aql00040.MinWidth = 50;
+ this.gvMx2aql00040.MinWidth = 62;
this.gvMx2aql00040.Name = "gvMx2aql00040";
this.gvMx2aql00040.Tag = "yz_quantity_0_edit";
this.gvMx2aql00040.Visible = true;
- this.gvMx2aql00040.Width = 80;
+ this.gvMx2aql00040.Width = 100;
//
// gridBand26
//
@@ -1447,18 +1553,18 @@
this.gridBand26.Columns.Add(this.gvMx2aql00065);
this.gridBand26.Name = "gridBand26";
this.gridBand26.VisibleIndex = 4;
- this.gridBand26.Width = 80;
+ this.gridBand26.Width = 100;
//
// gvMx2aql00065
//
this.gvMx2aql00065.AppearanceCell.Options.UseFont = true;
this.gvMx2aql00065.Caption = "0.065";
this.gvMx2aql00065.FieldName = "aql00065";
- this.gvMx2aql00065.MinWidth = 50;
+ this.gvMx2aql00065.MinWidth = 62;
this.gvMx2aql00065.Name = "gvMx2aql00065";
this.gvMx2aql00065.Tag = "yz_quantity_0_edit";
this.gvMx2aql00065.Visible = true;
- this.gvMx2aql00065.Width = 80;
+ this.gvMx2aql00065.Width = 100;
//
// gridBand25
//
@@ -1466,18 +1572,18 @@
this.gridBand25.Columns.Add(this.gvMx2aql0010);
this.gridBand25.Name = "gridBand25";
this.gridBand25.VisibleIndex = 5;
- this.gridBand25.Width = 80;
+ this.gridBand25.Width = 100;
//
// gvMx2aql0010
//
this.gvMx2aql0010.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0010.Caption = "0.10";
this.gvMx2aql0010.FieldName = "aql0010";
- this.gvMx2aql0010.MinWidth = 50;
+ this.gvMx2aql0010.MinWidth = 62;
this.gvMx2aql0010.Name = "gvMx2aql0010";
this.gvMx2aql0010.Tag = "yz_quantity_0_edit";
this.gvMx2aql0010.Visible = true;
- this.gvMx2aql0010.Width = 80;
+ this.gvMx2aql0010.Width = 100;
//
// gridBand33
//
@@ -1485,18 +1591,18 @@
this.gridBand33.Columns.Add(this.gvMx2aql0015);
this.gridBand33.Name = "gridBand33";
this.gridBand33.VisibleIndex = 6;
- this.gridBand33.Width = 80;
+ this.gridBand33.Width = 100;
//
// gvMx2aql0015
//
this.gvMx2aql0015.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0015.Caption = "0.15";
this.gvMx2aql0015.FieldName = "aql0015";
- this.gvMx2aql0015.MinWidth = 50;
+ this.gvMx2aql0015.MinWidth = 62;
this.gvMx2aql0015.Name = "gvMx2aql0015";
this.gvMx2aql0015.Tag = "yz_quantity_0_edit";
this.gvMx2aql0015.Visible = true;
- this.gvMx2aql0015.Width = 80;
+ this.gvMx2aql0015.Width = 100;
//
// gridBand32
//
@@ -1504,18 +1610,18 @@
this.gridBand32.Columns.Add(this.gvMx2aql0025);
this.gridBand32.Name = "gridBand32";
this.gridBand32.VisibleIndex = 7;
- this.gridBand32.Width = 80;
+ this.gridBand32.Width = 100;
//
// gvMx2aql0025
//
this.gvMx2aql0025.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0025.Caption = "0.25";
this.gvMx2aql0025.FieldName = "aql0025";
- this.gvMx2aql0025.MinWidth = 50;
+ this.gvMx2aql0025.MinWidth = 62;
this.gvMx2aql0025.Name = "gvMx2aql0025";
this.gvMx2aql0025.Tag = "yz_quantity_0_edit";
this.gvMx2aql0025.Visible = true;
- this.gvMx2aql0025.Width = 80;
+ this.gvMx2aql0025.Width = 100;
//
// gridBand31
//
@@ -1523,18 +1629,18 @@
this.gridBand31.Columns.Add(this.gvMx2aql0040);
this.gridBand31.Name = "gridBand31";
this.gridBand31.VisibleIndex = 8;
- this.gridBand31.Width = 80;
+ this.gridBand31.Width = 100;
//
// gvMx2aql0040
//
this.gvMx2aql0040.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0040.Caption = "0.40";
this.gvMx2aql0040.FieldName = "aql0040";
- this.gvMx2aql0040.MinWidth = 50;
+ this.gvMx2aql0040.MinWidth = 62;
this.gvMx2aql0040.Name = "gvMx2aql0040";
this.gvMx2aql0040.Tag = "yz_quantity_0_edit";
this.gvMx2aql0040.Visible = true;
- this.gvMx2aql0040.Width = 80;
+ this.gvMx2aql0040.Width = 100;
//
// gridBand36
//
@@ -1542,18 +1648,18 @@
this.gridBand36.Columns.Add(this.gvMx2aql0065);
this.gridBand36.Name = "gridBand36";
this.gridBand36.VisibleIndex = 9;
- this.gridBand36.Width = 80;
+ this.gridBand36.Width = 100;
//
// gvMx2aql0065
//
this.gvMx2aql0065.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0065.Caption = "0.65";
this.gvMx2aql0065.FieldName = "aql0065";
- this.gvMx2aql0065.MinWidth = 50;
+ this.gvMx2aql0065.MinWidth = 62;
this.gvMx2aql0065.Name = "gvMx2aql0065";
this.gvMx2aql0065.Tag = "yz_quantity_0_edit";
this.gvMx2aql0065.Visible = true;
- this.gvMx2aql0065.Width = 80;
+ this.gvMx2aql0065.Width = 100;
//
// gridBand35
//
@@ -1561,18 +1667,18 @@
this.gridBand35.Columns.Add(this.gvMx2aql0100);
this.gridBand35.Name = "gridBand35";
this.gridBand35.VisibleIndex = 10;
- this.gridBand35.Width = 80;
+ this.gridBand35.Width = 100;
//
// gvMx2aql0100
//
this.gvMx2aql0100.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0100.Caption = "1.0";
this.gvMx2aql0100.FieldName = "aql0100";
- this.gvMx2aql0100.MinWidth = 50;
+ this.gvMx2aql0100.MinWidth = 62;
this.gvMx2aql0100.Name = "gvMx2aql0100";
this.gvMx2aql0100.Tag = "yz_quantity_0_edit";
this.gvMx2aql0100.Visible = true;
- this.gvMx2aql0100.Width = 80;
+ this.gvMx2aql0100.Width = 100;
//
// gridBand38
//
@@ -1580,18 +1686,18 @@
this.gridBand38.Columns.Add(this.gvMx2aql0150);
this.gridBand38.Name = "gridBand38";
this.gridBand38.VisibleIndex = 11;
- this.gridBand38.Width = 80;
+ this.gridBand38.Width = 100;
//
// gvMx2aql0150
//
this.gvMx2aql0150.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0150.Caption = "1.5";
this.gvMx2aql0150.FieldName = "aql0150";
- this.gvMx2aql0150.MinWidth = 50;
+ this.gvMx2aql0150.MinWidth = 62;
this.gvMx2aql0150.Name = "gvMx2aql0150";
this.gvMx2aql0150.Tag = "yz_quantity_0_edit";
this.gvMx2aql0150.Visible = true;
- this.gvMx2aql0150.Width = 80;
+ this.gvMx2aql0150.Width = 100;
//
// gridBand34
//
@@ -1599,18 +1705,18 @@
this.gridBand34.Columns.Add(this.gvMx2aql0250);
this.gridBand34.Name = "gridBand34";
this.gridBand34.VisibleIndex = 12;
- this.gridBand34.Width = 80;
+ this.gridBand34.Width = 100;
//
// gvMx2aql0250
//
this.gvMx2aql0250.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0250.Caption = "2.5";
this.gvMx2aql0250.FieldName = "aql0250";
- this.gvMx2aql0250.MinWidth = 50;
+ this.gvMx2aql0250.MinWidth = 62;
this.gvMx2aql0250.Name = "gvMx2aql0250";
this.gvMx2aql0250.Tag = "yz_quantity_0_edit";
this.gvMx2aql0250.Visible = true;
- this.gvMx2aql0250.Width = 80;
+ this.gvMx2aql0250.Width = 100;
//
// gridBand37
//
@@ -1618,18 +1724,18 @@
this.gridBand37.Columns.Add(this.gvMx2aql0400);
this.gridBand37.Name = "gridBand37";
this.gridBand37.VisibleIndex = 13;
- this.gridBand37.Width = 80;
+ this.gridBand37.Width = 100;
//
// gvMx2aql0400
//
this.gvMx2aql0400.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0400.Caption = "4.0";
this.gvMx2aql0400.FieldName = "aql0400";
- this.gvMx2aql0400.MinWidth = 50;
+ this.gvMx2aql0400.MinWidth = 62;
this.gvMx2aql0400.Name = "gvMx2aql0400";
this.gvMx2aql0400.Tag = "yz_quantity_0_edit";
this.gvMx2aql0400.Visible = true;
- this.gvMx2aql0400.Width = 80;
+ this.gvMx2aql0400.Width = 100;
//
// gridBand24
//
@@ -1637,18 +1743,18 @@
this.gridBand24.Columns.Add(this.gvMx2aql0650);
this.gridBand24.Name = "gridBand24";
this.gridBand24.VisibleIndex = 14;
- this.gridBand24.Width = 80;
+ this.gridBand24.Width = 100;
//
// gvMx2aql0650
//
this.gvMx2aql0650.AppearanceCell.Options.UseFont = true;
this.gvMx2aql0650.Caption = "6.5";
this.gvMx2aql0650.FieldName = "aql0650";
- this.gvMx2aql0650.MinWidth = 50;
+ this.gvMx2aql0650.MinWidth = 62;
this.gvMx2aql0650.Name = "gvMx2aql0650";
this.gvMx2aql0650.Tag = "yz_quantity_0_edit";
this.gvMx2aql0650.Visible = true;
- this.gvMx2aql0650.Width = 80;
+ this.gvMx2aql0650.Width = 100;
//
// gridBand39
//
@@ -1656,62 +1762,64 @@
this.gridBand39.Columns.Add(this.gvMx2aql1000);
this.gridBand39.Name = "gridBand39";
this.gridBand39.VisibleIndex = 15;
- this.gridBand39.Width = 80;
+ this.gridBand39.Width = 100;
//
// gvMx2aql1000
//
this.gvMx2aql1000.AppearanceCell.Options.UseFont = true;
this.gvMx2aql1000.Caption = "10";
this.gvMx2aql1000.FieldName = "aql1000";
- this.gvMx2aql1000.MinWidth = 80;
+ this.gvMx2aql1000.MinWidth = 100;
this.gvMx2aql1000.Name = "gvMx2aql1000";
this.gvMx2aql1000.Tag = "yz_quantity_0_edit";
this.gvMx2aql1000.Visible = true;
- this.gvMx2aql1000.Width = 80;
+ this.gvMx2aql1000.Width = 100;
//
// gridBand22
//
this.gridBand22.Caption = "澶囨敞";
this.gridBand22.Columns.Add(this.gvMx2memo);
+ this.gridBand22.MinWidth = 12;
this.gridBand22.Name = "gridBand22";
this.gridBand22.VisibleIndex = 3;
- this.gridBand22.Width = 110;
+ this.gridBand22.Width = 137;
//
// gvMx2memo
//
this.gvMx2memo.AppearanceCell.Options.UseFont = true;
this.gvMx2memo.Caption = "澶囨敞";
this.gvMx2memo.FieldName = "memo";
- this.gvMx2memo.MinWidth = 80;
+ this.gvMx2memo.MinWidth = 100;
this.gvMx2memo.Name = "gvMx2memo";
this.gvMx2memo.Tag = "edit";
this.gvMx2memo.Visible = true;
- this.gvMx2memo.Width = 110;
+ this.gvMx2memo.Width = 137;
//
// gridBand23
//
this.gridBand23.Caption = "绉婚櫎";
this.gridBand23.Columns.Add(this.gvMxDel2);
+ this.gridBand23.MinWidth = 12;
this.gridBand23.Name = "gridBand23";
this.gridBand23.VisibleIndex = 4;
- this.gridBand23.Width = 113;
+ this.gridBand23.Width = 141;
//
// gvMxDel2
//
this.gvMxDel2.Caption = "绉婚櫎";
this.gvMxDel2.ColumnEdit = this.repositoryItemButtonEdit2;
- this.gvMxDel2.MinWidth = 50;
+ this.gvMxDel2.MinWidth = 62;
this.gvMxDel2.Name = "gvMxDel2";
this.gvMxDel2.Visible = true;
- this.gvMxDel2.Width = 113;
+ this.gvMxDel2.Width = 141;
//
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1726,7 +1834,7 @@
this.gridBand1,
this.gridBand15,
this.gridBand18});
- this.advBandedGridView1.ColumnPanelRowHeight = 50;
+ this.advBandedGridView1.ColumnPanelRowHeight = 61;
this.advBandedGridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
this.bandedGridColumn1,
this.bandedGridColumn2,
@@ -1750,7 +1858,8 @@
this.bandedGridColumn20,
this.bandedGridColumn21,
this.bandedGridColumn22});
- this.advBandedGridView1.CustomizationFormBounds = new System.Drawing.Rectangle(1121, 484, 328, 370);
+ this.advBandedGridView1.CustomizationFormBounds = new System.Drawing.Rectangle(1121, 484, 410, 452);
+ this.advBandedGridView1.DetailHeight = 428;
this.advBandedGridView1.GridControl = this.gcMx2;
this.advBandedGridView1.Name = "advBandedGridView1";
this.advBandedGridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1762,30 +1871,32 @@
//
this.gridBand16.Caption = "gridBand16";
this.gridBand16.Columns.Add(this.bandedGridColumn3);
+ this.gridBand16.MinWidth = 12;
this.gridBand16.Name = "gridBand16";
this.gridBand16.VisibleIndex = 0;
- this.gridBand16.Width = 81;
+ this.gridBand16.Width = 101;
//
// bandedGridColumn3
//
this.bandedGridColumn3.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn3.Caption = "鏍锋湰澶у皬";
this.bandedGridColumn3.FieldName = "fsampleSizeWord";
- this.bandedGridColumn3.MinWidth = 50;
+ this.bandedGridColumn3.MinWidth = 62;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Tag = "yz_quantity_0_edit";
this.bandedGridColumn3.Visible = true;
- this.bandedGridColumn3.Width = 81;
+ this.bandedGridColumn3.Width = 101;
//
// gridBand17
//
this.gridBand17.AutoFillDown = false;
this.gridBand17.Caption = "gridBand17";
this.gridBand17.Columns.Add(this.bandedGridColumn4);
+ this.gridBand17.MinWidth = 12;
this.gridBand17.Name = "gridBand17";
this.gridBand17.RowCount = 3;
this.gridBand17.VisibleIndex = 1;
- this.gridBand17.Width = 102;
+ this.gridBand17.Width = 127;
//
// bandedGridColumn4
//
@@ -1793,11 +1904,11 @@
this.bandedGridColumn4.Caption = "鏍锋湰澶у皬瀛楃爜";
this.bandedGridColumn4.ColumnEdit = this.repositoryItemComboBox1;
this.bandedGridColumn4.FieldName = "sampleSizeWord";
- this.bandedGridColumn4.MinWidth = 100;
+ this.bandedGridColumn4.MinWidth = 125;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Tag = "edit";
this.bandedGridColumn4.Visible = true;
- this.bandedGridColumn4.Width = 102;
+ this.bandedGridColumn4.Width = 127;
//
// gridBand1
//
@@ -1818,261 +1929,822 @@
this.gridBand1.Columns.Add(this.bandedGridColumn18);
this.gridBand1.Columns.Add(this.bandedGridColumn19);
this.gridBand1.Columns.Add(this.bandedGridColumn20);
+ this.gridBand1.MinWidth = 12;
this.gridBand1.Name = "gridBand1";
this.gridBand1.VisibleIndex = 2;
- this.gridBand1.Width = 800;
+ this.gridBand1.Width = 1000;
//
// bandedGridColumn5
//
this.bandedGridColumn5.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn5.Caption = "0.010";
this.bandedGridColumn5.FieldName = "aql00010";
- this.bandedGridColumn5.MinWidth = 50;
+ this.bandedGridColumn5.MinWidth = 62;
this.bandedGridColumn5.Name = "bandedGridColumn5";
this.bandedGridColumn5.Tag = "yz_quantity_0_edit";
this.bandedGridColumn5.Visible = true;
- this.bandedGridColumn5.Width = 50;
+ this.bandedGridColumn5.Width = 62;
//
// bandedGridColumn6
//
this.bandedGridColumn6.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn6.Caption = "0.015";
this.bandedGridColumn6.FieldName = "aql00015";
- this.bandedGridColumn6.MinWidth = 50;
+ this.bandedGridColumn6.MinWidth = 62;
this.bandedGridColumn6.Name = "bandedGridColumn6";
this.bandedGridColumn6.Tag = "yz_quantity_0_edit";
this.bandedGridColumn6.Visible = true;
- this.bandedGridColumn6.Width = 50;
+ this.bandedGridColumn6.Width = 62;
//
// bandedGridColumn7
//
this.bandedGridColumn7.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn7.Caption = "0.025";
this.bandedGridColumn7.FieldName = "aql00025";
- this.bandedGridColumn7.MinWidth = 50;
+ this.bandedGridColumn7.MinWidth = 62;
this.bandedGridColumn7.Name = "bandedGridColumn7";
this.bandedGridColumn7.Tag = "yz_quantity_0_edit";
this.bandedGridColumn7.Visible = true;
- this.bandedGridColumn7.Width = 50;
+ this.bandedGridColumn7.Width = 62;
//
// bandedGridColumn8
//
this.bandedGridColumn8.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn8.Caption = "0.040";
this.bandedGridColumn8.FieldName = "aql00040";
- this.bandedGridColumn8.MinWidth = 50;
+ this.bandedGridColumn8.MinWidth = 62;
this.bandedGridColumn8.Name = "bandedGridColumn8";
this.bandedGridColumn8.Tag = "yz_quantity_0_edit";
this.bandedGridColumn8.Visible = true;
- this.bandedGridColumn8.Width = 50;
+ this.bandedGridColumn8.Width = 62;
//
// bandedGridColumn9
//
this.bandedGridColumn9.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn9.Caption = "0.065";
this.bandedGridColumn9.FieldName = "aql00065";
- this.bandedGridColumn9.MinWidth = 50;
+ this.bandedGridColumn9.MinWidth = 62;
this.bandedGridColumn9.Name = "bandedGridColumn9";
this.bandedGridColumn9.Tag = "yz_quantity_0_edit";
this.bandedGridColumn9.Visible = true;
- this.bandedGridColumn9.Width = 50;
+ this.bandedGridColumn9.Width = 62;
//
// bandedGridColumn10
//
this.bandedGridColumn10.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn10.Caption = "0.10";
this.bandedGridColumn10.FieldName = "aql0010";
- this.bandedGridColumn10.MinWidth = 50;
+ this.bandedGridColumn10.MinWidth = 62;
this.bandedGridColumn10.Name = "bandedGridColumn10";
this.bandedGridColumn10.Tag = "yz_quantity_0_edit";
this.bandedGridColumn10.Visible = true;
- this.bandedGridColumn10.Width = 50;
+ this.bandedGridColumn10.Width = 62;
//
// bandedGridColumn11
//
this.bandedGridColumn11.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn11.Caption = "0.15";
this.bandedGridColumn11.FieldName = "aql0015";
- this.bandedGridColumn11.MinWidth = 50;
+ this.bandedGridColumn11.MinWidth = 62;
this.bandedGridColumn11.Name = "bandedGridColumn11";
this.bandedGridColumn11.Tag = "yz_quantity_0_edit";
this.bandedGridColumn11.Visible = true;
- this.bandedGridColumn11.Width = 50;
+ this.bandedGridColumn11.Width = 62;
//
// bandedGridColumn12
//
this.bandedGridColumn12.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn12.Caption = "0.25";
this.bandedGridColumn12.FieldName = "aql0025";
- this.bandedGridColumn12.MinWidth = 50;
+ this.bandedGridColumn12.MinWidth = 62;
this.bandedGridColumn12.Name = "bandedGridColumn12";
this.bandedGridColumn12.Tag = "yz_quantity_0_edit";
this.bandedGridColumn12.Visible = true;
- this.bandedGridColumn12.Width = 50;
+ this.bandedGridColumn12.Width = 62;
//
// bandedGridColumn13
//
this.bandedGridColumn13.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn13.Caption = "0.40";
this.bandedGridColumn13.FieldName = "aql0040";
- this.bandedGridColumn13.MinWidth = 50;
+ this.bandedGridColumn13.MinWidth = 62;
this.bandedGridColumn13.Name = "bandedGridColumn13";
this.bandedGridColumn13.Tag = "yz_quantity_0_edit";
this.bandedGridColumn13.Visible = true;
- this.bandedGridColumn13.Width = 50;
+ this.bandedGridColumn13.Width = 62;
//
// bandedGridColumn14
//
this.bandedGridColumn14.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn14.Caption = "0.65";
this.bandedGridColumn14.FieldName = "aql0065";
- this.bandedGridColumn14.MinWidth = 50;
+ this.bandedGridColumn14.MinWidth = 62;
this.bandedGridColumn14.Name = "bandedGridColumn14";
this.bandedGridColumn14.Tag = "yz_quantity_0_edit";
this.bandedGridColumn14.Visible = true;
- this.bandedGridColumn14.Width = 50;
+ this.bandedGridColumn14.Width = 62;
//
// bandedGridColumn15
//
this.bandedGridColumn15.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn15.Caption = "1.0";
this.bandedGridColumn15.FieldName = "aql0100";
- this.bandedGridColumn15.MinWidth = 50;
+ this.bandedGridColumn15.MinWidth = 62;
this.bandedGridColumn15.Name = "bandedGridColumn15";
this.bandedGridColumn15.Tag = "yz_quantity_0_edit";
this.bandedGridColumn15.Visible = true;
- this.bandedGridColumn15.Width = 50;
+ this.bandedGridColumn15.Width = 62;
//
// bandedGridColumn16
//
this.bandedGridColumn16.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn16.Caption = "1.5";
this.bandedGridColumn16.FieldName = "aql0150";
- this.bandedGridColumn16.MinWidth = 50;
+ this.bandedGridColumn16.MinWidth = 62;
this.bandedGridColumn16.Name = "bandedGridColumn16";
this.bandedGridColumn16.Tag = "yz_quantity_0_edit";
this.bandedGridColumn16.Visible = true;
- this.bandedGridColumn16.Width = 50;
+ this.bandedGridColumn16.Width = 62;
//
// bandedGridColumn17
//
this.bandedGridColumn17.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn17.Caption = "2.5";
this.bandedGridColumn17.FieldName = "aql0250";
- this.bandedGridColumn17.MinWidth = 50;
+ this.bandedGridColumn17.MinWidth = 62;
this.bandedGridColumn17.Name = "bandedGridColumn17";
this.bandedGridColumn17.Tag = "yz_quantity_0_edit";
this.bandedGridColumn17.Visible = true;
- this.bandedGridColumn17.Width = 50;
+ this.bandedGridColumn17.Width = 62;
//
// bandedGridColumn18
//
this.bandedGridColumn18.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn18.Caption = "4.0";
this.bandedGridColumn18.FieldName = "aql0400";
- this.bandedGridColumn18.MinWidth = 50;
+ this.bandedGridColumn18.MinWidth = 62;
this.bandedGridColumn18.Name = "bandedGridColumn18";
this.bandedGridColumn18.Tag = "yz_quantity_0_edit";
this.bandedGridColumn18.Visible = true;
- this.bandedGridColumn18.Width = 50;
+ this.bandedGridColumn18.Width = 62;
//
// bandedGridColumn19
//
this.bandedGridColumn19.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn19.Caption = "6.5";
this.bandedGridColumn19.FieldName = "aql0650";
- this.bandedGridColumn19.MinWidth = 50;
+ this.bandedGridColumn19.MinWidth = 62;
this.bandedGridColumn19.Name = "bandedGridColumn19";
this.bandedGridColumn19.Tag = "yz_quantity_0_edit";
this.bandedGridColumn19.Visible = true;
- this.bandedGridColumn19.Width = 50;
+ this.bandedGridColumn19.Width = 62;
//
// bandedGridColumn20
//
this.bandedGridColumn20.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn20.Caption = "10";
this.bandedGridColumn20.FieldName = "aql1000";
- this.bandedGridColumn20.MinWidth = 50;
+ this.bandedGridColumn20.MinWidth = 62;
this.bandedGridColumn20.Name = "bandedGridColumn20";
this.bandedGridColumn20.Tag = "yz_quantity_0_edit";
this.bandedGridColumn20.Visible = true;
- this.bandedGridColumn20.Width = 50;
+ this.bandedGridColumn20.Width = 62;
//
// gridBand15
//
this.gridBand15.Caption = "gridBand15";
this.gridBand15.Columns.Add(this.bandedGridColumn21);
+ this.gridBand15.MinWidth = 12;
this.gridBand15.Name = "gridBand15";
this.gridBand15.VisibleIndex = 3;
- this.gridBand15.Width = 100;
+ this.gridBand15.Width = 125;
//
// bandedGridColumn21
//
this.bandedGridColumn21.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn21.Caption = "澶囨敞";
this.bandedGridColumn21.FieldName = "memo";
- this.bandedGridColumn21.MinWidth = 50;
+ this.bandedGridColumn21.MinWidth = 62;
this.bandedGridColumn21.Name = "bandedGridColumn21";
this.bandedGridColumn21.Tag = "edit";
this.bandedGridColumn21.Visible = true;
- this.bandedGridColumn21.Width = 100;
+ this.bandedGridColumn21.Width = 125;
//
// gridBand18
//
this.gridBand18.Caption = "gridBand18";
this.gridBand18.Columns.Add(this.bandedGridColumn22);
+ this.gridBand18.MinWidth = 12;
this.gridBand18.Name = "gridBand18";
this.gridBand18.VisibleIndex = 4;
- this.gridBand18.Width = 100;
+ this.gridBand18.Width = 125;
//
// bandedGridColumn22
//
this.bandedGridColumn22.Caption = "绉婚櫎";
this.bandedGridColumn22.ColumnEdit = this.repositoryItemButtonEdit2;
- this.bandedGridColumn22.MinWidth = 50;
+ this.bandedGridColumn22.MinWidth = 62;
this.bandedGridColumn22.Name = "bandedGridColumn22";
this.bandedGridColumn22.Visible = true;
- this.bandedGridColumn22.Width = 100;
+ this.bandedGridColumn22.Width = 125;
//
// bandedGridColumn1
//
this.bandedGridColumn1.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn1.Caption = "guid ";
this.bandedGridColumn1.FieldName = "guid";
- this.bandedGridColumn1.MinWidth = 50;
+ this.bandedGridColumn1.MinWidth = 62;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "query_a.guid";
- this.bandedGridColumn1.Width = 100;
+ this.bandedGridColumn1.Width = 125;
//
// bandedGridColumn2
//
this.bandedGridColumn2.AppearanceCell.Options.UseFont = true;
this.bandedGridColumn2.Caption = "AQL鎶芥牱鍩哄噯ID";
this.bandedGridColumn2.FieldName = "aql1Id";
- this.bandedGridColumn2.MinWidth = 50;
+ this.bandedGridColumn2.MinWidth = 62;
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.Tag = "query_a.AQL1_ID";
- this.bandedGridColumn2.Width = 94;
+ this.bandedGridColumn2.Width = 117;
+ //
+ // tabMxPage3
+ //
+ this.tabMxPage3.Controls.Add(this.gridSplitContainer1);
+ this.tabMxPage3.Name = "tabMxPage3";
+ this.tabMxPage3.Size = new System.Drawing.Size(2181, 523);
+ this.tabMxPage3.Text = "AQL鏂规";
+ //
+ // gridSplitContainer1
+ //
+ this.gridSplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gridSplitContainer1.Grid = this.gcMx3;
+ this.gridSplitContainer1.Location = new System.Drawing.Point(0, 0);
+ this.gridSplitContainer1.Name = "gridSplitContainer1";
+ //
+ // gridSplitContainer1.Panel1
+ //
+ this.gridSplitContainer1.Panel1.Controls.Add(this.gcMx3);
+ this.gridSplitContainer1.Size = new System.Drawing.Size(2181, 523);
+ this.gridSplitContainer1.TabIndex = 0;
+ //
+ // gcMx3
+ //
+ this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMx3.Location = new System.Drawing.Point(0, 0);
+ this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMx3.Name = "gcMx3";
+ this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemComboBox9,
+ this.repositoryItemButtonEdit3});
+ this.gcMx3.Size = new System.Drawing.Size(2181, 523);
+ this.gcMx3.TabIndex = 1;
+ this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx3,
+ this.advBandedGridView3});
+ //
+ // gvMx3
+ //
+ this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx3.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand40,
+ this.gridBand42});
+ this.gvMx3.ColumnPanelRowHeight = 61;
+ this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
+ this.gvMx3guid,
+ this.gvMx3aql1Id,
+ this.aqlType,
+ this.aqlTypeCr,
+ this.aqlTypeMa,
+ this.aqlTypeMi});
+ this.gvMx3.DetailHeight = 428;
+ this.gvMx3.GridControl = this.gcMx3;
+ this.gvMx3.Name = "gvMx3";
+ this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx3.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+ this.gvMx3.OptionsView.ShowColumnHeaders = false;
+ this.gvMx3.OptionsView.ShowGroupPanel = false;
+ //
+ // aqlType
+ //
+ this.aqlType.Caption = "AQL鎷掓敹璐ㄩ噺姘村钩";
+ this.aqlType.FieldName = "aqlType";
+ this.aqlType.MinWidth = 30;
+ this.aqlType.Name = "aqlType";
+ this.aqlType.Tag = "aqlType";
+ this.aqlType.Visible = true;
+ this.aqlType.Width = 112;
+ //
+ // aqlTypeCr
+ //
+ this.aqlTypeCr.Caption = "CR";
+ this.aqlTypeCr.FieldName = "aqlTypeCr";
+ this.aqlTypeCr.MinWidth = 30;
+ this.aqlTypeCr.Name = "aqlTypeCr";
+ this.aqlTypeCr.Tag = "edit";
+ this.aqlTypeCr.Visible = true;
+ this.aqlTypeCr.Width = 112;
+ //
+ // aqlTypeMa
+ //
+ this.aqlTypeMa.Caption = "MA";
+ this.aqlTypeMa.FieldName = "aqlTypeMa";
+ this.aqlTypeMa.MinWidth = 30;
+ this.aqlTypeMa.Name = "aqlTypeMa";
+ this.aqlTypeMa.Tag = "edit";
+ this.aqlTypeMa.Visible = true;
+ this.aqlTypeMa.Width = 112;
+ //
+ // aqlTypeMi
+ //
+ this.aqlTypeMi.Caption = "MI";
+ this.aqlTypeMi.FieldName = "aqlTypeMi";
+ this.aqlTypeMi.MinWidth = 30;
+ this.aqlTypeMi.Name = "aqlTypeMi";
+ this.aqlTypeMi.Tag = "edit";
+ this.aqlTypeMi.Visible = true;
+ this.aqlTypeMi.Width = 112;
+ //
+ // gvMx3guid
+ //
+ this.gvMx3guid.AppearanceCell.Options.UseFont = true;
+ this.gvMx3guid.Caption = "guid ";
+ this.gvMx3guid.FieldName = "guid";
+ this.gvMx3guid.MinWidth = 62;
+ this.gvMx3guid.Name = "gvMx3guid";
+ this.gvMx3guid.RowIndex = 1;
+ this.gvMx3guid.Tag = "query_a.guid";
+ this.gvMx3guid.Width = 125;
+ //
+ // gvMx3aql1Id
+ //
+ this.gvMx3aql1Id.AppearanceCell.Options.UseFont = true;
+ this.gvMx3aql1Id.Caption = "AQL鎶芥牱鍩哄噯ID";
+ this.gvMx3aql1Id.FieldName = "aql1Id";
+ this.gvMx3aql1Id.MinWidth = 62;
+ this.gvMx3aql1Id.Name = "gvMx3aql1Id";
+ this.gvMx3aql1Id.RowIndex = 1;
+ this.gvMx3aql1Id.Tag = "query_a.AQL1_ID";
+ this.gvMx3aql1Id.Width = 117;
+ //
+ // repositoryItemComboBox9
+ //
+ this.repositoryItemComboBox9.AutoHeight = false;
+ this.repositoryItemComboBox9.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox9.Name = "repositoryItemComboBox9";
+ //
+ // repositoryItemButtonEdit3
+ //
+ this.repositoryItemButtonEdit3.AutoHeight = false;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
+ this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ //
+ // advBandedGridView3
+ //
+ this.advBandedGridView3.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.advBandedGridView3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.advBandedGridView3.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand61,
+ this.gridBand62,
+ this.gridBand63,
+ this.gridBand64,
+ this.gridBand65});
+ this.advBandedGridView3.ColumnPanelRowHeight = 61;
+ this.advBandedGridView3.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
+ this.bandedGridColumn65,
+ this.bandedGridColumn66,
+ this.bandedGridColumn45,
+ this.bandedGridColumn46,
+ this.bandedGridColumn47,
+ this.bandedGridColumn48,
+ this.bandedGridColumn49,
+ this.bandedGridColumn50,
+ this.bandedGridColumn51,
+ this.bandedGridColumn52,
+ this.bandedGridColumn53,
+ this.bandedGridColumn54,
+ this.bandedGridColumn55,
+ this.bandedGridColumn56,
+ this.bandedGridColumn57,
+ this.bandedGridColumn58,
+ this.bandedGridColumn59,
+ this.bandedGridColumn60,
+ this.bandedGridColumn61,
+ this.bandedGridColumn62,
+ this.bandedGridColumn63,
+ this.bandedGridColumn64});
+ this.advBandedGridView3.CustomizationFormBounds = new System.Drawing.Rectangle(1121, 484, 410, 452);
+ this.advBandedGridView3.DetailHeight = 428;
+ this.advBandedGridView3.GridControl = this.gcMx3;
+ this.advBandedGridView3.Name = "advBandedGridView3";
+ this.advBandedGridView3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.advBandedGridView3.OptionsFind.ShowSearchNavButtons = false;
+ this.advBandedGridView3.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+ this.advBandedGridView3.OptionsView.ShowGroupPanel = false;
+ //
+ // gridBand61
+ //
+ this.gridBand61.Caption = "gridBand16";
+ this.gridBand61.Columns.Add(this.bandedGridColumn45);
+ this.gridBand61.MinWidth = 12;
+ this.gridBand61.Name = "gridBand61";
+ this.gridBand61.VisibleIndex = 0;
+ this.gridBand61.Width = 101;
+ //
+ // bandedGridColumn45
+ //
+ this.bandedGridColumn45.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn45.Caption = "鏍锋湰澶у皬";
+ this.bandedGridColumn45.FieldName = "fsampleSizeWord";
+ this.bandedGridColumn45.MinWidth = 62;
+ this.bandedGridColumn45.Name = "bandedGridColumn45";
+ this.bandedGridColumn45.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn45.Visible = true;
+ this.bandedGridColumn45.Width = 101;
+ //
+ // gridBand62
+ //
+ this.gridBand62.AutoFillDown = false;
+ this.gridBand62.Caption = "gridBand17";
+ this.gridBand62.Columns.Add(this.bandedGridColumn46);
+ this.gridBand62.MinWidth = 12;
+ this.gridBand62.Name = "gridBand62";
+ this.gridBand62.RowCount = 3;
+ this.gridBand62.VisibleIndex = 1;
+ this.gridBand62.Width = 127;
+ //
+ // bandedGridColumn46
+ //
+ this.bandedGridColumn46.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn46.Caption = "鏍锋湰澶у皬瀛楃爜";
+ this.bandedGridColumn46.ColumnEdit = this.repositoryItemComboBox9;
+ this.bandedGridColumn46.FieldName = "sampleSizeWord";
+ this.bandedGridColumn46.MinWidth = 125;
+ this.bandedGridColumn46.Name = "bandedGridColumn46";
+ this.bandedGridColumn46.Tag = "edit";
+ this.bandedGridColumn46.Visible = true;
+ this.bandedGridColumn46.Width = 127;
+ //
+ // gridBand63
+ //
+ this.gridBand63.Caption = "gridBand1";
+ this.gridBand63.Columns.Add(this.bandedGridColumn47);
+ this.gridBand63.Columns.Add(this.bandedGridColumn48);
+ this.gridBand63.Columns.Add(this.bandedGridColumn49);
+ this.gridBand63.Columns.Add(this.bandedGridColumn50);
+ this.gridBand63.Columns.Add(this.bandedGridColumn51);
+ this.gridBand63.Columns.Add(this.bandedGridColumn52);
+ this.gridBand63.Columns.Add(this.bandedGridColumn53);
+ this.gridBand63.Columns.Add(this.bandedGridColumn54);
+ this.gridBand63.Columns.Add(this.bandedGridColumn55);
+ this.gridBand63.Columns.Add(this.bandedGridColumn56);
+ this.gridBand63.Columns.Add(this.bandedGridColumn57);
+ this.gridBand63.Columns.Add(this.bandedGridColumn58);
+ this.gridBand63.Columns.Add(this.bandedGridColumn59);
+ this.gridBand63.Columns.Add(this.bandedGridColumn60);
+ this.gridBand63.Columns.Add(this.bandedGridColumn61);
+ this.gridBand63.Columns.Add(this.bandedGridColumn62);
+ this.gridBand63.MinWidth = 12;
+ this.gridBand63.Name = "gridBand63";
+ this.gridBand63.VisibleIndex = 2;
+ this.gridBand63.Width = 1000;
+ //
+ // bandedGridColumn47
+ //
+ this.bandedGridColumn47.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn47.Caption = "0.010";
+ this.bandedGridColumn47.FieldName = "aql00010";
+ this.bandedGridColumn47.MinWidth = 62;
+ this.bandedGridColumn47.Name = "bandedGridColumn47";
+ this.bandedGridColumn47.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn47.Visible = true;
+ this.bandedGridColumn47.Width = 62;
+ //
+ // bandedGridColumn48
+ //
+ this.bandedGridColumn48.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn48.Caption = "0.015";
+ this.bandedGridColumn48.FieldName = "aql00015";
+ this.bandedGridColumn48.MinWidth = 62;
+ this.bandedGridColumn48.Name = "bandedGridColumn48";
+ this.bandedGridColumn48.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn48.Visible = true;
+ this.bandedGridColumn48.Width = 62;
+ //
+ // bandedGridColumn49
+ //
+ this.bandedGridColumn49.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn49.Caption = "0.025";
+ this.bandedGridColumn49.FieldName = "aql00025";
+ this.bandedGridColumn49.MinWidth = 62;
+ this.bandedGridColumn49.Name = "bandedGridColumn49";
+ this.bandedGridColumn49.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn49.Visible = true;
+ this.bandedGridColumn49.Width = 62;
+ //
+ // bandedGridColumn50
+ //
+ this.bandedGridColumn50.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn50.Caption = "0.040";
+ this.bandedGridColumn50.FieldName = "aql00040";
+ this.bandedGridColumn50.MinWidth = 62;
+ this.bandedGridColumn50.Name = "bandedGridColumn50";
+ this.bandedGridColumn50.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn50.Visible = true;
+ this.bandedGridColumn50.Width = 62;
+ //
+ // bandedGridColumn51
+ //
+ this.bandedGridColumn51.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn51.Caption = "0.065";
+ this.bandedGridColumn51.FieldName = "aql00065";
+ this.bandedGridColumn51.MinWidth = 62;
+ this.bandedGridColumn51.Name = "bandedGridColumn51";
+ this.bandedGridColumn51.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn51.Visible = true;
+ this.bandedGridColumn51.Width = 62;
+ //
+ // bandedGridColumn52
+ //
+ this.bandedGridColumn52.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn52.Caption = "0.10";
+ this.bandedGridColumn52.FieldName = "aql0010";
+ this.bandedGridColumn52.MinWidth = 62;
+ this.bandedGridColumn52.Name = "bandedGridColumn52";
+ this.bandedGridColumn52.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn52.Visible = true;
+ this.bandedGridColumn52.Width = 62;
+ //
+ // bandedGridColumn53
+ //
+ this.bandedGridColumn53.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn53.Caption = "0.15";
+ this.bandedGridColumn53.FieldName = "aql0015";
+ this.bandedGridColumn53.MinWidth = 62;
+ this.bandedGridColumn53.Name = "bandedGridColumn53";
+ this.bandedGridColumn53.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn53.Visible = true;
+ this.bandedGridColumn53.Width = 62;
+ //
+ // bandedGridColumn54
+ //
+ this.bandedGridColumn54.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn54.Caption = "0.25";
+ this.bandedGridColumn54.FieldName = "aql0025";
+ this.bandedGridColumn54.MinWidth = 62;
+ this.bandedGridColumn54.Name = "bandedGridColumn54";
+ this.bandedGridColumn54.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn54.Visible = true;
+ this.bandedGridColumn54.Width = 62;
+ //
+ // bandedGridColumn55
+ //
+ this.bandedGridColumn55.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn55.Caption = "0.40";
+ this.bandedGridColumn55.FieldName = "aql0040";
+ this.bandedGridColumn55.MinWidth = 62;
+ this.bandedGridColumn55.Name = "bandedGridColumn55";
+ this.bandedGridColumn55.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn55.Visible = true;
+ this.bandedGridColumn55.Width = 62;
+ //
+ // bandedGridColumn56
+ //
+ this.bandedGridColumn56.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn56.Caption = "0.65";
+ this.bandedGridColumn56.FieldName = "aql0065";
+ this.bandedGridColumn56.MinWidth = 62;
+ this.bandedGridColumn56.Name = "bandedGridColumn56";
+ this.bandedGridColumn56.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn56.Visible = true;
+ this.bandedGridColumn56.Width = 62;
+ //
+ // bandedGridColumn57
+ //
+ this.bandedGridColumn57.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn57.Caption = "1.0";
+ this.bandedGridColumn57.FieldName = "aql0100";
+ this.bandedGridColumn57.MinWidth = 62;
+ this.bandedGridColumn57.Name = "bandedGridColumn57";
+ this.bandedGridColumn57.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn57.Visible = true;
+ this.bandedGridColumn57.Width = 62;
+ //
+ // bandedGridColumn58
+ //
+ this.bandedGridColumn58.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn58.Caption = "1.5";
+ this.bandedGridColumn58.FieldName = "aql0150";
+ this.bandedGridColumn58.MinWidth = 62;
+ this.bandedGridColumn58.Name = "bandedGridColumn58";
+ this.bandedGridColumn58.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn58.Visible = true;
+ this.bandedGridColumn58.Width = 62;
+ //
+ // bandedGridColumn59
+ //
+ this.bandedGridColumn59.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn59.Caption = "2.5";
+ this.bandedGridColumn59.FieldName = "aql0250";
+ this.bandedGridColumn59.MinWidth = 62;
+ this.bandedGridColumn59.Name = "bandedGridColumn59";
+ this.bandedGridColumn59.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn59.Visible = true;
+ this.bandedGridColumn59.Width = 62;
+ //
+ // bandedGridColumn60
+ //
+ this.bandedGridColumn60.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn60.Caption = "4.0";
+ this.bandedGridColumn60.FieldName = "aql0400";
+ this.bandedGridColumn60.MinWidth = 62;
+ this.bandedGridColumn60.Name = "bandedGridColumn60";
+ this.bandedGridColumn60.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn60.Visible = true;
+ this.bandedGridColumn60.Width = 62;
+ //
+ // bandedGridColumn61
+ //
+ this.bandedGridColumn61.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn61.Caption = "6.5";
+ this.bandedGridColumn61.FieldName = "aql0650";
+ this.bandedGridColumn61.MinWidth = 62;
+ this.bandedGridColumn61.Name = "bandedGridColumn61";
+ this.bandedGridColumn61.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn61.Visible = true;
+ this.bandedGridColumn61.Width = 62;
+ //
+ // bandedGridColumn62
+ //
+ this.bandedGridColumn62.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn62.Caption = "10";
+ this.bandedGridColumn62.FieldName = "aql1000";
+ this.bandedGridColumn62.MinWidth = 62;
+ this.bandedGridColumn62.Name = "bandedGridColumn62";
+ this.bandedGridColumn62.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn62.Visible = true;
+ this.bandedGridColumn62.Width = 62;
+ //
+ // gridBand64
+ //
+ this.gridBand64.Caption = "gridBand15";
+ this.gridBand64.Columns.Add(this.bandedGridColumn63);
+ this.gridBand64.MinWidth = 12;
+ this.gridBand64.Name = "gridBand64";
+ this.gridBand64.VisibleIndex = 3;
+ this.gridBand64.Width = 125;
+ //
+ // bandedGridColumn63
+ //
+ this.bandedGridColumn63.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn63.Caption = "澶囨敞";
+ this.bandedGridColumn63.FieldName = "memo";
+ this.bandedGridColumn63.MinWidth = 62;
+ this.bandedGridColumn63.Name = "bandedGridColumn63";
+ this.bandedGridColumn63.Tag = "edit";
+ this.bandedGridColumn63.Visible = true;
+ this.bandedGridColumn63.Width = 125;
+ //
+ // gridBand65
+ //
+ this.gridBand65.Caption = "gridBand18";
+ this.gridBand65.Columns.Add(this.bandedGridColumn64);
+ this.gridBand65.MinWidth = 12;
+ this.gridBand65.Name = "gridBand65";
+ this.gridBand65.VisibleIndex = 4;
+ this.gridBand65.Width = 125;
+ //
+ // bandedGridColumn64
+ //
+ this.bandedGridColumn64.Caption = "绉婚櫎";
+ this.bandedGridColumn64.ColumnEdit = this.repositoryItemButtonEdit3;
+ this.bandedGridColumn64.MinWidth = 62;
+ this.bandedGridColumn64.Name = "bandedGridColumn64";
+ this.bandedGridColumn64.Visible = true;
+ this.bandedGridColumn64.Width = 125;
+ //
+ // bandedGridColumn65
+ //
+ this.bandedGridColumn65.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn65.Caption = "guid ";
+ this.bandedGridColumn65.FieldName = "guid";
+ this.bandedGridColumn65.MinWidth = 62;
+ this.bandedGridColumn65.Name = "bandedGridColumn65";
+ this.bandedGridColumn65.Tag = "query_a.guid";
+ this.bandedGridColumn65.Width = 125;
+ //
+ // bandedGridColumn66
+ //
+ this.bandedGridColumn66.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn66.Caption = "AQL鎶芥牱鍩哄噯ID";
+ this.bandedGridColumn66.FieldName = "aql1Id";
+ this.bandedGridColumn66.MinWidth = 62;
+ this.bandedGridColumn66.Name = "bandedGridColumn66";
+ this.bandedGridColumn66.Tag = "query_a.AQL1_ID";
+ this.bandedGridColumn66.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1016, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1270, 67);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridView2
+ //
+ this.gridView2.Name = "gridView2";
+ //
+ // bandedGridColumn26
+ //
+ this.bandedGridColumn26.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn26.Caption = "鏍锋湰澶у皬瀛楃爜";
+ this.bandedGridColumn26.FieldName = "sampleSizeWord";
+ this.bandedGridColumn26.MinWidth = 125;
+ this.bandedGridColumn26.Name = "bandedGridColumn26";
+ this.bandedGridColumn26.Tag = "edit";
+ this.bandedGridColumn26.Width = 137;
+ //
+ // bandedGridColumn23
+ //
+ this.bandedGridColumn23.AppearanceCell.Options.UseFont = true;
+ this.bandedGridColumn23.Caption = "鏍锋湰澶у皬";
+ this.bandedGridColumn23.FieldName = "fsampleSizeWord";
+ this.bandedGridColumn23.MinWidth = 100;
+ this.bandedGridColumn23.Name = "bandedGridColumn23";
+ this.bandedGridColumn23.Tag = "yz_quantity_0_edit";
+ this.bandedGridColumn23.Width = 142;
+ //
+ // gridBand40
+ //
+ this.gridBand40.Caption = "鎷掓敹璐ㄩ噺姘村钩";
+ this.gridBand40.Columns.Add(this.aqlType);
+ this.gridBand40.MinWidth = 12;
+ this.gridBand40.Name = "gridBand40";
+ this.gridBand40.VisibleIndex = 0;
+ this.gridBand40.Width = 112;
+ //
+ // gridBand42
+ //
+ this.gridBand42.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand42.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand42.Caption = "AQL绫诲瀷";
+ this.gridBand42.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand48,
+ this.gridBand49,
+ this.gridBand50});
+ this.gridBand42.ImageOptions.Alignment = System.Drawing.StringAlignment.Center;
+ this.gridBand42.MinWidth = 12;
+ this.gridBand42.Name = "gridBand42";
+ this.gridBand42.VisibleIndex = 1;
+ this.gridBand42.Width = 336;
+ //
+ // gridBand48
+ //
+ this.gridBand48.Caption = "CR";
+ this.gridBand48.Columns.Add(this.aqlTypeCr);
+ this.gridBand48.Name = "gridBand48";
+ this.gridBand48.VisibleIndex = 0;
+ this.gridBand48.Width = 112;
+ //
+ // gridBand49
+ //
+ this.gridBand49.Caption = "MA";
+ this.gridBand49.Columns.Add(this.aqlTypeMa);
+ this.gridBand49.Name = "gridBand49";
+ this.gridBand49.VisibleIndex = 1;
+ this.gridBand49.Width = 112;
+ //
+ // gridBand50
+ //
+ this.gridBand50.Caption = "MI";
+ this.gridBand50.Columns.Add(this.aqlTypeMi);
+ this.gridBand50.Name = "gridBand50";
+ this.gridBand50.VisibleIndex = 2;
+ this.gridBand50.Width = 112;
+ //
// Frm_MesQmAql1
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1748, 682);
+ this.ClientSize = new System.Drawing.Size(2185, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_MesQmAql1";
this.Text = "鎶芥牱鍩哄噯";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2135,7 +2807,19 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.advBandedGridView1)).EndInit();
+ this.tabMxPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gridSplitContainer1.Panel1)).EndInit();
+ this.gridSplitContainer1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gridSplitContainer1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridSplitContainer1)).EndInit();
+ this.gridSplitContainer1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.advBandedGridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
this.ResumeLayout(false);
}
@@ -2299,5 +2983,53 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage3;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+ private DevExpress.XtraGrid.GridControl gcMx3;
+ private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView gvMx3;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx3guid;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx3aql1Id;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox9;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
+ private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView advBandedGridView3;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand61;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn45;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand62;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn46;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand63;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn47;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn48;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn49;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn50;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn51;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn52;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn53;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn54;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn55;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn56;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn57;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn58;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn59;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn60;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn61;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn62;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand64;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn63;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand65;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn64;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn65;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn66;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn26;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn23;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn aqlType;
+ private DevExpress.XtraGrid.GridSplitContainer gridSplitContainer1;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn aqlTypeCr;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn aqlTypeMa;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn aqlTypeMi;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand40;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand42;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand48;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand49;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand50;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 6d87553..2556e59 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Linq;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -57,6 +58,7 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -202,6 +204,7 @@
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
+ gridViews.Add(gvMx3);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gridViews);
}
}
@@ -217,9 +220,11 @@
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
+ gridViews.Add(gvMx3);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
txt_createDate.Text = DateTime.Now.ToString("G");
txt_fversion.Text = "1";
}
@@ -250,6 +255,9 @@
gvMx2.CloseEditor();
gvMx2.PostEditor();
gvMx2.UpdateCurrentRow();
+ gvMx3.CloseEditor();
+ gvMx3.PostEditor();
+ gvMx3.UpdateCurrentRow();
try
{
var qmaql2 = new List<MesQmAql2>();
@@ -325,6 +333,27 @@
});
}
}
+ var qmaql4 = new List<MesQmAql4>();
+ for (var i = 0; i < gvMx3.DataRowCount; i++)
+ {
+ var row = gvMx3.GetDataRow(i);
+ if (row != null)
+ {
+ if (string.IsNullOrEmpty(row["aqlType"].ToString()))
+ {
+ MsgHelper.ShowError("鎷掓敹璐ㄩ噺姘村钩涓嶈兘涓虹┖锛�");
+ return;
+ }
+ qmaql4.Add(new MesQmAql4
+ {
+ Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
+ AqlType = Convert.ToDecimal(row["AqlType"].ToString()),
+ AqlTypeCr = row["AqlTypeCr"].ToString(),
+ AqlTypeMa = row["AqlTypeMa"].ToString(),
+ AqlTypeMi = row["AqlTypeMi"].ToString(),
+ });
+ }
+ }
if (qmaql2.Count <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
@@ -333,6 +362,11 @@
if (qmaql3.Count <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (qmaql4.Count <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("AQL鎶芥牱鍩哄噯涓嶈兘涓虹┖锛�");
return;
}
var _obj = new MesQmAql1
@@ -347,7 +381,8 @@
FoneChecked = false,
Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
MesQmAql2s = qmaql2,
- MesQmAql3s = qmaql3
+ MesQmAql3s = qmaql3,
+ MesQmAql4s = qmaql4
};
try
{
@@ -362,6 +397,7 @@
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
+ gridViews.Add(gvMx3);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
@@ -452,10 +488,12 @@
List<GridView> gvList = new List<GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
+ gvList.Add(gvMx3);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
JArray mesQmAql3s = new JArray();
+ JArray mesQmAql4s = new JArray();
foreach (var a in _job["rtnData"]["mesQmAql2s"])
{
array.Add(a);
@@ -486,7 +524,24 @@
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
+ }
+
+ foreach (var a in _job["rtnData"]["mesQmAql4s"])
+ {
+ mesQmAql4s.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(mesQmAql4s.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx3.BindingContext = new BindingContext();
+ gcMx3.DataSource = dt2;
+ gcMx3.ForceInitialize();
+ // gvMx3.BestFitColumns();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
}
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.resx
index a4826a3..3e47dc1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>88</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs
index c6060a6..315c918 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs
@@ -102,5 +102,7 @@
public List<MesQmAql2> MesQmAql2s { get; set; }
public List<MesQmAql3> MesQmAql3s { get; set; }
+
+ public List<MesQmAql4> MesQmAql4s { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql4.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql4.cs
new file mode 100644
index 0000000..ccdd9d6
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql4.cs
@@ -0,0 +1,35 @@
+锘縰sing System;
+
+namespace Gs.DevApp.DevFrm.QC.Models
+{
+ /// <summary>
+ /// AQL鎶芥牱鍩哄噯鎶芥牱鏂规
+ ///</summary>
+ public class MesQmAql4
+ {
+ /// <summary>
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+ public Guid Guid { get; set; }
+ /// <summary>
+ /// AQL鎶芥牱鍩哄噯ID
+ ///</summary>
+ public Guid? Aql1Id { get; set; }
+ /// <summary>
+ /// 鎷掓敹璐ㄩ噺姘村钩
+ /// </summary>
+ public decimal AqlType { get; set; }
+ /// <summary>
+ /// AQL绫诲瀷(CR)
+ ///</summary>
+ public string AqlTypeCr { get; set; }
+ /// <summary>
+ /// AQL绫诲瀷(MA)
+ ///</summary>
+ public string AqlTypeMa { get; set; }
+ /// <summary>
+ /// AQL绫诲瀷(MI)
+ ///</summary>
+ public string AqlTypeMi { get; set; }
+ }
+}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index cf2cd75..06ca45c 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -669,6 +669,7 @@
<Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQmAql4.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
<Compile Include="DevFrm\QC\Models\MesQmCheckitem.cs" />
<Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
--
Gitblit v1.9.3