From 656a8d693ced3276c3df1a173ea386fdb0a0d642 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 11 十一月 2025 14:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs | 637 ++++++++++++++++-------------
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs | 591 +++++++++++++++------------
2 files changed, 665 insertions(+), 563 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
index cfe2b81..91aedbb 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -314,9 +314,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, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1344, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1680, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -324,10 +325,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, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1344, 720);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1680, 880);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -336,8 +338,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1678, 842);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -346,6 +349,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, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -358,19 +362,21 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1342, 688);
+ this.split1.Size = new System.Drawing.Size(1678, 842);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptButtonUrl});
- this.gcMain1.Size = new System.Drawing.Size(1342, 638);
+ this.gcMain1.Size = new System.Drawing.Size(1678, 781);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -409,8 +415,9 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn7});
+ 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;
@@ -421,123 +428,122 @@
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑";
this.gv_fsubmit.FieldName = "fsubmitTxt";
- this.gv_fsubmit.MinWidth = 30;
+ this.gv_fsubmit.MinWidth = 37;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.UnboundDataType = typeof(bool);
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.VisibleIndex = 0;
- this.gv_fsubmit.Width = 50;
+ this.gv_fsubmit.Width = 62;
//
// gv_releaseNo
//
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 30;
+ this.gv_releaseNo.MinWidth = 37;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.VisibleIndex = 2;
- this.gv_releaseNo.Width = 100;
+ this.gv_releaseNo.Width = 125;
//
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "宸ュ崟鍗曞彿";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 30;
+ this.gv_lotNo.MinWidth = 37;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
this.gv_lotNo.VisibleIndex = 3;
- this.gv_lotNo.Width = 120;
+ this.gv_lotNo.Width = 150;
//
// gridColumn23
//
this.gridColumn23.Caption = "浜х嚎鍚嶇О";
this.gridColumn23.FieldName = "lineName";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 4;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 117;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 30;
+ this.gv_itemId.MinWidth = 37;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
- this.gv_itemId.Width = 30;
+ this.gv_itemId.Width = 37;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo2";
- this.gv_itemNo.MinWidth = 30;
+ this.gv_itemNo.MinWidth = 37;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
this.gv_itemNo.VisibleIndex = 7;
- this.gv_itemNo.Width = 136;
+ this.gv_itemNo.Width = 170;
//
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gv_boardStyle.FieldName = "itemName";
- this.gv_boardStyle.MinWidth = 30;
+ this.gv_boardStyle.MinWidth = 37;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
this.gv_boardStyle.VisibleIndex = 8;
- this.gv_boardStyle.Width = 164;
+ this.gv_boardStyle.Width = 205;
//
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 30;
+ this.gridColumn14.MinWidth = 37;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 9;
- this.gridColumn14.Width = 200;
+ this.gridColumn14.Width = 250;
//
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
this.gv_fcovertQty.Caption = "宸ュ崟鏁伴噺";
this.gv_fcovertQty.FieldName = "daaQty";
- this.gv_fcovertQty.MinWidth = 30;
+ this.gv_fcovertQty.MinWidth = 37;
this.gv_fcovertQty.Name = "gv_fcovertQty";
this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
this.gv_fcovertQty.VisibleIndex = 10;
- this.gv_fcovertQty.Width = 60;
//
// gv_fbatchQty
//
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
this.gv_fbatchQty.Caption = "鎶芥鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 30;
+ this.gv_fbatchQty.MinWidth = 37;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
- this.gv_fbatchQty.Width = 80;
+ this.gv_fbatchQty.Width = 100;
//
// gv_fcheckResu
//
@@ -548,159 +554,158 @@
this.gv_fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 30;
+ this.gv_fcheckResu.MinWidth = 37;
this.gv_fcheckResu.Name = "gv_fcheckResu";
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.VisibleIndex = 6;
- this.gv_fcheckResu.Width = 50;
+ this.gv_fcheckResu.Width = 62;
//
// gv_remarks
//
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "澶囨敞璇存槑";
this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 30;
+ this.gv_remarks.MinWidth = 37;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
- this.gv_remarks.Width = 100;
+ this.gv_remarks.Width = 125;
//
// gv_fcheckBy
//
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
- this.gv_fcheckBy.FieldName = "fcheckBy";
- this.gv_fcheckBy.MinWidth = 30;
+ this.gv_fcheckBy.FieldName = "fcheckByName";
+ this.gv_fcheckBy.MinWidth = 37;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
this.gv_fcheckBy.VisibleIndex = 11;
- this.gv_fcheckBy.Width = 118;
+ this.gv_fcheckBy.Width = 147;
//
// gv_fcheckDate
//
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 30;
+ this.gv_fcheckDate.MinWidth = 37;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
this.gv_fcheckDate.VisibleIndex = 12;
- this.gv_fcheckDate.Width = 182;
+ this.gv_fcheckDate.Width = 227;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 30;
+ this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.MinWidth = 37;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 13;
- this.gv_createBy.Width = 67;
+ this.gv_createBy.Width = 84;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 14;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 30;
+ this.gv_lastupdateBy.MinWidth = 37;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 30;
+ this.gv_lastupdateDate.MinWidth = 37;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Width = 120;
+ this.gv_lastupdateDate.Width = 150;
//
// gridColumn18
//
this.gridColumn18.Caption = "瀹℃牳浜�";
this.gridColumn18.FieldName = "fsubmitBy";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 15;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "瀹℃牳鏃ユ湡";
this.gridColumn19.FieldName = "fsubmitDate";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 16;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
//
// gridColumn30
//
this.gridColumn30.Caption = "绫诲瀷";
this.gridColumn30.FieldName = "orderType";
- this.gridColumn30.MinWidth = 25;
+ this.gridColumn30.MinWidth = 31;
this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Width = 94;
+ this.gridColumn30.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "浜х嚎ID";
this.gridColumn13.FieldName = "daa020";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "涓婚敭Guid";
this.gridColumn17.FieldName = "guid";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "瀹℃牳鐘舵��";
this.gridColumn5.FieldName = "txtColor";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍘绘楠�";
this.gridColumn6.ColumnEdit = this.rptButtonUrl;
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 1;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// rptButtonUrl
//
@@ -717,30 +722,31 @@
//
this.gridColumn7.Caption = "鐢熶骇缁勭粐";
this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 17;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 638);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 781);
+ 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(1342, 38);
+ this.pageBar1.Size = new System.Drawing.Size(1678, 46);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageVisible = false;
- this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1678, 842);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -748,6 +754,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, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -760,8 +767,8 @@
this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1342, 688);
- this.splitMx1.SplitterPosition = 185;
+ this.splitMx1.Size = new System.Drawing.Size(1678, 842);
+ this.splitMx1.SplitterPosition = 226;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -793,216 +800,239 @@
this.layoutControlItem17,
this.layoutControlItem21});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(827, 475, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1342, 185);
+ this.layoutMx1.Size = new System.Drawing.Size(1678, 226);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(987, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1234, 132);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(322, 28);
+ this.lbGuid.Size = new System.Drawing.Size(402, 34);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 124);
+ this.txt_remarks.Location = new System.Drawing.Point(101, 148);
+ this.txt_remarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(584, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(735, 28);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(744, 124);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(927, 148);
+ this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(322, 28);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_releaseNo.Location = new System.Drawing.Point(101, 14);
+ this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(322, 28);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(744, 40);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(927, 46);
+ this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(322, 28);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(744, 12);
+ this.txt_lotNo1.Location = new System.Drawing.Point(927, 14);
+ this.txt_lotNo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
+ this.txt_lotNo1.Size = new System.Drawing.Size(322, 28);
this.txt_lotNo1.StyleController = this.layoutMx1;
this.txt_lotNo1.TabIndex = 262;
this.txt_lotNo1.Tag = "";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(414, 68);
+ this.txt_itemNo.Location = new System.Drawing.Point(514, 80);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(322, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(414, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(514, 114);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(322, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(744, 68);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(927, 80);
+ this.txt_fcheckBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(322, 28);
this.txt_fcheckBy.StyleController = this.layoutMx1;
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(514, 14);
+ this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(322, 28);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 96);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1340, 114);
+ this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(324, 28);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 804;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 68);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1340, 80);
+ this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(324, 28);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 805;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 124);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1253, 148);
+ this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
+ this.txt_fsubmit.Size = new System.Drawing.Size(411, 27);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1065, 108);
+ this.txt_guid.Location = new System.Drawing.Point(1331, 132);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(244, 24);
+ this.txt_guid.Size = new System.Drawing.Size(305, 28);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 808;
this.txt_guid.Tag = "readonly";
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(84, 40);
+ this.txt_lotNo.Location = new System.Drawing.Point(101, 46);
+ this.txt_lotNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lotNo.Name = "txt_lotNo";
- this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_lotNo.Size = new System.Drawing.Size(322, 28);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 815;
this.txt_lotNo.Tag = "readonly";
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(744, 96);
+ this.txt_checkStates.Location = new System.Drawing.Point(927, 114);
+ this.txt_checkStates.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
+ this.txt_checkStates.Size = new System.Drawing.Size(322, 28);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 819;
this.txt_checkStates.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(1074, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(1340, 14);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(324, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 822;
this.txt_createBy.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1074, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(1340, 46);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(324, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 823;
this.txt_createDate.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 96);
+ this.txt_itemName.Location = new System.Drawing.Point(101, 114);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(322, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 825;
this.txt_itemName.Tag = "readonly";
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(414, 40);
+ this.txt_lineName.Location = new System.Drawing.Point(514, 46);
+ this.txt_lineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(254, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(322, 28);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 826;
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(84, 68);
+ this.txt_itemId.Location = new System.Drawing.Point(101, 80);
+ this.txt_itemId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemId.Size = new System.Drawing.Size(322, 28);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 827;
//
// txt_fngDesc
//
- this.txt_fngDesc.Location = new System.Drawing.Point(84, 152);
+ this.txt_fngDesc.Location = new System.Drawing.Point(101, 182);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(584, 24);
+ this.txt_fngDesc.Size = new System.Drawing.Size(735, 28);
this.txt_fngDesc.StyleController = this.layoutMx1;
this.txt_fngDesc.TabIndex = 828;
//
@@ -1027,7 +1057,7 @@
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem21.Text = "涓婚敭GUID";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(62, 24);
//
// Root
//
@@ -1088,70 +1118,70 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1342, 188);
+ this.Root.Size = new System.Drawing.Size(1678, 226);
this.Root.TextVisible = false;
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(413, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(413, 32);
this.layoutControlItem9.Text = "鎶芥鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1239, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem31.Size = new System.Drawing.Size(415, 32);
this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(990, 28);
+ this.layoutControlItem33.Location = new System.Drawing.Point(1239, 32);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem33.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 56);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1239, 66);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(990, 84);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1239, 100);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(990, 112);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1239, 134);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1161,158 +1191,159 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(413, 32);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_lotNo;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo1;
- this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(826, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(413, 32);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(826, 32);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(660, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(826, 66);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_checkStates;
- this.layoutControlItem32.Location = new System.Drawing.Point(660, 84);
+ this.layoutControlItem32.Location = new System.Drawing.Point(826, 100);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem32.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(660, 112);
+ this.layoutControlItem10.Location = new System.Drawing.Point(826, 134);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_lineName;
- this.layoutControlItem7.Location = new System.Drawing.Point(330, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(413, 32);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem7.Text = "浜х嚎鍚嶇О";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 66);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem4.Text = "浜у搧ID";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(330, 56);
+ this.layoutControlItem5.Location = new System.Drawing.Point(413, 66);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_itemName;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem34.Location = new System.Drawing.Point(0, 100);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem34.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(330, 84);
+ this.layoutControlItem6.Location = new System.Drawing.Point(413, 100);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 134);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(826, 34);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_fngDesc;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 168);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem13.Size = new System.Drawing.Size(660, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(826, 34);
this.layoutControlItem13.Text = "寮傚父澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
+ this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 491);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1678, 601);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1322,15 +1353,17 @@
//
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 459);
+ this.tabMxPage1.Size = new System.Drawing.Size(1676, 563);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
//
this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx2.Horizontal = false;
- this.splitMx2.Location = new System.Drawing.Point(0, 47);
+ this.splitMx2.Location = new System.Drawing.Point(0, 57);
+ this.splitMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx2.Name = "splitMx2";
//
// splitMx2.Panel1
@@ -1342,17 +1375,19 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1340, 412);
- this.splitMx2.SplitterPosition = 287;
+ this.splitMx2.Size = new System.Drawing.Size(1676, 506);
+ this.splitMx2.SplitterPosition = 351;
this.splitMx2.TabIndex = 3;
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1340, 287);
+ this.gcMx1.Size = new System.Drawing.Size(1676, 351);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1361,7 +1396,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.ColumnPanelRowHeight = 61;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1fcheckItem,
@@ -1380,6 +1415,7 @@
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
this.gvMx1facLevel});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1391,128 +1427,126 @@
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;
//
// gvMx1fcheckItem
//
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 50;
+ this.gvMx1fcheckItem.MinWidth = 62;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 0;
- this.gvMx1fcheckItem.Width = 120;
+ this.gvMx1fcheckItem.Width = 150;
//
// gvMx1fcheckTool
//
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 50;
+ this.gvMx1fcheckTool.MinWidth = 62;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 1;
- this.gvMx1fcheckTool.Width = 100;
+ this.gvMx1fcheckTool.Width = 125;
//
// gvMx1fcheckItemDesc
//
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 50;
+ this.gvMx1fcheckItemDesc.MinWidth = 62;
this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
- this.gvMx1fcheckItemDesc.Width = 120;
+ this.gvMx1fcheckItemDesc.Width = 150;
//
// gvMx1fspecRequ
//
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 50;
+ this.gvMx1fspecRequ.MinWidth = 62;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
this.gvMx1fspecRequ.VisibleIndex = 2;
- this.gvMx1fspecRequ.Width = 120;
+ this.gvMx1fspecRequ.Width = 150;
//
// gvMx1fupAllow
//
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
- this.gvMx1fupAllow.MinWidth = 50;
+ this.gvMx1fupAllow.MinWidth = 62;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 3;
- this.gvMx1fupAllow.Width = 50;
+ this.gvMx1fupAllow.Width = 62;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 50;
+ this.gvMx1fstand.MinWidth = 62;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 4;
- this.gvMx1fstand.Width = 70;
+ this.gvMx1fstand.Width = 87;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
- this.gvMx1fdownAllow.MinWidth = 50;
+ this.gvMx1fdownAllow.MinWidth = 62;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 5;
- this.gvMx1fdownAllow.Width = 50;
+ this.gvMx1fdownAllow.Width = 62;
//
// gvMx1freQty
//
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
- this.gvMx1freQty.MinWidth = 50;
+ this.gvMx1freQty.MinWidth = 62;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
this.gvMx1freQty.VisibleIndex = 6;
- this.gvMx1freQty.Width = 50;
+ this.gvMx1freQty.Width = 62;
//
// gvMx1checkQyt
//
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 50;
+ this.gvMx1checkQyt.MinWidth = 62;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
this.gvMx1checkQyt.VisibleIndex = 7;
- this.gvMx1checkQyt.Width = 60;
//
// gvMx1fenterQty
//
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
- this.gvMx1fenterQty.MinWidth = 60;
+ this.gvMx1fenterQty.MinWidth = 75;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
this.gvMx1fenterQty.VisibleIndex = 8;
- this.gvMx1fenterQty.Width = 60;
//
// gvMx1fcheckResu
//
@@ -1523,77 +1557,78 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 50;
+ this.gvMx1fcheckResu.MinWidth = 62;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
this.gvMx1fcheckResu.VisibleIndex = 9;
- this.gvMx1fcheckResu.Width = 94;
+ this.gvMx1fcheckResu.Width = 117;
//
// gvMx1fngRate
//
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
- this.gvMx1fngRate.MinWidth = 50;
+ this.gvMx1fngRate.MinWidth = 62;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
this.gvMx1fngRate.VisibleIndex = 10;
- this.gvMx1fngRate.Width = 94;
+ this.gvMx1fngRate.Width = 117;
//
// gvMx1fngQty
//
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
- this.gvMx1fngQty.MinWidth = 50;
+ this.gvMx1fngQty.MinWidth = 62;
this.gvMx1fngQty.Name = "gvMx1fngQty";
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
this.gvMx1fngQty.VisibleIndex = 11;
- this.gvMx1fngQty.Width = 50;
+ this.gvMx1fngQty.Width = 62;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 50;
+ this.gvMx1sampleSizeNo.MinWidth = 62;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 12;
- this.gvMx1sampleSizeNo.Width = 200;
+ this.gvMx1sampleSizeNo.Width = 250;
//
// gvMx1fcheckLevel
//
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 50;
+ this.gvMx1fcheckLevel.MinWidth = 62;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 13;
- this.gvMx1fcheckLevel.Width = 200;
+ this.gvMx1fcheckLevel.Width = 250;
//
// gvMx1facLevel
//
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 50;
+ this.gvMx1facLevel.MinWidth = 62;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 14;
- this.gvMx1facLevel.Width = 200;
+ this.gvMx1facLevel.Width = 250;
//
// splitYangLi
//
this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitYangLi.Location = new System.Drawing.Point(0, 0);
+ this.splitYangLi.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitYangLi.Name = "splitYangLi";
//
// splitYangLi.Panel1
@@ -1605,8 +1640,8 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1340, 113);
- this.splitYangLi.SplitterPosition = 676;
+ this.splitYangLi.Size = new System.Drawing.Size(1676, 140);
+ this.splitYangLi.SplitterPosition = 845;
this.splitYangLi.TabIndex = 4;
//
// groupControl1
@@ -1614,18 +1649,21 @@
this.groupControl1.Controls.Add(this.gcMx2);
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
+ this.groupControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(676, 113);
+ this.groupControl1.Size = new System.Drawing.Size(845, 140);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.Location = new System.Drawing.Point(2, 28);
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx2.Location = new System.Drawing.Point(2, 34);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(672, 83);
+ this.gcMx2.Size = new System.Drawing.Size(841, 104);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1640,6 +1678,7 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn25});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
@@ -1647,83 +1686,86 @@
//
this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
- this.gridColumn3.MaxWidth = 192;
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MaxWidth = 240;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
- this.gridColumn3.Width = 192;
+ this.gridColumn3.Width = 240;
//
// gridColumn2
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
- this.gridColumn2.MaxWidth = 80;
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MaxWidth = 100;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
- this.gridColumn2.Width = 80;
+ this.gridColumn2.Width = 100;
//
// gridColumn20
//
this.gridColumn20.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn20.FieldName = "fstand";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "鎿嶄綔浜�";
this.gridColumn21.FieldName = "createBy";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 117;
//
// gridColumn25
//
this.gridColumn25.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn25.FieldName = "createDate";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 3;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
//
// groupControl2
//
this.groupControl2.Controls.Add(this.gcMx3);
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
+ this.groupControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(652, 113);
+ this.groupControl2.Size = new System.Drawing.Size(816, 140);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.Location = new System.Drawing.Point(2, 28);
+ this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx3.Location = new System.Drawing.Point(2, 34);
this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(648, 83);
+ this.gcMx3.Size = new System.Drawing.Size(812, 104);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1739,6 +1781,7 @@
this.gridColumn24,
this.gridColumn26,
this.gridColumn27});
+ this.gvMx3.DetailHeight = 428;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
//
@@ -1746,85 +1789,86 @@
//
this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn1.FieldName = "guid";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "椤圭洰";
this.gridColumn22.FieldName = "fcheckItemd5";
- this.gridColumn22.MaxWidth = 192;
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MaxWidth = 240;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 0;
- this.gridColumn22.Width = 192;
+ this.gridColumn22.Width = 240;
//
// gridColumn28
//
this.gridColumn28.Caption = "鏍锋湰搴�";
this.gridColumn28.FieldName = "fcheckItem";
- this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 1;
- this.gridColumn28.Width = 94;
+ this.gridColumn28.Width = 117;
//
// gridColumn29
//
this.gridColumn29.Caption = "鏍锋湰鍊�";
this.gridColumn29.FieldName = "fcheckResu";
- this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.MinWidth = 31;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.OptionsColumn.ReadOnly = true;
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 2;
- this.gridColumn29.Width = 94;
+ this.gridColumn29.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn24.FieldName = "fstand";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 3;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 117;
//
// gridColumn26
//
this.gridColumn26.Caption = "鎿嶄綔浜�";
this.gridColumn26.FieldName = "createBy";
- this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 4;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.Width = 117;
//
// gridColumn27
//
this.gridColumn27.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn27.FieldName = "createDate";
- this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 5;
- this.gridColumn27.Width = 94;
+ this.gridColumn27.Width = 117;
//
// panMsg
//
this.panMsg.Controls.Add(this.layoutMxMsg);
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
this.panMsg.Location = new System.Drawing.Point(0, 0);
+ this.panMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panMsg.Name = "panMsg";
- this.panMsg.Size = new System.Drawing.Size(1340, 47);
+ this.panMsg.Size = new System.Drawing.Size(1676, 57);
this.panMsg.TabIndex = 1;
//
// layoutMxMsg
@@ -1833,30 +1877,33 @@
this.layoutMxMsg.Controls.Add(this.txtJianYan);
this.layoutMxMsg.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMxMsg.Location = new System.Drawing.Point(2, 2);
+ this.layoutMxMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMxMsg.Name = "layoutMxMsg";
this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
this.layoutMxMsg.Root = this.layoutControlGroup1;
- this.layoutMxMsg.Size = new System.Drawing.Size(1336, 43);
+ this.layoutMxMsg.Size = new System.Drawing.Size(1672, 53);
this.layoutMxMsg.TabIndex = 0;
this.layoutMxMsg.Text = "layoutControl1";
//
// btnIpt
//
this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
- this.btnIpt.Location = new System.Drawing.Point(1228, 2);
+ this.btnIpt.Location = new System.Drawing.Point(1537, 2);
+ this.btnIpt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnIpt.Name = "btnIpt";
- this.btnIpt.Size = new System.Drawing.Size(106, 36);
+ this.btnIpt.Size = new System.Drawing.Size(133, 45);
this.btnIpt.StyleController = this.layoutMxMsg;
this.btnIpt.TabIndex = 4;
this.btnIpt.Text = "鏍锋湰绠＄悊";
//
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(221, 2);
+ this.txtJianYan.Location = new System.Drawing.Point(268, 2);
+ this.txtJianYan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtJianYan.Name = "txtJianYan";
this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
- this.txtJianYan.Size = new System.Drawing.Size(594, 36);
+ this.txtJianYan.Size = new System.Drawing.Size(753, 42);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -1876,7 +1923,7 @@
columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition7.Width = 100D;
columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition8.Width = 110D;
+ columnDefinition8.Width = 137D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6,
@@ -1887,7 +1934,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1672, 53);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem11
@@ -1897,20 +1944,20 @@
this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(817, 43);
+ this.layoutControlItem11.Size = new System.Drawing.Size(1023, 53);
this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(251, 22);
//
// layoutControlItem20
//
this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem20.Control = this.btnIpt;
- this.layoutControlItem20.Location = new System.Drawing.Point(1226, 0);
- this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40);
- this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1535, 0);
+ this.layoutControlItem20.MaxSize = new System.Drawing.Size(137, 49);
+ this.layoutControlItem20.MinSize = new System.Drawing.Size(137, 49);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(110, 43);
+ this.layoutControlItem20.Size = new System.Drawing.Size(137, 53);
this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem20.Text = "鏍锋湰绠＄悊";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
@@ -1919,18 +1966,20 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1340, 459);
+ this.tabMxPage2.Size = new System.Drawing.Size(1676, 558);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
//
this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
+ this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1676, 558);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -1946,9 +1995,10 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(921, 42);
+ this.picCheckBox.Location = new System.Drawing.Point(1151, 51);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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 = 6;
this.picCheckBox.TabStop = false;
@@ -1968,12 +2018,13 @@
//
// Frm_ShouJianDetect01
//
- 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(1344, 800);
+ this.ClientSize = new System.Drawing.Size(1680, 978);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_ShouJianDetect01";
this.Text = "ipqc棣栨";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
index fab4d5b..bd4bd8a 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
@@ -88,7 +88,7 @@
this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
- this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fcheckByName = new DevExpress.XtraEditors.TextEdit();
this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
@@ -96,7 +96,7 @@
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
@@ -209,7 +209,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
@@ -217,7 +217,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
@@ -306,9 +306,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, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1344, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1680, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -316,10 +317,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, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1344, 720);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1680, 880);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -328,8 +330,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1678, 842);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -338,6 +341,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, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -350,17 +354,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1342, 688);
+ this.split1.Size = new System.Drawing.Size(1678, 842);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1342, 638);
+ this.gcMain1.Size = new System.Drawing.Size(1678, 781);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -398,8 +404,9 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn7});
+ 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;
@@ -410,305 +417,304 @@
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑";
this.gv_fsubmit.FieldName = "fsubmitTxt";
- this.gv_fsubmit.MinWidth = 30;
+ this.gv_fsubmit.MinWidth = 37;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.UnboundDataType = typeof(bool);
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.VisibleIndex = 0;
- this.gv_fsubmit.Width = 50;
+ this.gv_fsubmit.Width = 62;
//
// gv_releaseNo
//
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 30;
+ this.gv_releaseNo.MinWidth = 37;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.VisibleIndex = 1;
- this.gv_releaseNo.Width = 100;
+ this.gv_releaseNo.Width = 125;
//
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "宸ュ崟鍗曞彿";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 30;
+ this.gv_lotNo.MinWidth = 37;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
this.gv_lotNo.VisibleIndex = 3;
- this.gv_lotNo.Width = 120;
+ this.gv_lotNo.Width = 150;
//
// gridColumn23
//
this.gridColumn23.Caption = "浜х嚎鍚嶇О";
this.gridColumn23.FieldName = "lineName";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 4;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 117;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 30;
+ this.gv_itemId.MinWidth = 37;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
- this.gv_itemId.Width = 30;
+ this.gv_itemId.Width = 37;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo2";
- this.gv_itemNo.MinWidth = 30;
+ this.gv_itemNo.MinWidth = 37;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
this.gv_itemNo.VisibleIndex = 7;
- this.gv_itemNo.Width = 136;
+ this.gv_itemNo.Width = 170;
//
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gv_boardStyle.FieldName = "itemName";
- this.gv_boardStyle.MinWidth = 30;
+ this.gv_boardStyle.MinWidth = 37;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
this.gv_boardStyle.VisibleIndex = 8;
- this.gv_boardStyle.Width = 164;
+ this.gv_boardStyle.Width = 205;
//
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 30;
+ this.gridColumn14.MinWidth = 37;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 9;
- this.gridColumn14.Width = 200;
+ this.gridColumn14.Width = 250;
//
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
this.gv_fcovertQty.Caption = "宸ュ崟鏁伴噺";
this.gv_fcovertQty.FieldName = "daaQty";
- this.gv_fcovertQty.MinWidth = 30;
+ this.gv_fcovertQty.MinWidth = 37;
this.gv_fcovertQty.Name = "gv_fcovertQty";
this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
this.gv_fcovertQty.VisibleIndex = 10;
- this.gv_fcovertQty.Width = 60;
//
// gv_fcheckResu
//
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 30;
+ this.gv_fcheckResu.MinWidth = 37;
this.gv_fcheckResu.Name = "gv_fcheckResu";
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.VisibleIndex = 6;
- this.gv_fcheckResu.Width = 50;
+ this.gv_fcheckResu.Width = 62;
//
// gv_remarks
//
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "澶囨敞璇存槑";
this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 30;
+ this.gv_remarks.MinWidth = 37;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
this.gv_remarks.VisibleIndex = 11;
- this.gv_remarks.Width = 100;
+ this.gv_remarks.Width = 125;
//
// gv_fcheckBy
//
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
- this.gv_fcheckBy.FieldName = "fcheckBy";
- this.gv_fcheckBy.MinWidth = 30;
+ this.gv_fcheckBy.FieldName = "fcheckByName";
+ this.gv_fcheckBy.MinWidth = 37;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
this.gv_fcheckBy.VisibleIndex = 12;
- this.gv_fcheckBy.Width = 118;
+ this.gv_fcheckBy.Width = 147;
//
// gv_fcheckDate
//
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 30;
+ this.gv_fcheckDate.MinWidth = 37;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
this.gv_fcheckDate.VisibleIndex = 13;
- this.gv_fcheckDate.Width = 182;
+ this.gv_fcheckDate.Width = 227;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 30;
+ this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.MinWidth = 37;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 14;
- this.gv_createBy.Width = 67;
+ this.gv_createBy.Width = 84;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 15;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 30;
+ this.gv_lastupdateBy.FieldName = "lastupdateByName";
+ this.gv_lastupdateBy.MinWidth = 37;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
this.gv_lastupdateBy.VisibleIndex = 16;
- this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 30;
+ this.gv_lastupdateDate.MinWidth = 37;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
this.gv_lastupdateDate.VisibleIndex = 17;
- this.gv_lastupdateDate.Width = 120;
+ this.gv_lastupdateDate.Width = 150;
//
// gridColumn18
//
this.gridColumn18.Caption = "瀹℃牳浜�";
this.gridColumn18.FieldName = "fsubmitBy";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 18;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "瀹℃牳鏃ユ湡";
this.gridColumn19.FieldName = "fsubmitDate";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 19;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
//
// gridColumn30
//
this.gridColumn30.Caption = "绫诲瀷";
this.gridColumn30.FieldName = "orderType";
- this.gridColumn30.MinWidth = 25;
+ this.gridColumn30.MinWidth = 31;
this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Width = 94;
+ this.gridColumn30.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "浜х嚎ID";
this.gridColumn13.FieldName = "daa020";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "涓婚敭Guid";
this.gridColumn17.FieldName = "guid";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠岀姸鎬�";
this.gridColumn5.FieldName = "txtColor";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "宸℃鏃舵";
this.gridColumn6.FieldName = "checkTimeSlot";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 2;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "鐢熶骇缁勭粐";
this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 20;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 638);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 781);
+ 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(1342, 38);
+ this.pageBar1.Size = new System.Drawing.Size(1678, 46);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1678, 842);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -716,6 +722,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, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -728,8 +735,8 @@
this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1342, 688);
- this.splitMx1.SplitterPosition = 185;
+ this.splitMx1.Size = new System.Drawing.Size(1678, 842);
+ this.splitMx1.SplitterPosition = 226;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -742,7 +749,7 @@
this.layoutMx1.Controls.Add(this.txt_lotNo1);
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_itemModel);
- this.layoutMx1.Controls.Add(this.txt_fcheckBy);
+ this.layoutMx1.Controls.Add(this.txt_fcheckByName);
this.layoutMx1.Controls.Add(this.txt_fbatchQty);
this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
@@ -750,7 +757,7 @@
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_lotNo);
this.layoutMx1.Controls.Add(this.txt_checkStates);
- this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_createByName);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_lineName);
@@ -761,216 +768,239 @@
this.layoutControlItem17,
this.layoutControlItem21});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(827, 475, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1342, 185);
+ this.layoutMx1.Size = new System.Drawing.Size(1678, 226);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(987, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1234, 132);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(322, 28);
+ this.lbGuid.Size = new System.Drawing.Size(402, 34);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 124);
+ this.txt_remarks.Location = new System.Drawing.Point(101, 148);
+ this.txt_remarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(584, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(735, 28);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(744, 124);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(927, 148);
+ this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(322, 28);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_releaseNo.Location = new System.Drawing.Point(101, 14);
+ this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(322, 28);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(744, 40);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(927, 46);
+ this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(322, 28);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(744, 12);
+ this.txt_lotNo1.Location = new System.Drawing.Point(927, 14);
+ this.txt_lotNo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
+ this.txt_lotNo1.Size = new System.Drawing.Size(322, 28);
this.txt_lotNo1.StyleController = this.layoutMx1;
this.txt_lotNo1.TabIndex = 262;
this.txt_lotNo1.Tag = "";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(414, 68);
+ this.txt_itemNo.Location = new System.Drawing.Point(514, 80);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(322, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(414, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(514, 114);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(322, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
//
- // txt_fcheckBy
+ // txt_fcheckByName
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(744, 68);
- this.txt_fcheckBy.Name = "txt_fcheckBy";
- this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
- this.txt_fcheckBy.StyleController = this.layoutMx1;
- this.txt_fcheckBy.TabIndex = 217;
- this.txt_fcheckBy.Tag = "readonly";
+ this.txt_fcheckByName.Location = new System.Drawing.Point(927, 80);
+ this.txt_fcheckByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fcheckByName.Name = "txt_fcheckByName";
+ this.txt_fcheckByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_fcheckByName.Size = new System.Drawing.Size(322, 28);
+ this.txt_fcheckByName.StyleController = this.layoutMx1;
+ this.txt_fcheckByName.TabIndex = 217;
+ this.txt_fcheckByName.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(514, 14);
+ this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(322, 28);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 96);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1340, 114);
+ this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(324, 28);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 804;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 68);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1340, 80);
+ this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(324, 28);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 805;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 124);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1253, 148);
+ this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
+ this.txt_fsubmit.Size = new System.Drawing.Size(411, 27);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1065, 108);
+ this.txt_guid.Location = new System.Drawing.Point(1331, 132);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(244, 24);
+ this.txt_guid.Size = new System.Drawing.Size(305, 28);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 808;
this.txt_guid.Tag = "readonly";
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(84, 40);
+ this.txt_lotNo.Location = new System.Drawing.Point(101, 46);
+ this.txt_lotNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lotNo.Name = "txt_lotNo";
- this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_lotNo.Size = new System.Drawing.Size(322, 28);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 815;
this.txt_lotNo.Tag = "readonly";
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(744, 96);
+ this.txt_checkStates.Location = new System.Drawing.Point(927, 114);
+ this.txt_checkStates.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
+ this.txt_checkStates.Size = new System.Drawing.Size(322, 28);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 819;
this.txt_checkStates.Tag = "readonly";
//
- // txt_createBy
+ // txt_createByName
//
- this.txt_createBy.Location = new System.Drawing.Point(1074, 12);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(256, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 822;
- this.txt_createBy.Tag = "readonly";
+ this.txt_createByName.Location = new System.Drawing.Point(1340, 14);
+ this.txt_createByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_createByName.Name = "txt_createByName";
+ this.txt_createByName.Size = new System.Drawing.Size(324, 28);
+ this.txt_createByName.StyleController = this.layoutMx1;
+ this.txt_createByName.TabIndex = 822;
+ this.txt_createByName.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1074, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(1340, 46);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(324, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 823;
this.txt_createDate.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 96);
+ this.txt_itemName.Location = new System.Drawing.Point(101, 114);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(322, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 825;
this.txt_itemName.Tag = "readonly";
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(414, 40);
+ this.txt_lineName.Location = new System.Drawing.Point(514, 46);
+ this.txt_lineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(254, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(322, 28);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 826;
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(84, 68);
+ this.txt_itemId.Location = new System.Drawing.Point(101, 80);
+ this.txt_itemId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemId.Size = new System.Drawing.Size(322, 28);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 827;
//
// txt_fngDesc
//
- this.txt_fngDesc.Location = new System.Drawing.Point(84, 152);
+ this.txt_fngDesc.Location = new System.Drawing.Point(101, 182);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(584, 24);
+ this.txt_fngDesc.Size = new System.Drawing.Size(735, 28);
this.txt_fngDesc.StyleController = this.layoutMx1;
this.txt_fngDesc.TabIndex = 828;
//
@@ -995,7 +1025,7 @@
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem21.Text = "涓婚敭GUID";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(62, 24);
//
// Root
//
@@ -1056,70 +1086,70 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1342, 188);
+ this.Root.Size = new System.Drawing.Size(1678, 226);
this.Root.TextVisible = false;
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(413, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(413, 32);
this.layoutControlItem9.Text = "鎶芥鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem31
//
- this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem31.Control = this.txt_createByName;
+ this.layoutControlItem31.Location = new System.Drawing.Point(1239, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem31.Size = new System.Drawing.Size(415, 32);
this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(990, 28);
+ this.layoutControlItem33.Location = new System.Drawing.Point(1239, 32);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem33.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 56);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1239, 66);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(990, 84);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1239, 100);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(990, 112);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1239, 134);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1129,158 +1159,159 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(413, 32);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_lotNo;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo1;
- this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(826, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(413, 32);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(826, 32);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
- this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(660, 56);
+ this.layoutControlItem8.Control = this.txt_fcheckByName;
+ this.layoutControlItem8.Location = new System.Drawing.Point(826, 66);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_checkStates;
- this.layoutControlItem32.Location = new System.Drawing.Point(660, 84);
+ this.layoutControlItem32.Location = new System.Drawing.Point(826, 100);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem32.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(660, 112);
+ this.layoutControlItem10.Location = new System.Drawing.Point(826, 134);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_lineName;
- this.layoutControlItem7.Location = new System.Drawing.Point(330, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(413, 32);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem7.Text = "浜х嚎鍚嶇О";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 66);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem4.Text = "浜у搧ID";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(330, 56);
+ this.layoutControlItem5.Location = new System.Drawing.Point(413, 66);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_itemName;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem34.Location = new System.Drawing.Point(0, 100);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem34.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(330, 84);
+ this.layoutControlItem6.Location = new System.Drawing.Point(413, 100);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(413, 34);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 134);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(826, 34);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_fngDesc;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 168);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem13.Size = new System.Drawing.Size(660, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(826, 34);
this.layoutControlItem13.Text = "寮傚父澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
+ this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 491);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1678, 601);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1290,15 +1321,17 @@
//
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 459);
+ this.tabMxPage1.Size = new System.Drawing.Size(1676, 563);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
//
this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx2.Horizontal = false;
- this.splitMx2.Location = new System.Drawing.Point(0, 47);
+ this.splitMx2.Location = new System.Drawing.Point(0, 57);
+ this.splitMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx2.Name = "splitMx2";
//
// splitMx2.Panel1
@@ -1310,17 +1343,19 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1340, 412);
- this.splitMx2.SplitterPosition = 287;
+ this.splitMx2.Size = new System.Drawing.Size(1676, 506);
+ this.splitMx2.SplitterPosition = 340;
this.splitMx2.TabIndex = 3;
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1340, 287);
+ this.gcMx1.Size = new System.Drawing.Size(1676, 340);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1329,7 +1364,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.ColumnPanelRowHeight = 61;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1fcheckItem,
@@ -1348,6 +1383,7 @@
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
this.gvMx1facLevel});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1359,128 +1395,126 @@
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;
//
// gvMx1fcheckItem
//
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 50;
+ this.gvMx1fcheckItem.MinWidth = 62;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 0;
- this.gvMx1fcheckItem.Width = 120;
+ this.gvMx1fcheckItem.Width = 150;
//
// gvMx1fcheckTool
//
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 50;
+ this.gvMx1fcheckTool.MinWidth = 62;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 1;
- this.gvMx1fcheckTool.Width = 100;
+ this.gvMx1fcheckTool.Width = 125;
//
// gvMx1fcheckItemDesc
//
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 50;
+ this.gvMx1fcheckItemDesc.MinWidth = 62;
this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
- this.gvMx1fcheckItemDesc.Width = 120;
+ this.gvMx1fcheckItemDesc.Width = 150;
//
// gvMx1fspecRequ
//
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 50;
+ this.gvMx1fspecRequ.MinWidth = 62;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
this.gvMx1fspecRequ.VisibleIndex = 2;
- this.gvMx1fspecRequ.Width = 120;
+ this.gvMx1fspecRequ.Width = 150;
//
// gvMx1fupAllow
//
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
- this.gvMx1fupAllow.MinWidth = 50;
+ this.gvMx1fupAllow.MinWidth = 62;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 3;
- this.gvMx1fupAllow.Width = 50;
+ this.gvMx1fupAllow.Width = 62;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 50;
+ this.gvMx1fstand.MinWidth = 62;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 4;
- this.gvMx1fstand.Width = 70;
+ this.gvMx1fstand.Width = 87;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
- this.gvMx1fdownAllow.MinWidth = 50;
+ this.gvMx1fdownAllow.MinWidth = 62;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 5;
- this.gvMx1fdownAllow.Width = 50;
+ this.gvMx1fdownAllow.Width = 62;
//
// gvMx1freQty
//
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
- this.gvMx1freQty.MinWidth = 50;
+ this.gvMx1freQty.MinWidth = 62;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
this.gvMx1freQty.VisibleIndex = 6;
- this.gvMx1freQty.Width = 50;
+ this.gvMx1freQty.Width = 62;
//
// gvMx1checkQyt
//
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 50;
+ this.gvMx1checkQyt.MinWidth = 62;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
this.gvMx1checkQyt.VisibleIndex = 7;
- this.gvMx1checkQyt.Width = 60;
//
// gvMx1fenterQty
//
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
- this.gvMx1fenterQty.MinWidth = 60;
+ this.gvMx1fenterQty.MinWidth = 75;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
this.gvMx1fenterQty.VisibleIndex = 8;
- this.gvMx1fenterQty.Width = 60;
//
// gvMx1fcheckResu
//
@@ -1491,77 +1525,78 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 50;
+ this.gvMx1fcheckResu.MinWidth = 62;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
this.gvMx1fcheckResu.VisibleIndex = 9;
- this.gvMx1fcheckResu.Width = 94;
+ this.gvMx1fcheckResu.Width = 117;
//
// gvMx1fngRate
//
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
- this.gvMx1fngRate.MinWidth = 50;
+ this.gvMx1fngRate.MinWidth = 62;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
this.gvMx1fngRate.VisibleIndex = 10;
- this.gvMx1fngRate.Width = 94;
+ this.gvMx1fngRate.Width = 117;
//
// gvMx1fngQty
//
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
- this.gvMx1fngQty.MinWidth = 50;
+ this.gvMx1fngQty.MinWidth = 62;
this.gvMx1fngQty.Name = "gvMx1fngQty";
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
this.gvMx1fngQty.VisibleIndex = 11;
- this.gvMx1fngQty.Width = 50;
+ this.gvMx1fngQty.Width = 62;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 50;
+ this.gvMx1sampleSizeNo.MinWidth = 62;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 12;
- this.gvMx1sampleSizeNo.Width = 200;
+ this.gvMx1sampleSizeNo.Width = 250;
//
// gvMx1fcheckLevel
//
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 50;
+ this.gvMx1fcheckLevel.MinWidth = 62;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 13;
- this.gvMx1fcheckLevel.Width = 200;
+ this.gvMx1fcheckLevel.Width = 250;
//
// gvMx1facLevel
//
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 50;
+ this.gvMx1facLevel.MinWidth = 62;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 14;
- this.gvMx1facLevel.Width = 200;
+ this.gvMx1facLevel.Width = 250;
//
// splitYangLi
//
this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitYangLi.Location = new System.Drawing.Point(0, 0);
+ this.splitYangLi.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitYangLi.Name = "splitYangLi";
//
// splitYangLi.Panel1
@@ -1573,8 +1608,8 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1340, 113);
- this.splitYangLi.SplitterPosition = 676;
+ this.splitYangLi.Size = new System.Drawing.Size(1676, 151);
+ this.splitYangLi.SplitterPosition = 845;
this.splitYangLi.TabIndex = 4;
//
// groupControl1
@@ -1582,18 +1617,21 @@
this.groupControl1.Controls.Add(this.gcMx2);
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
+ this.groupControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(676, 113);
+ this.groupControl1.Size = new System.Drawing.Size(845, 151);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.Location = new System.Drawing.Point(2, 28);
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx2.Location = new System.Drawing.Point(2, 34);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(672, 83);
+ this.gcMx2.Size = new System.Drawing.Size(841, 115);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1608,6 +1646,7 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn25});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
@@ -1615,83 +1654,86 @@
//
this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
- this.gridColumn3.MaxWidth = 192;
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MaxWidth = 240;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
- this.gridColumn3.Width = 192;
+ this.gridColumn3.Width = 240;
//
// gridColumn2
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
- this.gridColumn2.MaxWidth = 80;
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MaxWidth = 100;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
- this.gridColumn2.Width = 80;
+ this.gridColumn2.Width = 100;
//
// gridColumn20
//
this.gridColumn20.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn20.FieldName = "fstand";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "鎿嶄綔浜�";
- this.gridColumn21.FieldName = "createBy";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.FieldName = "createByName";
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 117;
//
// gridColumn25
//
this.gridColumn25.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn25.FieldName = "createDate";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 3;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
//
// groupControl2
//
this.groupControl2.Controls.Add(this.gcMx3);
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
+ this.groupControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(652, 113);
+ this.groupControl2.Size = new System.Drawing.Size(816, 151);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.Location = new System.Drawing.Point(2, 28);
+ this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx3.Location = new System.Drawing.Point(2, 34);
this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(648, 83);
+ this.gcMx3.Size = new System.Drawing.Size(812, 115);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1707,6 +1749,7 @@
this.gridColumn24,
this.gridColumn26,
this.gridColumn27});
+ this.gvMx3.DetailHeight = 428;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
//
@@ -1714,85 +1757,86 @@
//
this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn1.FieldName = "guid";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "椤圭洰";
this.gridColumn22.FieldName = "fcheckItemd5";
- this.gridColumn22.MaxWidth = 192;
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MaxWidth = 240;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 0;
- this.gridColumn22.Width = 192;
+ this.gridColumn22.Width = 240;
//
// gridColumn28
//
this.gridColumn28.Caption = "鏍锋湰搴�";
this.gridColumn28.FieldName = "fcheckItem";
- this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 1;
- this.gridColumn28.Width = 94;
+ this.gridColumn28.Width = 117;
//
// gridColumn29
//
this.gridColumn29.Caption = "鏍锋湰鍊�";
this.gridColumn29.FieldName = "fcheckResu";
- this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.MinWidth = 31;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.OptionsColumn.ReadOnly = true;
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 2;
- this.gridColumn29.Width = 94;
+ this.gridColumn29.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn24.FieldName = "fstand";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 3;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 117;
//
// gridColumn26
//
this.gridColumn26.Caption = "鎿嶄綔浜�";
this.gridColumn26.FieldName = "createBy";
- this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 4;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.Width = 117;
//
// gridColumn27
//
this.gridColumn27.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn27.FieldName = "createDate";
- this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 5;
- this.gridColumn27.Width = 94;
+ this.gridColumn27.Width = 117;
//
// panMsg
//
this.panMsg.Controls.Add(this.layoutMxMsg);
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
this.panMsg.Location = new System.Drawing.Point(0, 0);
+ this.panMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panMsg.Name = "panMsg";
- this.panMsg.Size = new System.Drawing.Size(1340, 47);
+ this.panMsg.Size = new System.Drawing.Size(1676, 57);
this.panMsg.TabIndex = 1;
//
// layoutMxMsg
@@ -1801,30 +1845,33 @@
this.layoutMxMsg.Controls.Add(this.txtJianYan);
this.layoutMxMsg.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMxMsg.Location = new System.Drawing.Point(2, 2);
+ this.layoutMxMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMxMsg.Name = "layoutMxMsg";
this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
this.layoutMxMsg.Root = this.layoutControlGroup1;
- this.layoutMxMsg.Size = new System.Drawing.Size(1336, 43);
+ this.layoutMxMsg.Size = new System.Drawing.Size(1672, 53);
this.layoutMxMsg.TabIndex = 0;
this.layoutMxMsg.Text = "layoutControl1";
//
// btnIpt
//
this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
- this.btnIpt.Location = new System.Drawing.Point(1228, 2);
+ this.btnIpt.Location = new System.Drawing.Point(1537, 2);
+ this.btnIpt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnIpt.Name = "btnIpt";
- this.btnIpt.Size = new System.Drawing.Size(106, 36);
+ this.btnIpt.Size = new System.Drawing.Size(133, 45);
this.btnIpt.StyleController = this.layoutMxMsg;
this.btnIpt.TabIndex = 4;
this.btnIpt.Text = "鏍锋湰绠＄悊";
//
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(221, 2);
+ this.txtJianYan.Location = new System.Drawing.Point(268, 2);
+ this.txtJianYan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtJianYan.Name = "txtJianYan";
this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
- this.txtJianYan.Size = new System.Drawing.Size(594, 36);
+ this.txtJianYan.Size = new System.Drawing.Size(753, 42);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -1844,7 +1891,7 @@
columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition7.Width = 100D;
columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition8.Width = 110D;
+ columnDefinition8.Width = 137D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6,
@@ -1855,7 +1902,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1672, 53);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem11
@@ -1865,20 +1912,20 @@
this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(817, 43);
+ this.layoutControlItem11.Size = new System.Drawing.Size(1023, 53);
this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(251, 22);
//
// layoutControlItem20
//
this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem20.Control = this.btnIpt;
- this.layoutControlItem20.Location = new System.Drawing.Point(1226, 0);
- this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40);
- this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1535, 0);
+ this.layoutControlItem20.MaxSize = new System.Drawing.Size(137, 49);
+ this.layoutControlItem20.MinSize = new System.Drawing.Size(137, 49);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(110, 43);
+ this.layoutControlItem20.Size = new System.Drawing.Size(137, 53);
this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem20.Text = "鏍锋湰绠＄悊";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
@@ -1887,18 +1934,20 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1340, 459);
+ this.tabMxPage2.Size = new System.Drawing.Size(1676, 558);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
//
this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
+ this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1676, 558);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -1914,9 +1963,10 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(921, 42);
+ this.picCheckBox.Location = new System.Drawing.Point(1151, 51);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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 = 6;
this.picCheckBox.TabStop = false;
@@ -1936,12 +1986,13 @@
//
// Frm_XunJianDetect01
//
- 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(1344, 800);
+ this.ClientSize = new System.Drawing.Size(1680, 978);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_XunJianDetect01";
this.Text = "ipqc宸℃";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
@@ -1971,7 +2022,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
@@ -1979,7 +2030,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
@@ -2085,7 +2136,7 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_lotNo1;
private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
- private DevExpress.XtraEditors.TextEdit txt_fcheckBy;
+ private DevExpress.XtraEditors.TextEdit txt_fcheckByName;
private DevExpress.XtraEditors.TextEdit txt_fcheckDate;
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
@@ -2158,7 +2209,7 @@
private DevExpress.XtraEditors.TextEdit txt_lotNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraEditors.TextEdit txt_checkStates;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createByName;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
--
Gitblit v1.9.3