From 70ef565beed623b6e431a54b0b4bc718470505d0 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 10 十一月 2025 11:24:59 +0800
Subject: [PATCH] ID转姓名:委外加工出库单、委外加工出库退料申请、委外加工退料单、IQC来料检验
---
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs | 451 ++++++-----
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 755 ++++++++++--------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 516 +++++++------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs | 562 +++++++------
4 files changed, 1,230 insertions(+), 1,054 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 0da5062..bfbc006 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -379,9 +379,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(1437, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1796, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -389,10 +390,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(1437, 720);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1796, 880);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -401,8 +403,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(1435, 688);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1794, 842);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -411,6 +414,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
@@ -423,17 +427,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1435, 688);
+ this.split1.Size = new System.Drawing.Size(1794, 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(1435, 638);
+ this.gcMain1.Size = new System.Drawing.Size(1794, 781);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -474,8 +480,9 @@
this.gridColumn30,
this.gridColumn5,
this.gridColumn6});
+ 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;
@@ -485,349 +492,348 @@
//
this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
this.gridColumn13.FieldName = "urgentFlagTxt";
- this.gridColumn13.MinWidth = 30;
+ this.gridColumn13.MinWidth = 37;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Tag = "query_a.fsubmit";
this.gridColumn13.UnboundDataType = typeof(bool);
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 50;
+ this.gridColumn13.Width = 62;
//
// gv_fsubmit
//
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 = 1;
- this.gv_fsubmit.Width = 50;
+ this.gv_fsubmit.Width = 62;
//
// 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;
//
// gv_lifnr
//
this.gv_lifnr.AppearanceCell.Options.UseFont = true;
this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 30;
+ this.gv_lifnr.MinWidth = 37;
this.gv_lifnr.Name = "gv_lifnr";
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
this.gv_lifnr.VisibleIndex = 7;
- this.gv_lifnr.Width = 200;
+ this.gv_lifnr.Width = 250;
//
// 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_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 = "itemNo";
- 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 = 8;
- 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 = 9;
- 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 = 10;
- this.gridColumn14.Width = 200;
+ this.gridColumn14.Width = 250;
//
// 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.Visible = true;
this.gv_fbatchQty.VisibleIndex = 11;
- this.gv_fbatchQty.Width = 80;
+ this.gv_fbatchQty.Width = 100;
//
// 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 = 5;
- this.gv_fcheckResu.Width = 50;
+ this.gv_fcheckResu.Width = 62;
//
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
this.gv_fcovertQty.FieldName = "fcovertQty";
- 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.Width = 60;
//
// 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 = 12;
- 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 = 13;
- 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 = 15;
- 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 = 16;
- 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 = 17;
- 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 = 18;
- this.gv_lastupdateDate.Width = 120;
+ this.gv_lastupdateDate.Width = 150;
//
// gv_fngHandle
//
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
this.gv_fngHandle.Caption = "澶勭悊鎰忚";
this.gv_fngHandle.FieldName = "fngHandle";
- this.gv_fngHandle.MinWidth = 30;
+ this.gv_fngHandle.MinWidth = 37;
this.gv_fngHandle.Name = "gv_fngHandle";
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
this.gv_fngHandle.VisibleIndex = 6;
- this.gv_fngHandle.Width = 100;
+ this.gv_fngHandle.Width = 125;
//
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn1.FieldName = "receivingOrg";
- this.bandedGridColumn1.MinWidth = 50;
+ this.bandedGridColumn1.MinWidth = 62;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.VisibleIndex = 19;
- this.bandedGridColumn1.Width = 250;
+ this.bandedGridColumn1.Width = 312;
//
// gridColumn18
//
this.gridColumn18.Caption = "瀹℃牳浜�";
- this.gridColumn18.FieldName = "fsubmitBy";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.FieldName = "fsubmitByName";
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 20;
- 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 = 21;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.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;
//
// gridColumn23
//
this.gridColumn23.Caption = "閲囪喘鍗曞彿";
this.gridColumn23.FieldName = "cgdNo";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 22;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.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;
//
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠岀姸鎬�";
this.gridColumn5.FieldName = "txtColor";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍒ゅ畾缁撴灉";
this.gridColumn6.FieldName = "freceQty";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.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(1435, 38);
+ this.pageBar1.Size = new System.Drawing.Size(1794, 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(1435, 688);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1794, 842);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -835,6 +841,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
@@ -847,8 +854,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(1435, 688);
- this.splitMx1.SplitterPosition = 270;
+ this.splitMx1.Size = new System.Drawing.Size(1794, 842);
+ this.splitMx1.SplitterPosition = 330;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -888,19 +895,21 @@
this.layoutControlItem21,
this.layoutControlItem23});
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(381, 412, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1435, 270);
+ this.layoutMx1.Size = new System.Drawing.Size(1794, 330);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_xblb
//
this.txt_xblb.BtnTxt = "閫夊埆绫诲埆";
- this.txt_xblb.Location = new System.Drawing.Point(1073, 198);
+ this.txt_xblb.Location = new System.Drawing.Point(1340, 242);
+ this.txt_xblb.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_xblb.Name = "txt_xblb";
- this.txt_xblb.Size = new System.Drawing.Size(350, 60);
+ this.txt_xblb.Size = new System.Drawing.Size(440, 74);
this.txt_xblb.TabIndex = 820;
this.txt_xblb.TextTxt = "";
this.txt_xblb.WhereTxt = " a.s_type=\'OA閫夊埆绫诲埆\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -916,50 +925,54 @@
this.layWeight.Controls.Add(this.txtWCurrent);
this.layWeight.Controls.Add(this.txt_weight5);
this.layWeight.Controls.Add(this.btnClean);
- this.layWeight.Location = new System.Drawing.Point(10, 227);
+ this.layWeight.Location = new System.Drawing.Point(12, 278);
this.layWeight.Margin = new System.Windows.Forms.Padding(0);
this.layWeight.Name = "layWeight";
this.layWeight.Root = this.layoutControlGroup2;
- this.layWeight.Size = new System.Drawing.Size(1061, 33);
+ this.layWeight.Size = new System.Drawing.Size(1326, 40);
this.layWeight.TabIndex = 818;
this.layWeight.Text = "layoutControl1";
//
// txt_weight1
//
- this.txt_weight1.Location = new System.Drawing.Point(52, 2);
+ this.txt_weight1.Location = new System.Drawing.Point(63, 2);
+ this.txt_weight1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_weight1.Name = "txt_weight1";
this.txt_weight1.Properties.ReadOnly = true;
- this.txt_weight1.Size = new System.Drawing.Size(76, 24);
+ this.txt_weight1.Size = new System.Drawing.Size(99, 28);
this.txt_weight1.StyleController = this.layWeight;
this.txt_weight1.TabIndex = 4;
this.txt_weight1.Tag = "readonly";
//
// txt_weight2
//
- this.txt_weight2.Location = new System.Drawing.Point(182, 2);
+ this.txt_weight2.Location = new System.Drawing.Point(227, 2);
+ this.txt_weight2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_weight2.Name = "txt_weight2";
this.txt_weight2.Properties.ReadOnly = true;
- this.txt_weight2.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight2.Size = new System.Drawing.Size(101, 28);
this.txt_weight2.StyleController = this.layWeight;
this.txt_weight2.TabIndex = 5;
this.txt_weight2.Tag = "readonly";
//
// txt_weight3
//
- this.txt_weight3.Location = new System.Drawing.Point(315, 2);
+ this.txt_weight3.Location = new System.Drawing.Point(393, 2);
+ this.txt_weight3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_weight3.Name = "txt_weight3";
this.txt_weight3.Properties.ReadOnly = true;
- this.txt_weight3.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight3.Size = new System.Drawing.Size(101, 28);
this.txt_weight3.StyleController = this.layWeight;
this.txt_weight3.TabIndex = 6;
this.txt_weight3.Tag = "readonly";
//
// txt_weight4
//
- this.txt_weight4.Location = new System.Drawing.Point(448, 2);
+ this.txt_weight4.Location = new System.Drawing.Point(559, 2);
+ this.txt_weight4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_weight4.Name = "txt_weight4";
this.txt_weight4.Properties.ReadOnly = true;
- this.txt_weight4.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight4.Size = new System.Drawing.Size(101, 28);
this.txt_weight4.StyleController = this.layWeight;
this.txt_weight4.TabIndex = 7;
this.txt_weight4.Tag = "readonly";
@@ -970,32 +983,35 @@
this.btnW.Appearance.ForeColor = System.Drawing.Color.White;
this.btnW.Appearance.Options.UseBackColor = true;
this.btnW.Appearance.Options.UseForeColor = true;
- this.btnW.Location = new System.Drawing.Point(797, 2);
+ this.btnW.Location = new System.Drawing.Point(996, 2);
+ this.btnW.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnW.Name = "btnW";
- this.btnW.Size = new System.Drawing.Size(129, 27);
+ this.btnW.Size = new System.Drawing.Size(162, 32);
this.btnW.StyleController = this.layWeight;
this.btnW.TabIndex = 9;
this.btnW.Text = "鑾峰彇";
//
// txtWCurrent
//
- this.txtWCurrent.Location = new System.Drawing.Point(664, 2);
+ this.txtWCurrent.Location = new System.Drawing.Point(830, 2);
+ this.txtWCurrent.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWCurrent.Name = "txtWCurrent";
this.txtWCurrent.Properties.Appearance.BackColor = System.Drawing.Color.DeepSkyBlue;
this.txtWCurrent.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
this.txtWCurrent.Properties.Appearance.Options.UseBackColor = true;
this.txtWCurrent.Properties.Appearance.Options.UseForeColor = true;
this.txtWCurrent.Properties.ReadOnly = true;
- this.txtWCurrent.Size = new System.Drawing.Size(129, 24);
+ this.txtWCurrent.Size = new System.Drawing.Size(162, 28);
this.txtWCurrent.StyleController = this.layWeight;
this.txtWCurrent.TabIndex = 10;
//
// txt_weight5
//
- this.txt_weight5.Location = new System.Drawing.Point(581, 2);
+ this.txt_weight5.Location = new System.Drawing.Point(725, 2);
+ this.txt_weight5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_weight5.Name = "txt_weight5";
this.txt_weight5.Properties.ReadOnly = true;
- this.txt_weight5.Size = new System.Drawing.Size(79, 24);
+ this.txt_weight5.Size = new System.Drawing.Size(101, 28);
this.txt_weight5.StyleController = this.layWeight;
this.txt_weight5.TabIndex = 11;
this.txt_weight5.Tag = "readonly";
@@ -1004,9 +1020,10 @@
//
this.btnClean.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnClean.Appearance.Options.UseBackColor = true;
- this.btnClean.Location = new System.Drawing.Point(930, 2);
+ this.btnClean.Location = new System.Drawing.Point(1162, 2);
+ this.btnClean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnClean.Name = "btnClean";
- this.btnClean.Size = new System.Drawing.Size(129, 27);
+ this.btnClean.Size = new System.Drawing.Size(162, 32);
this.btnClean.StyleController = this.layWeight;
this.btnClean.TabIndex = 12;
this.btnClean.Text = "娓呯┖";
@@ -1056,7 +1073,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(1061, 33);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1326, 40);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem31
@@ -1064,47 +1081,47 @@
this.layoutControlItem31.Control = this.txt_weight1;
this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.Size = new System.Drawing.Size(130, 33);
+ this.layoutControlItem31.Size = new System.Drawing.Size(164, 40);
this.layoutControlItem31.Text = "閲嶉噺1";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(38, 18);
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_weight2;
- this.layoutControlItem32.Location = new System.Drawing.Point(130, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(164, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem32.Size = new System.Drawing.Size(166, 40);
this.layoutControlItem32.Text = "閲嶉噺2";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(38, 18);
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_weight3;
- this.layoutControlItem33.Location = new System.Drawing.Point(263, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem33.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem33.Size = new System.Drawing.Size(166, 40);
this.layoutControlItem33.Text = "閲嶉噺3";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(38, 18);
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_weight4;
- this.layoutControlItem34.Location = new System.Drawing.Point(396, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(496, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem34.Size = new System.Drawing.Size(166, 40);
this.layoutControlItem34.Text = "閲嶉噺4";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(38, 18);
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem36
//
this.layoutControlItem36.Control = this.btnW;
- this.layoutControlItem36.Location = new System.Drawing.Point(795, 0);
+ this.layoutControlItem36.Location = new System.Drawing.Point(994, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
- this.layoutControlItem36.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem36.Size = new System.Drawing.Size(166, 40);
this.layoutControlItem36.Text = "鑾峰彇";
this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem36.TextVisible = false;
@@ -1112,10 +1129,10 @@
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txtWCurrent;
- this.layoutControlItem37.Location = new System.Drawing.Point(662, 0);
+ this.layoutControlItem37.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
- this.layoutControlItem37.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem37.Size = new System.Drawing.Size(166, 40);
this.layoutControlItem37.Text = "瀹炴椂閲嶉噺";
this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem37.TextVisible = false;
@@ -1123,20 +1140,20 @@
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_weight5;
- this.layoutControlItem35.Location = new System.Drawing.Point(529, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(662, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem35.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem35.Size = new System.Drawing.Size(166, 40);
this.layoutControlItem35.Text = "绉伴噸5";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(46, 22);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.btnClean;
- this.layoutControlItem38.Location = new System.Drawing.Point(928, 0);
+ this.layoutControlItem38.Location = new System.Drawing.Point(1160, 0);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 7;
- this.layoutControlItem38.Size = new System.Drawing.Size(133, 33);
+ this.layoutControlItem38.Size = new System.Drawing.Size(166, 40);
this.layoutControlItem38.Text = "娓呯┖";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -1144,9 +1161,10 @@
// txt_fngDesc
//
this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
- this.txt_fngDesc.Location = new System.Drawing.Point(12, 167);
+ this.txt_fngDesc.Location = new System.Drawing.Point(14, 204);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(703, 58);
+ this.txt_fngDesc.Size = new System.Drawing.Size(880, 72);
this.txt_fngDesc.TabIndex = 815;
this.txt_fngDesc.TextTxt = "";
this.txt_fngDesc.WhereTxt = " a.s_type=\'QC寮傚父鎻忚堪\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -1154,9 +1172,10 @@
// btnYcReport
//
this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
- this.btnYcReport.Location = new System.Drawing.Point(719, 198);
+ this.btnYcReport.Location = new System.Drawing.Point(898, 242);
+ this.btnYcReport.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnYcReport.Name = "btnYcReport";
- this.btnYcReport.Size = new System.Drawing.Size(116, 27);
+ this.btnYcReport.Size = new System.Drawing.Size(146, 34);
this.btnYcReport.StyleController = this.layoutMx1;
this.btnYcReport.TabIndex = 814;
this.btnYcReport.Tag = "gvBtnAlawys";
@@ -1164,233 +1183,257 @@
//
// 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_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(437, 105);
+ this.txt_suppName.Location = new System.Drawing.Point(543, 128);
+ this.txt_suppName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(278, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(351, 28);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 801;
this.txt_suppName.Tag = "readonly";
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(791, 167);
+ this.txt_remarks.Location = new System.Drawing.Point(985, 204);
+ 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(632, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(795, 28);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
this.txt_remarks.Tag = "readonly";
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(791, 105);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(985, 128);
+ 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(278, 24);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(351, 28);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 43);
+ this.txt_itemName.Location = new System.Drawing.Point(101, 52);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(277, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(351, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 800;
this.txt_itemName.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(277, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(351, 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(791, 12);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(985, 14);
+ 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(278, 24);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(351, 28);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(437, 12);
+ this.txt_lotNo.Location = new System.Drawing.Point(543, 14);
+ this.txt_lotNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(278, 24);
+ this.txt_lotNo.Size = new System.Drawing.Size(351, 28);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 262;
this.txt_lotNo.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(101, 90);
+ 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(277, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(351, 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(84, 105);
+ this.txt_itemModel.Location = new System.Drawing.Point(101, 128);
+ 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(277, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(351, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(84, 140);
+ this.txt_itemId.Location = new System.Drawing.Point(105, 171);
+ 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(249, 24);
+ this.txt_itemId.Size = new System.Drawing.Size(311, 28);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 802;
this.txt_itemId.Tag = "readonly";
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(791, 43);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(985, 52);
+ 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(278, 24);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(351, 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(437, 74);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(543, 90);
+ 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(278, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(351, 28);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 43);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1427, 52);
+ 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(278, 24);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(353, 28);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 804;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 74);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1427, 90);
+ 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(278, 24);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(353, 28);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 805;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1073, 12);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1340, 14);
+ 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(350, 24);
+ this.txt_fsubmit.Size = new System.Drawing.Size(440, 27);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(791, 136);
+ this.txt_slOrg.Location = new System.Drawing.Point(985, 166);
+ this.txt_slOrg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
+ this.txt_slOrg.Size = new System.Drawing.Size(351, 28);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 807;
this.txt_slOrg.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_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(791, 74);
+ this.txt_checkStates.Location = new System.Drawing.Point(985, 90);
+ 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(278, 24);
+ this.txt_checkStates.Size = new System.Drawing.Size(351, 28);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 809;
this.txt_checkStates.Tag = "readonly";
//
// txt_freceQty
//
- this.txt_freceQty.Location = new System.Drawing.Point(1074, 102);
+ this.txt_freceQty.Location = new System.Drawing.Point(1342, 125);
+ this.txt_freceQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_freceQty.Name = "txt_freceQty";
this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
- this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
+ this.txt_freceQty.Size = new System.Drawing.Size(320, 28);
this.txt_freceQty.StyleController = this.layoutMx1;
this.txt_freceQty.TabIndex = 810;
this.txt_freceQty.Tag = "readonly";
//
// txt_cgdNo
//
- this.txt_cgdNo.Location = new System.Drawing.Point(437, 43);
+ this.txt_cgdNo.Location = new System.Drawing.Point(543, 52);
+ this.txt_cgdNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_cgdNo.Name = "txt_cgdNo";
- this.txt_cgdNo.Size = new System.Drawing.Size(278, 24);
+ this.txt_cgdNo.Size = new System.Drawing.Size(351, 28);
this.txt_cgdNo.StyleController = this.layoutMx1;
this.txt_cgdNo.TabIndex = 811;
this.txt_cgdNo.Tag = "readonly";
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1145, 105);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1427, 128);
+ this.txt_fngHandle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fngHandle.Size = new System.Drawing.Size(278, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(353, 28);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 812;
this.txt_fngHandle.Tag = "readonly";
//
// txt_xbsl
//
- this.txt_xbsl.Location = new System.Drawing.Point(1145, 136);
+ this.txt_xbsl.Location = new System.Drawing.Point(1427, 166);
+ this.txt_xbsl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_xbsl.Name = "txt_xbsl";
- this.txt_xbsl.Size = new System.Drawing.Size(278, 24);
+ this.txt_xbsl.Size = new System.Drawing.Size(353, 28);
this.txt_xbsl.StyleController = this.layoutMx1;
this.txt_xbsl.TabIndex = 817;
this.txt_xbsl.Tag = "readonly";
//
// txt_iqcRemark
//
- this.txt_iqcRemark.Location = new System.Drawing.Point(84, 136);
+ this.txt_iqcRemark.Location = new System.Drawing.Point(101, 166);
+ this.txt_iqcRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_iqcRemark.Name = "txt_iqcRemark";
- this.txt_iqcRemark.Size = new System.Drawing.Size(277, 24);
+ this.txt_iqcRemark.Size = new System.Drawing.Size(351, 28);
this.txt_iqcRemark.StyleController = this.layoutMx1;
this.txt_iqcRemark.TabIndex = 819;
//
@@ -1414,7 +1457,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem7.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem7.Text = "鐗╂枡ID";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 22);
//
// layoutControlItem21
//
@@ -1425,7 +1468,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);
//
// layoutControlItem23
//
@@ -1436,7 +1479,7 @@
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem23.Size = new System.Drawing.Size(332, 30);
this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 22);
//
// Root
//
@@ -1507,7 +1550,7 @@
rowDefinition7,
rowDefinition8,
rowDefinition9});
- this.Root.Size = new System.Drawing.Size(1435, 270);
+ this.Root.Size = new System.Drawing.Size(1794, 330);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1515,69 +1558,69 @@
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(353, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemName;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(353, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(353, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 114);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(353, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(1061, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1326, 38);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(444, 38);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitBy;
- this.layoutControlItem16.Location = new System.Drawing.Point(1061, 62);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1326, 76);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(444, 38);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(1061, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1326, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(444, 38);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1585,109 +1628,109 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(707, 93);
+ this.layoutControlItem10.Location = new System.Drawing.Point(884, 114);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(353, 93);
+ this.layoutControlItem13.Location = new System.Drawing.Point(442, 114);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem13.Text = "渚涘簲鍟�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(707, 62);
+ this.layoutControlItem22.Location = new System.Drawing.Point(884, 76);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(353, 62);
+ this.layoutControlItem9.Location = new System.Drawing.Point(442, 76);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(707, 31);
+ this.layoutControlItem8.Location = new System.Drawing.Point(884, 38);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(707, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(884, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(353, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(442, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_cgdNo;
- this.layoutControlItem24.Location = new System.Drawing.Point(353, 31);
+ this.layoutControlItem24.Location = new System.Drawing.Point(442, 38);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem24.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(707, 124);
+ this.layoutControlItem18.Location = new System.Drawing.Point(884, 152);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_fngDesc;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 190);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(707, 62);
+ this.layoutControlItem28.Size = new System.Drawing.Size(884, 76);
this.layoutControlItem28.Text = "寮傚父澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1695,34 +1738,34 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fngHandle;
- this.layoutControlItem25.Location = new System.Drawing.Point(1061, 93);
+ this.layoutControlItem25.Location = new System.Drawing.Point(1326, 114);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(444, 38);
this.layoutControlItem25.Text = "澶勭悊鎰忚";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_xbsl;
- this.layoutControlItem29.Location = new System.Drawing.Point(1061, 124);
+ this.layoutControlItem29.Location = new System.Drawing.Point(1326, 152);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem29.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem29.Size = new System.Drawing.Size(444, 38);
this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.layWeight;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 217);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 266);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 3;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem30.Size = new System.Drawing.Size(1061, 33);
+ this.layoutControlItem30.Size = new System.Drawing.Size(1326, 40);
this.layoutControlItem30.Text = "绉伴噸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
@@ -1730,35 +1773,35 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(707, 155);
+ this.layoutControlItem12.Location = new System.Drawing.Point(884, 190);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(708, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(886, 38);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_iqcRemark;
- this.layoutControlItem39.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem39.Location = new System.Drawing.Point(0, 152);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem39.Size = new System.Drawing.Size(353, 31);
+ this.layoutControlItem39.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem39.Text = "妫�楠屽娉�";
- this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(707, 186);
- this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.Location = new System.Drawing.Point(884, 228);
+ this.layoutControlItem27.MaxSize = new System.Drawing.Size(150, 38);
+ this.layoutControlItem27.MinSize = new System.Drawing.Size(150, 38);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
+ this.layoutControlItem27.Size = new System.Drawing.Size(442, 38);
this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
@@ -1767,12 +1810,12 @@
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_xblb;
- this.layoutControlItem26.Location = new System.Drawing.Point(1061, 186);
+ this.layoutControlItem26.Location = new System.Drawing.Point(1326, 228);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem26.Size = new System.Drawing.Size(354, 64);
+ this.layoutControlItem26.Size = new System.Drawing.Size(444, 78);
this.layoutControlItem26.Text = "閫夊埆绫诲埆";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -1781,9 +1824,10 @@
//
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(1435, 406);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1794, 497);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1793,15 +1837,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(1433, 374);
+ this.tabMxPage1.Size = new System.Drawing.Size(1792, 459);
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
@@ -1813,17 +1859,19 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1433, 327);
- this.splitMx2.SplitterPosition = 287;
+ this.splitMx2.Size = new System.Drawing.Size(1792, 402);
+ 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(1433, 287);
+ this.gcMx1.Size = new System.Drawing.Size(1792, 351);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1832,7 +1880,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,
@@ -1852,6 +1900,7 @@
this.gvMx1fcheckLevel,
this.gvMx1facLevel,
this.gridColumn7});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1863,129 +1912,127 @@
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.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
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
//
@@ -1996,85 +2043,86 @@
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;
//
// gridColumn7
//
this.gridColumn7.Caption = "鏍锋湰鏁�";
this.gridColumn7.FieldName = "ybsl";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// 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
@@ -2086,8 +2134,8 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1433, 28);
- this.splitYangLi.SplitterPosition = 676;
+ this.splitYangLi.Size = new System.Drawing.Size(1792, 36);
+ this.splitYangLi.SplitterPosition = 845;
this.splitYangLi.TabIndex = 4;
//
// groupControl1
@@ -2095,18 +2143,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, 28);
+ this.groupControl1.Size = new System.Drawing.Size(845, 36);
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, 0);
+ this.gcMx2.Size = new System.Drawing.Size(841, 0);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2121,6 +2172,7 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn25});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
@@ -2128,83 +2180,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(745, 28);
+ this.groupControl2.Size = new System.Drawing.Size(932, 36);
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(741, 0);
+ this.gcMx3.Size = new System.Drawing.Size(928, 0);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2220,6 +2275,7 @@
this.gridColumn24,
this.gridColumn26,
this.gridColumn27});
+ this.gvMx3.DetailHeight = 428;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
//
@@ -2227,85 +2283,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(1433, 47);
+ this.panMsg.Size = new System.Drawing.Size(1792, 57);
this.panMsg.TabIndex = 1;
//
// layoutMxMsg
@@ -2315,19 +2372,21 @@
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(1429, 43);
+ this.layoutMxMsg.Size = new System.Drawing.Size(1788, 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(1321, 2);
+ this.btnIpt.Location = new System.Drawing.Point(1653, 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 = "鏍锋湰绠＄悊";
@@ -2335,20 +2394,22 @@
// btnLoad
//
this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
- this.btnLoad.Location = new System.Drawing.Point(1155, 2);
+ this.btnLoad.Location = new System.Drawing.Point(1446, 2);
+ this.btnLoad.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLoad.Name = "btnLoad";
- this.btnLoad.Size = new System.Drawing.Size(162, 36);
+ this.btnLoad.Size = new System.Drawing.Size(203, 45);
this.btnLoad.StyleController = this.layoutMxMsg;
this.btnLoad.TabIndex = 3;
this.btnLoad.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(656, 36);
+ this.txtJianYan.Size = new System.Drawing.Size(830, 42);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -2369,7 +2430,7 @@
columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition15.Width = 100D;
columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition16.Width = 110D;
+ columnDefinition16.Width = 137D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition13,
columnDefinition14,
@@ -2380,7 +2441,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition10});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(1429, 43);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1788, 53);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem11
@@ -2390,20 +2451,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(879, 43);
+ this.layoutControlItem11.Size = new System.Drawing.Size(1100, 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(1319, 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(1651, 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);
@@ -2413,12 +2474,12 @@
//
this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem19.Control = this.btnLoad;
- this.layoutControlItem19.Location = new System.Drawing.Point(879, 0);
- this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
- this.layoutControlItem19.MinSize = new System.Drawing.Size(166, 40);
+ this.layoutControlItem19.Location = new System.Drawing.Point(1100, 0);
+ this.layoutControlItem19.MaxSize = new System.Drawing.Size(207, 49);
+ this.layoutControlItem19.MinSize = new System.Drawing.Size(207, 49);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(440, 43);
+ this.layoutControlItem19.Size = new System.Drawing.Size(551, 53);
this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem19.Text = "閲嶆柊鍔犺浇";
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
@@ -2427,18 +2488,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(1433, 374);
+ this.tabMxPage2.Size = new System.Drawing.Size(1792, 455);
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(1433, 374);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1792, 455);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2454,9 +2517,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;
@@ -2476,12 +2540,13 @@
//
// Frm_MesQaItemsDetect01
//
- 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(1437, 800);
+ this.ClientSize = new System.Drawing.Size(1796, 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_MesQaItemsDetect01";
this.Text = "鏉ユ枡妫�楠岀敵璇�";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 38794a1..68eeb44 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -30,19 +30,19 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -65,6 +65,7 @@
this.gv_tbl012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -78,7 +79,7 @@
this.txt_tbl012 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_tbl011 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl006 = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
@@ -134,7 +135,6 @@
this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -160,7 +160,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).BeginInit();
@@ -207,9 +207,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(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -217,10 +218,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(1128, 624);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 762);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -229,8 +231,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(1126, 592);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 724);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -239,6 +242,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
@@ -251,17 +255,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 592);
+ this.split1.Size = new System.Drawing.Size(1408, 724);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 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(1126, 541);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 661);
this.gcMain1.TabIndex = 5;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -271,7 +277,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn13,
this.gv_tbl013,
@@ -290,8 +296,9 @@
this.gridColumn11,
this.gridColumn14,
this.gridColumn15});
+ 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;
@@ -301,210 +308,221 @@
//
this.gridColumn13.Caption = "涓婚敭Guid";
this.gridColumn13.FieldName = "guid";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gv_tbl013
//
this.gv_tbl013.AppearanceCell.Options.UseFont = true;
this.gv_tbl013.Caption = "瀹℃牳鐘舵�� ";
this.gv_tbl013.FieldName = "isChk";
- this.gv_tbl013.MaxWidth = 50;
- this.gv_tbl013.MinWidth = 50;
+ this.gv_tbl013.MaxWidth = 62;
+ this.gv_tbl013.MinWidth = 62;
this.gv_tbl013.Name = "gv_tbl013";
this.gv_tbl013.OptionsColumn.AllowEdit = false;
this.gv_tbl013.Tag = "query_a.tbl013";
this.gv_tbl013.Visible = true;
this.gv_tbl013.VisibleIndex = 0;
- this.gv_tbl013.Width = 50;
+ this.gv_tbl013.Width = 62;
//
// gv_tbl020
//
this.gv_tbl020.AppearanceCell.Options.UseFont = true;
this.gv_tbl020.Caption = "瀹岀粨鏍囪瘑 ";
this.gv_tbl020.FieldName = "isWj";
- this.gv_tbl020.MaxWidth = 50;
- this.gv_tbl020.MinWidth = 50;
+ this.gv_tbl020.MaxWidth = 62;
+ this.gv_tbl020.MinWidth = 62;
this.gv_tbl020.Name = "gv_tbl020";
this.gv_tbl020.OptionsColumn.AllowEdit = false;
this.gv_tbl020.Tag = "query_a.tbl020";
- this.gv_tbl020.Width = 50;
+ this.gv_tbl020.Width = 62;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鐢宠鍗曞彿 ";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MinWidth = 62;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 2;
- this.gv_billNo.Width = 94;
+ this.gv_billNo.Width = 117;
//
// gv_tbl003
//
this.gv_tbl003.AppearanceCell.Options.UseFont = true;
this.gv_tbl003.Caption = "鎶曟枡鍗曞彿 ";
this.gv_tbl003.FieldName = "daa021";
- this.gv_tbl003.MinWidth = 50;
+ this.gv_tbl003.MinWidth = 62;
this.gv_tbl003.Name = "gv_tbl003";
this.gv_tbl003.OptionsColumn.AllowEdit = false;
this.gv_tbl003.Tag = "query_a.tbl003";
this.gv_tbl003.Visible = true;
this.gv_tbl003.VisibleIndex = 3;
- this.gv_tbl003.Width = 94;
+ this.gv_tbl003.Width = 117;
//
// gv_tbl002
//
this.gv_tbl002.AppearanceCell.Options.UseFont = true;
this.gv_tbl002.Caption = "濮斿宸ュ崟";
this.gv_tbl002.FieldName = "daa001";
- this.gv_tbl002.MinWidth = 50;
+ this.gv_tbl002.MinWidth = 62;
this.gv_tbl002.Name = "gv_tbl002";
this.gv_tbl002.OptionsColumn.AllowEdit = false;
this.gv_tbl002.Tag = "query_a.tbl002";
this.gv_tbl002.Visible = true;
this.gv_tbl002.VisibleIndex = 4;
- this.gv_tbl002.Width = 94;
+ this.gv_tbl002.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "浜у搧缂栫爜";
this.gridColumn6.FieldName = "daa029";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn10
//
this.gridColumn10.Caption = "浜у搧鍚嶇О";
this.gridColumn10.FieldName = "daa003";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 6;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 117;
//
// gv_tbl004
//
this.gv_tbl004.AppearanceCell.Options.UseFont = true;
this.gv_tbl004.Caption = "浜у搧鍨嬪彿 ";
this.gv_tbl004.FieldName = "daa004";
- this.gv_tbl004.MinWidth = 50;
+ this.gv_tbl004.MinWidth = 62;
this.gv_tbl004.Name = "gv_tbl004";
this.gv_tbl004.OptionsColumn.AllowEdit = false;
this.gv_tbl004.Tag = "query_a.tbl004";
this.gv_tbl004.Visible = true;
this.gv_tbl004.VisibleIndex = 7;
- this.gv_tbl004.Width = 94;
+ this.gv_tbl004.Width = 117;
//
// gv_tbl005
//
this.gv_tbl005.AppearanceCell.Options.UseFont = true;
this.gv_tbl005.Caption = "閫�鏂欑被鍨�";
this.gv_tbl005.FieldName = "tbl005";
- this.gv_tbl005.MinWidth = 50;
+ this.gv_tbl005.MinWidth = 62;
this.gv_tbl005.Name = "gv_tbl005";
this.gv_tbl005.OptionsColumn.AllowEdit = false;
this.gv_tbl005.Tag = "query_a.tbl005";
this.gv_tbl005.Visible = true;
this.gv_tbl005.VisibleIndex = 8;
- this.gv_tbl005.Width = 94;
+ this.gv_tbl005.Width = 117;
//
// gv_tbl009
//
this.gv_tbl009.AppearanceCell.Options.UseFont = true;
this.gv_tbl009.Caption = "鍒涘缓浜� ";
- this.gv_tbl009.FieldName = "tbl009";
- this.gv_tbl009.MinWidth = 50;
+ this.gv_tbl009.FieldName = "createByName";
+ this.gv_tbl009.MinWidth = 62;
this.gv_tbl009.Name = "gv_tbl009";
this.gv_tbl009.OptionsColumn.AllowEdit = false;
this.gv_tbl009.Tag = "query_a.tbl009";
this.gv_tbl009.Visible = true;
this.gv_tbl009.VisibleIndex = 9;
- this.gv_tbl009.Width = 94;
+ this.gv_tbl009.Width = 117;
//
// gv_tbl010
//
this.gv_tbl010.AppearanceCell.Options.UseFont = true;
this.gv_tbl010.Caption = "鍒涘缓鏃堕棿 ";
this.gv_tbl010.FieldName = "tbl010";
- this.gv_tbl010.MinWidth = 50;
+ this.gv_tbl010.MinWidth = 62;
this.gv_tbl010.Name = "gv_tbl010";
this.gv_tbl010.OptionsColumn.AllowEdit = false;
this.gv_tbl010.Tag = "query_a.tbl010";
this.gv_tbl010.Visible = true;
this.gv_tbl010.VisibleIndex = 10;
- this.gv_tbl010.Width = 94;
+ this.gv_tbl010.Width = 117;
//
// gv_tbl011
//
this.gv_tbl011.AppearanceCell.Options.UseFont = true;
this.gv_tbl011.Caption = "瀹℃牳浜� ";
- this.gv_tbl011.FieldName = "tbl011";
- this.gv_tbl011.MinWidth = 50;
+ this.gv_tbl011.FieldName = "checkUserName";
+ this.gv_tbl011.MinWidth = 62;
this.gv_tbl011.Name = "gv_tbl011";
this.gv_tbl011.OptionsColumn.AllowEdit = false;
this.gv_tbl011.Tag = "query_a.tbl011";
this.gv_tbl011.Visible = true;
this.gv_tbl011.VisibleIndex = 11;
- this.gv_tbl011.Width = 94;
+ this.gv_tbl011.Width = 117;
//
// gv_tbl012
//
this.gv_tbl012.AppearanceCell.Options.UseFont = true;
this.gv_tbl012.Caption = "瀹℃牳鏃堕棿 ";
this.gv_tbl012.FieldName = "tbl012";
- this.gv_tbl012.MinWidth = 50;
+ this.gv_tbl012.MinWidth = 62;
this.gv_tbl012.Name = "gv_tbl012";
this.gv_tbl012.OptionsColumn.AllowEdit = false;
this.gv_tbl012.Tag = "query_a.tbl012";
this.gv_tbl012.Visible = true;
this.gv_tbl012.VisibleIndex = 12;
- this.gv_tbl012.Width = 94;
+ this.gv_tbl012.Width = 117;
//
// gridColumn11
//
this.gridColumn11.Caption = "浠诲姟鍗曞彿";
this.gridColumn11.FieldName = "erpProductionOrderNo";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 13;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn14
//
this.gridColumn14.Caption = "鍏ュ簱璐т富";
this.gridColumn14.FieldName = "tlOrg";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 14;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 117;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "瀹岀粨";
+ this.gridColumn15.FieldName = "txtColor";
+ this.gridColumn15.MinWidth = 31;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 1;
+ this.gridColumn15.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 541);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 661);
+ 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(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
this.pageBar1.TabIndex = 6;
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(1126, 592);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 724);
this.xtraTabPage2.Text = "鏁版嵁璇︽儏";
//
// splitMx1
@@ -512,6 +530,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
@@ -524,8 +543,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 592);
- this.splitMx1.SplitterPosition = 136;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 724);
+ this.splitMx1.SplitterPosition = 166;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -539,7 +558,7 @@
this.layoutMx1.Controls.Add(this.txt_tbl012);
this.layoutMx1.Controls.Add(this.txt_daa014);
this.layoutMx1.Controls.Add(this.txt_itemNo);
- this.layoutMx1.Controls.Add(this.txt_tbl011);
+ this.layoutMx1.Controls.Add(this.txt_checkUserName);
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_tbl006);
this.layoutMx1.Controls.Add(this.txt_tbl013);
@@ -548,18 +567,20 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem14});
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(767, 191, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 136);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 166);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1031, 132);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(335, 34);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -567,19 +588,21 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 105);
+ this.btnSelect.Location = new System.Drawing.Point(14, 128);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(86, 27);
+ this.btnSelect.Size = new System.Drawing.Size(108, 34);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 457;
this.btnSelect.Text = "閫夊彇鐗╂枡";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(636, 43);
+ this.txt_itemName.Location = new System.Drawing.Point(779, 52);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(248, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 464;
this.txt_itemName.Tag = "readonly";
@@ -587,7 +610,8 @@
// txt_tbl005
//
this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
- this.txt_tbl005.Location = new System.Drawing.Point(84, 74);
+ this.txt_tbl005.Location = new System.Drawing.Point(101, 90);
+ this.txt_tbl005.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_tbl005.Name = "txt_tbl005";
this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -597,102 +621,112 @@
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(200, 24);
+ this.txt_tbl005.Size = new System.Drawing.Size(248, 28);
this.txt_tbl005.StyleController = this.layoutMx1;
this.txt_tbl005.TabIndex = 459;
//
// txt_tbl002
//
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 43);
+ this.txt_tbl002.Location = new System.Drawing.Point(101, 52);
+ this.txt_tbl002.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(200, 24);
+ this.txt_tbl002.Size = new System.Drawing.Size(248, 28);
this.txt_tbl002.TabIndex = 462;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(101, 14);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(248, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(912, 43);
+ this.txt_tbl012.Location = new System.Drawing.Point(1118, 52);
+ this.txt_tbl012.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl012.Size = new System.Drawing.Size(202, 24);
+ this.txt_tbl012.Size = new System.Drawing.Size(250, 28);
this.txt_tbl012.StyleController = this.layoutMx1;
this.txt_tbl012.TabIndex = 247;
this.txt_tbl012.Tag = "readonly";
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(360, 12);
+ this.txt_daa014.Location = new System.Drawing.Point(440, 14);
+ this.txt_daa014.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
- this.txt_daa014.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(248, 28);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 217;
this.txt_daa014.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(636, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(779, 14);
+ 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(200, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(248, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 298;
this.txt_itemNo.Tag = "readonly";
//
- // txt_tbl011
+ // txt_checkUserName
//
- this.txt_tbl011.Location = new System.Drawing.Point(912, 12);
- this.txt_tbl011.Name = "txt_tbl011";
- this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl011.Size = new System.Drawing.Size(202, 24);
- this.txt_tbl011.StyleController = this.layoutMx1;
- this.txt_tbl011.TabIndex = 243;
- this.txt_tbl011.Tag = "readonly";
+ this.txt_checkUserName.Location = new System.Drawing.Point(1118, 14);
+ this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkUserName.Name = "txt_checkUserName";
+ this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUserName.Size = new System.Drawing.Size(250, 28);
+ this.txt_checkUserName.StyleController = this.layoutMx1;
+ this.txt_checkUserName.TabIndex = 243;
+ this.txt_checkUserName.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(636, 74);
+ this.txt_itemModel.Location = new System.Drawing.Point(779, 90);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(248, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "readonly";
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(360, 74);
+ this.txt_tbl006.Location = new System.Drawing.Point(440, 90);
+ this.txt_tbl006.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(200, 24);
+ this.txt_tbl006.Size = new System.Drawing.Size(248, 28);
this.txt_tbl006.StyleController = this.layoutMx1;
this.txt_tbl006.TabIndex = 226;
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(840, 74);
+ this.txt_tbl013.Location = new System.Drawing.Point(1031, 90);
+ this.txt_tbl013.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_tbl013.Size = new System.Drawing.Size(274, 24);
+ this.txt_tbl013.Size = new System.Drawing.Size(337, 27);
this.txt_tbl013.StyleController = this.layoutMx1;
this.txt_tbl013.TabIndex = 465;
this.txt_tbl013.Tag = "readonly";
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(360, 43);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(440, 52);
+ this.txt_erpProductionOrderNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(248, 28);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 467;
this.txt_erpProductionOrderNo.Tag = "readonly";
@@ -729,33 +763,33 @@
this.layoutControlItem13});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1126, 144);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1382, 176);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -763,101 +797,101 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_daa014;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(339, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem2.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_itemNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(678, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem3.Text = "浜у搧缂栫爜";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_tbl002;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem4.Text = "濮斿宸ュ崟";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemName;
- this.layoutControlItem5.Location = new System.Drawing.Point(552, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(678, 38);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem5.Text = "浜у搧鍚嶇О";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(552, 62);
+ this.layoutControlItem6.Location = new System.Drawing.Point(678, 76);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem6.Text = "浜у搧鍨嬪彿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_tbl005;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem7.Text = "閫�鏂欑被鍨�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_tbl011;
- this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem9.Control = this.txt_checkUserName;
+ this.layoutControlItem9.Location = new System.Drawing.Point(1017, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem9.Text = "瀹℃牳浜�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_tbl012;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1017, 38);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_tbl013;
- this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1017, 76);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -865,34 +899,34 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(339, 38);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem15.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_tbl006;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(339, 76);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem8.Text = "澶囨敞";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.btnSelect;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 93);
- this.layoutControlItem13.MaxSize = new System.Drawing.Size(90, 31);
- this.layoutControlItem13.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem13.MaxSize = new System.Drawing.Size(112, 38);
+ this.layoutControlItem13.MinSize = new System.Drawing.Size(112, 38);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(339, 38);
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem13.Text = "閫夋嫨鎸夐挳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
@@ -902,9 +936,10 @@
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 444);
+ this.tabMx.Size = new System.Drawing.Size(1408, 543);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -913,8 +948,9 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.split99);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 412);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 505);
this.tabMxPage1.Text = "閫�鏂欐槑缁�";
//
// split99
@@ -922,6 +958,7 @@
this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
this.split99.Horizontal = false;
this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split99.Name = "split99";
//
// split99.Panel1
@@ -933,20 +970,22 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1124, 412);
+ this.split99.Size = new System.Drawing.Size(1406, 505);
this.split99.SplitterPosition = 0;
this.split99.TabIndex = 2;
//
// 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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.rptBl});
- this.gcMx1.Size = new System.Drawing.Size(1124, 400);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 490);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -969,6 +1008,7 @@
this.gvMxDel,
this.gridColumn5,
this.gridColumn12});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -980,66 +1020,66 @@
this.gvMx1tlid.AppearanceCell.Options.UseFont = true;
this.gvMx1tlid.Caption = "tlid";
this.gvMx1tlid.FieldName = "tlid";
- this.gvMx1tlid.MinWidth = 50;
+ this.gvMx1tlid.MinWidth = 62;
this.gvMx1tlid.Name = "gvMx1tlid";
this.gvMx1tlid.Tag = "query_a.tlid";
- this.gvMx1tlid.Width = 94;
+ this.gvMx1tlid.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "dabGuid";
this.gridColumn3.FieldName = "aboutGuid";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gvMx1tld001
//
this.gvMx1tld001.AppearanceCell.Options.UseFont = true;
this.gvMx1tld001.Caption = "宸ュ崟鍙�";
this.gvMx1tld001.FieldName = "tld001";
- this.gvMx1tld001.MinWidth = 50;
+ this.gvMx1tld001.MinWidth = 62;
this.gvMx1tld001.Name = "gvMx1tld001";
this.gvMx1tld001.Tag = "query_a.tld001";
this.gvMx1tld001.Visible = true;
this.gvMx1tld001.VisibleIndex = 0;
- this.gvMx1tld001.Width = 94;
+ this.gvMx1tld001.Width = 117;
//
// gvMx1tld002
//
this.gvMx1tld002.AppearanceCell.Options.UseFont = true;
this.gvMx1tld002.Caption = "鐗╂枡缂栫爜";
this.gvMx1tld002.FieldName = "tld002";
- this.gvMx1tld002.MinWidth = 50;
+ this.gvMx1tld002.MinWidth = 62;
this.gvMx1tld002.Name = "gvMx1tld002";
this.gvMx1tld002.Tag = "query_a.tld002";
this.gvMx1tld002.Visible = true;
this.gvMx1tld002.VisibleIndex = 1;
- this.gvMx1tld002.Width = 94;
+ this.gvMx1tld002.Width = 117;
//
// gvMx1tld003
//
this.gvMx1tld003.AppearanceCell.Options.UseFont = true;
this.gvMx1tld003.Caption = "鐗╂枡鍚嶇О";
this.gvMx1tld003.FieldName = "tld003";
- this.gvMx1tld003.MinWidth = 50;
+ this.gvMx1tld003.MinWidth = 62;
this.gvMx1tld003.Name = "gvMx1tld003";
this.gvMx1tld003.Tag = "query_a.tld003";
this.gvMx1tld003.Visible = true;
this.gvMx1tld003.VisibleIndex = 2;
- this.gvMx1tld003.Width = 94;
+ this.gvMx1tld003.Width = 117;
//
// gvMx1tld004
//
this.gvMx1tld004.AppearanceCell.Options.UseFont = true;
this.gvMx1tld004.Caption = "瑙勬牸鍨嬪彿";
this.gvMx1tld004.FieldName = "tld004";
- this.gvMx1tld004.MinWidth = 50;
+ this.gvMx1tld004.MinWidth = 62;
this.gvMx1tld004.Name = "gvMx1tld004";
this.gvMx1tld004.Tag = "query_a.tld004";
this.gvMx1tld004.Visible = true;
this.gvMx1tld004.VisibleIndex = 3;
- this.gvMx1tld004.Width = 94;
+ this.gvMx1tld004.Width = 117;
//
// gvMx1tld005
//
@@ -1050,84 +1090,84 @@
this.gvMx1tld005.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1tld005.Caption = "鐢宠鏁伴噺";
this.gvMx1tld005.FieldName = "tld005";
- this.gvMx1tld005.MinWidth = 50;
+ this.gvMx1tld005.MinWidth = 62;
this.gvMx1tld005.Name = "gvMx1tld005";
this.gvMx1tld005.Tag = "edit";
this.gvMx1tld005.Visible = true;
this.gvMx1tld005.VisibleIndex = 4;
- this.gvMx1tld005.Width = 94;
+ this.gvMx1tld005.Width = 117;
//
// gvMx1tld006
//
this.gvMx1tld006.AppearanceCell.Options.UseFont = true;
this.gvMx1tld006.Caption = "宸查��鏁伴噺";
this.gvMx1tld006.FieldName = "tld006";
- this.gvMx1tld006.MinWidth = 50;
+ this.gvMx1tld006.MinWidth = 62;
this.gvMx1tld006.Name = "gvMx1tld006";
this.gvMx1tld006.Tag = "query_a.tld006";
this.gvMx1tld006.Visible = true;
this.gvMx1tld006.VisibleIndex = 7;
- this.gvMx1tld006.Width = 94;
+ this.gvMx1tld006.Width = 117;
//
// gvMx1tld007
//
this.gvMx1tld007.AppearanceCell.Options.UseFont = true;
this.gvMx1tld007.Caption = "鍗曚綅";
this.gvMx1tld007.FieldName = "dwName";
- this.gvMx1tld007.MinWidth = 50;
+ this.gvMx1tld007.MinWidth = 62;
this.gvMx1tld007.Name = "gvMx1tld007";
this.gvMx1tld007.Tag = "query_a.tld007";
this.gvMx1tld007.Visible = true;
this.gvMx1tld007.VisibleIndex = 8;
- this.gvMx1tld007.Width = 94;
+ this.gvMx1tld007.Width = 117;
//
// gvMx1tld009
//
this.gvMx1tld009.AppearanceCell.Options.UseFont = true;
this.gvMx1tld009.Caption = "鐗╂枡id";
this.gvMx1tld009.FieldName = "tld009";
- this.gvMx1tld009.MinWidth = 50;
+ this.gvMx1tld009.MinWidth = 62;
this.gvMx1tld009.Name = "gvMx1tld009";
this.gvMx1tld009.Tag = "query_a.tld009";
- this.gvMx1tld009.Width = 94;
+ this.gvMx1tld009.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "宸叉墦鍗版暟閲�";
this.gridColumn1.FieldName = "ydy";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 9;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "鍙墦鍗版暟閲�";
this.gridColumn2.FieldName = "kdy";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 10;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.MinWidth = 31;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 11;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.Width = 117;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1140,12 +1180,12 @@
this.gridColumn5.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn5.Caption = "澶囨敞";
this.gridColumn5.FieldName = "tld014";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "edit";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn12
//
@@ -1156,12 +1196,12 @@
this.gridColumn12.Caption = "閫夋嫨涓嶈壇绫诲埆";
this.gridColumn12.ColumnEdit = this.rptBl;
this.gridColumn12.FieldName = "tld015";
- this.gridColumn12.MinWidth = 100;
+ this.gridColumn12.MinWidth = 125;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "edit";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 6;
- this.gridColumn12.Width = 100;
+ this.gridColumn12.Width = 125;
//
// rptBl
//
@@ -1174,17 +1214,20 @@
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1124, 412);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1406, 505);
this.xtraTabPage3.Text = "鏉＄爜鏄庣粏";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
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(1124, 412);
+ this.gcMx2.Size = new System.Drawing.Size(1406, 505);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1201,6 +1244,7 @@
this.gridColumn7,
this.gvMx1createBy,
this.gvMx1lotDate});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1212,128 +1256,120 @@
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;
//
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 300;
+ this.gvMx1itemBarcode.MinWidth = 375;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 0;
- this.gvMx1itemBarcode.Width = 300;
+ this.gvMx1itemBarcode.Width = 375;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡缂栫爜";
this.gridColumn4.FieldName = "itemNo";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
this.gridColumn9.FieldName = "itemName";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 2;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn8.FieldName = "itemModel";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 3;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 117;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.MinWidth = 62;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 4;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍗曚綅";
this.gridColumn7.FieldName = "dwName";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 5;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// gvMx1createBy
//
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鍒涘缓浜�";
- this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 50;
+ this.gvMx1createBy.FieldName = "createByName";
+ this.gvMx1createBy.MinWidth = 62;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 6;
- this.gvMx1createBy.Width = 94;
+ this.gvMx1createBy.Width = 117;
//
// gvMx1lotDate
//
this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
this.gvMx1lotDate.FieldName = "createDate";
- this.gvMx1lotDate.MinWidth = 50;
+ this.gvMx1lotDate.MinWidth = 62;
this.gvMx1lotDate.Name = "gvMx1lotDate";
this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
this.gvMx1lotDate.Visible = true;
this.gvMx1lotDate.VisibleIndex = 7;
- this.gvMx1lotDate.Width = 94;
+ this.gvMx1lotDate.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
+ this.picCheckBox.Location = new System.Drawing.Point(1270, 55);
+ 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 = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn15
- //
- this.gridColumn15.Caption = "瀹岀粨";
- this.gridColumn15.FieldName = "txtColor";
- this.gridColumn15.MinWidth = 25;
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 1;
- this.gridColumn15.Width = 94;
- //
// Frm_WwTbl
//
- 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(1128, 704);
+ this.ClientSize = new System.Drawing.Size(1410, 860);
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_WwTbl";
this.Text = "閫�鏂欑敵璇�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1361,7 +1397,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).EndInit();
@@ -1434,7 +1470,7 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.TextEdit txt_tbl012;
- private DevExpress.XtraEditors.TextEdit txt_tbl011;
+ private DevExpress.XtraEditors.TextEdit txt_checkUserName;
private DevExpress.XtraEditors.TextEdit txt_tbl006;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraEditors.TextEdit txt_daa014;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
index 7224644..1b2b2d0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
@@ -30,15 +30,15 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -76,15 +76,15 @@
this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_taskNo = 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_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_reason = new DevExpress.XtraEditors.TextEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.txt_cbillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
- this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lastupdateByName = new DevExpress.XtraEditors.TextEdit();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -115,6 +115,7 @@
this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -130,7 +131,6 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -156,15 +156,15 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.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_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -204,9 +204,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(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -214,10 +215,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(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -226,8 +228,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(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -236,6 +239,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
@@ -248,17 +252,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1408, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 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(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
this.gcMain1.TabIndex = 5;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -287,8 +293,9 @@
this.gv_cbillNo,
this.bandedGridColumn2,
this.bandedGridColumn4});
+ 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;
@@ -299,259 +306,260 @@
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭GUID";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 25;
+ this.gv_guid.MinWidth = 31;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.GUID";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 117;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鏍囪瘑";
this.gv_status.FieldName = "checkStatus";
- this.gv_status.MinWidth = 25;
+ this.gv_status.MinWidth = 31;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 0;
- this.gv_status.Width = 50;
+ this.gv_status.Width = 62;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 25;
+ this.gv_billNo.MinWidth = 31;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 1;
- this.gv_billNo.Width = 114;
+ this.gv_billNo.Width = 142;
//
// bandedGridColumn3
//
this.bandedGridColumn3.Caption = "鐢宠鍗曞彿";
this.bandedGridColumn3.FieldName = "taskNo";
- this.bandedGridColumn3.MinWidth = 25;
+ this.bandedGridColumn3.MinWidth = 31;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Visible = true;
this.bandedGridColumn3.VisibleIndex = 2;
- this.bandedGridColumn3.Width = 94;
+ this.bandedGridColumn3.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍏ュ簱绫诲瀷";
this.gridColumn1.FieldName = "inType";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 3;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gv_depotsId
//
this.gv_depotsId.AppearanceCell.Options.UseFont = true;
this.gv_depotsId.Caption = "浠撳簱ID";
this.gv_depotsId.FieldName = "depotsId";
- this.gv_depotsId.MinWidth = 25;
+ this.gv_depotsId.MinWidth = 31;
this.gv_depotsId.Name = "gv_depotsId";
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
- this.gv_depotsId.Width = 89;
+ this.gv_depotsId.Width = 111;
//
// gv_depotsCode
//
this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
this.gv_depotsCode.Caption = "浠撳簱缂栧彿";
this.gv_depotsCode.FieldName = "depotsCode";
- this.gv_depotsCode.MinWidth = 25;
+ this.gv_depotsCode.MinWidth = 31;
this.gv_depotsCode.Name = "gv_depotsCode";
this.gv_depotsCode.OptionsColumn.AllowEdit = false;
this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
this.gv_depotsCode.Visible = true;
this.gv_depotsCode.VisibleIndex = 4;
- this.gv_depotsCode.Width = 94;
+ this.gv_depotsCode.Width = 117;
//
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "浠撳簱鍚嶇О";
this.bandedGridColumn1.FieldName = "depotName";
- this.bandedGridColumn1.MinWidth = 25;
+ this.bandedGridColumn1.MinWidth = 31;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.VisibleIndex = 5;
- this.bandedGridColumn1.Width = 94;
+ this.bandedGridColumn1.Width = 117;
//
// gv_reason
//
this.gv_reason.AppearanceCell.Options.UseFont = true;
this.gv_reason.Caption = "閫�鏂欑被鍨�";
this.gv_reason.FieldName = "reason";
- this.gv_reason.MinWidth = 25;
+ this.gv_reason.MinWidth = 31;
this.gv_reason.Name = "gv_reason";
this.gv_reason.OptionsColumn.AllowEdit = false;
this.gv_reason.Tag = "query_a.REASON";
this.gv_reason.Visible = true;
this.gv_reason.VisibleIndex = 6;
- this.gv_reason.Width = 94;
+ this.gv_reason.Width = 117;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 25;
+ this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.MinWidth = 31;
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 = 7;
- this.gv_createBy.Width = 66;
+ this.gv_createBy.Width = 82;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 25;
+ this.gv_createDate.MinWidth = 31;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 8;
- this.gv_createDate.Width = 146;
+ this.gv_createDate.Width = 182;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 25;
+ this.gv_lastupdateBy.FieldName = "lastupdateByName";
+ this.gv_lastupdateBy.MinWidth = 31;
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 = 9;
- this.gv_lastupdateBy.Width = 94;
+ this.gv_lastupdateBy.Width = 117;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 25;
+ this.gv_lastupdateDate.MinWidth = 31;
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 = 10;
- this.gv_lastupdateDate.Width = 94;
+ this.gv_lastupdateDate.Width = 117;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "鐢宠澶囨敞 ";
this.gv_remark.FieldName = "sqRemark";
- this.gv_remark.MinWidth = 25;
+ this.gv_remark.MinWidth = 31;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 11;
- this.gv_remark.Width = 119;
+ this.gv_remark.Width = 149;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 25;
+ this.gv_checkUser.FieldName = "checkUserName";
+ this.gv_checkUser.MinWidth = 31;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 12;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.Width = 117;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 25;
+ this.gv_checkDate.MinWidth = 31;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 13;
- this.gv_checkDate.Width = 94;
+ this.gv_checkDate.Width = 117;
//
// gv_fbillno
//
this.gv_fbillno.AppearanceCell.Options.UseFont = true;
this.gv_fbillno.Caption = "鎶曟枡鍗曞彿 ";
this.gv_fbillno.FieldName = "daa014";
- this.gv_fbillno.MinWidth = 25;
+ this.gv_fbillno.MinWidth = 31;
this.gv_fbillno.Name = "gv_fbillno";
this.gv_fbillno.OptionsColumn.AllowEdit = false;
this.gv_fbillno.Tag = "query_a.FBILLNO";
this.gv_fbillno.Visible = true;
this.gv_fbillno.VisibleIndex = 14;
- this.gv_fbillno.Width = 64;
+ this.gv_fbillno.Width = 80;
//
// gv_cbillNo
//
this.gv_cbillNo.AppearanceCell.Options.UseFont = true;
this.gv_cbillNo.Caption = "濮斿宸ュ崟鍙�";
this.gv_cbillNo.FieldName = "cbillNo";
- this.gv_cbillNo.MinWidth = 25;
+ this.gv_cbillNo.MinWidth = 31;
this.gv_cbillNo.Name = "gv_cbillNo";
this.gv_cbillNo.OptionsColumn.AllowEdit = false;
this.gv_cbillNo.Tag = "query_a.CBILL_NO";
this.gv_cbillNo.Visible = true;
this.gv_cbillNo.VisibleIndex = 15;
- this.gv_cbillNo.Width = 114;
+ this.gv_cbillNo.Width = 142;
//
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "浠诲姟鍗曞彿";
this.bandedGridColumn2.FieldName = "workNo";
- this.bandedGridColumn2.MinWidth = 25;
+ this.bandedGridColumn2.MinWidth = 31;
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.Visible = true;
this.bandedGridColumn2.VisibleIndex = 16;
- this.bandedGridColumn2.Width = 94;
+ this.bandedGridColumn2.Width = 117;
//
// bandedGridColumn4
//
this.bandedGridColumn4.Caption = "鍏ュ簱缁勭粐";
this.bandedGridColumn4.FieldName = "rkOrg";
- this.bandedGridColumn4.MinWidth = 25;
+ this.bandedGridColumn4.MinWidth = 31;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Visible = true;
this.bandedGridColumn4.VisibleIndex = 17;
- this.bandedGridColumn4.Width = 94;
+ this.bandedGridColumn4.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
this.pageBar1.TabIndex = 6;
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(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -559,6 +567,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
@@ -571,8 +580,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 133;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 163;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -584,172 +593,190 @@
this.layoutMx1.Controls.Add(this.txt_sqRemark);
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_taskNo);
- 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_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_checkUserName);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_reason);
this.layoutMx1.Controls.Add(this.txt_daa014);
this.layoutMx1.Controls.Add(this.txt_cbillNo);
this.layoutMx1.Controls.Add(this.txt_status);
- this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
+ this.layoutMx1.Controls.Add(this.txt_lastupdateByName);
this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17});
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(644, 199, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 133);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 163);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 140);
+ this.lbGuid.Location = new System.Drawing.Point(1031, 171);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(335, 34);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(114, 40);
+ this.txt_depotName.Location = new System.Drawing.Point(137, 46);
+ this.txt_depotName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(165, 24);
+ this.txt_depotName.Size = new System.Drawing.Size(212, 28);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 573;
//
// txt_inType
//
- this.txt_inType.Location = new System.Drawing.Point(656, 12);
+ this.txt_inType.Location = new System.Drawing.Point(815, 14);
+ this.txt_inType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_inType.Name = "txt_inType";
this.txt_inType.Properties.Appearance.Options.UseFont = true;
- this.txt_inType.Size = new System.Drawing.Size(165, 24);
+ this.txt_inType.Size = new System.Drawing.Size(212, 28);
this.txt_inType.StyleController = this.layoutMx1;
this.txt_inType.TabIndex = 574;
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(385, 68);
+ this.txt_workNo.Location = new System.Drawing.Point(476, 78);
+ this.txt_workNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_workNo.Size = new System.Drawing.Size(212, 28);
this.txt_workNo.StyleController = this.layoutMx1;
this.txt_workNo.TabIndex = 387;
//
// txt_sqRemark
//
- this.txt_sqRemark.Location = new System.Drawing.Point(114, 96);
+ this.txt_sqRemark.Location = new System.Drawing.Point(137, 110);
+ this.txt_sqRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_sqRemark.Name = "txt_sqRemark";
this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_sqRemark.Size = new System.Drawing.Size(436, 24);
+ this.txt_sqRemark.Size = new System.Drawing.Size(551, 28);
this.txt_sqRemark.StyleController = this.layoutMx1;
this.txt_sqRemark.TabIndex = 243;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(137, 14);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(212, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
//
// txt_taskNo
//
- this.txt_taskNo.Location = new System.Drawing.Point(385, 12);
+ this.txt_taskNo.Location = new System.Drawing.Point(476, 14);
+ this.txt_taskNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_taskNo.Name = "txt_taskNo";
this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
- this.txt_taskNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_taskNo.Size = new System.Drawing.Size(212, 28);
this.txt_taskNo.StyleController = this.layoutMx1;
this.txt_taskNo.TabIndex = 216;
//
- // txt_createBy
+ // txt_createByName
//
- this.txt_createBy.Location = new System.Drawing.Point(927, 12);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(166, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 222;
+ this.txt_createByName.Location = new System.Drawing.Point(1154, 14);
+ this.txt_createByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_createByName.Name = "txt_createByName";
+ this.txt_createByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_createByName.Size = new System.Drawing.Size(214, 28);
+ this.txt_createByName.StyleController = this.layoutMx1;
+ this.txt_createByName.TabIndex = 222;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(927, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(1154, 46);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(166, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(214, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 226;
//
- // txt_checkUser
+ // txt_checkUserName
//
- this.txt_checkUser.Location = new System.Drawing.Point(927, 68);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 258;
+ this.txt_checkUserName.Location = new System.Drawing.Point(1154, 78);
+ this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkUserName.Name = "txt_checkUserName";
+ this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUserName.Size = new System.Drawing.Size(214, 28);
+ this.txt_checkUserName.StyleController = this.layoutMx1;
+ this.txt_checkUserName.TabIndex = 258;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(927, 96);
+ this.txt_checkDate.Location = new System.Drawing.Point(1154, 110);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(214, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 262;
//
// txt_reason
//
- this.txt_reason.Location = new System.Drawing.Point(385, 40);
+ this.txt_reason.Location = new System.Drawing.Point(476, 46);
+ this.txt_reason.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_reason.Name = "txt_reason";
- this.txt_reason.Size = new System.Drawing.Size(165, 24);
+ this.txt_reason.Size = new System.Drawing.Size(212, 28);
this.txt_reason.StyleController = this.layoutMx1;
this.txt_reason.TabIndex = 575;
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(656, 40);
+ this.txt_daa014.Location = new System.Drawing.Point(815, 46);
+ this.txt_daa014.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(165, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(212, 28);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 576;
//
// txt_cbillNo
//
- this.txt_cbillNo.Location = new System.Drawing.Point(114, 68);
+ this.txt_cbillNo.Location = new System.Drawing.Point(137, 78);
+ this.txt_cbillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_cbillNo.Name = "txt_cbillNo";
- this.txt_cbillNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_cbillNo.Size = new System.Drawing.Size(212, 28);
this.txt_cbillNo.StyleController = this.layoutMx1;
this.txt_cbillNo.TabIndex = 577;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(825, 124);
+ this.txt_status.Location = new System.Drawing.Point(1031, 142);
+ this.txt_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(268, 24);
+ this.txt_status.Size = new System.Drawing.Size(337, 27);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 578;
//
- // txt_lastupdateBy
+ // txt_lastupdateByName
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(656, 68);
- this.txt_lastupdateBy.Name = "txt_lastupdateBy";
- this.txt_lastupdateBy.Size = new System.Drawing.Size(165, 24);
- this.txt_lastupdateBy.StyleController = this.layoutMx1;
- this.txt_lastupdateBy.TabIndex = 579;
+ this.txt_lastupdateByName.Location = new System.Drawing.Point(815, 78);
+ this.txt_lastupdateByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_lastupdateByName.Name = "txt_lastupdateByName";
+ this.txt_lastupdateByName.Size = new System.Drawing.Size(212, 28);
+ this.txt_lastupdateByName.StyleController = this.layoutMx1;
+ this.txt_lastupdateByName.TabIndex = 579;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(656, 96);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(815, 110);
+ this.txt_lastupdateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
- this.txt_lastupdateDate.Size = new System.Drawing.Size(165, 24);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(212, 28);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 580;
//
@@ -788,36 +815,36 @@
this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9,
- rowDefinition10});
- this.Root.Size = new System.Drawing.Size(1105, 160);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
+ this.Root.Size = new System.Drawing.Size(1382, 184);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -825,113 +852,113 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem1.Text = "閫�鏂欏崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_inType;
- this.layoutControlItem2.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(678, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_taskNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(339, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem3.Text = "鐢宠鍗曞彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem4
//
- this.layoutControlItem4.Control = this.txt_createBy;
- this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem4.Control = this.txt_createByName;
+ this.layoutControlItem4.Location = new System.Drawing.Point(1017, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(341, 32);
this.layoutControlItem4.Text = "鍒涘缓浜�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_createDate;
- this.layoutControlItem5.Location = new System.Drawing.Point(813, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(1017, 32);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(341, 32);
this.layoutControlItem5.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_checkUser;
- this.layoutControlItem6.Location = new System.Drawing.Point(813, 56);
+ this.layoutControlItem6.Control = this.txt_checkUserName;
+ this.layoutControlItem6.Location = new System.Drawing.Point(1017, 64);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(341, 32);
this.layoutControlItem6.Text = "瀹℃牳浜�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_checkDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(813, 84);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1017, 96);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(341, 32);
this.layoutControlItem7.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_depotName;
- this.layoutControlItem8.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem8.Text = "鍏ュ簱浠撳簱";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_reason;
- this.layoutControlItem9.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem9.Location = new System.Drawing.Point(339, 32);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem9.Text = "閫�鏂欑被鍨�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_daa014;
- this.layoutControlItem12.Location = new System.Drawing.Point(542, 28);
+ this.layoutControlItem12.Location = new System.Drawing.Point(678, 32);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem12.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_status;
- this.layoutControlItem14.Location = new System.Drawing.Point(813, 112);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1017, 128);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(341, 32);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -939,64 +966,65 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_sqRemark;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(542, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(678, 32);
this.layoutControlItem10.Text = "澶囨敞淇℃伅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_workNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(339, 64);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem11.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_cbillNo;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem13.Text = "濮斿宸ュ崟鍙�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.txt_lastupdateBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 56);
+ this.layoutControlItem15.Control = this.txt_lastupdateByName;
+ this.layoutControlItem15.Location = new System.Drawing.Point(678, 64);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem15.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_lastupdateDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(542, 84);
+ this.layoutControlItem16.Location = new System.Drawing.Point(678, 96);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(339, 32);
this.layoutControlItem16.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(108, 22);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 425);
+ this.tabMx.Size = new System.Drawing.Size(1408, 520);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1005,17 +1033,20 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 393);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 482);
this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
//
// 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(1124, 393);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 482);
this.gcMx1.TabIndex = 2;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1031,6 +1062,7 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn8});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1041,92 +1073,105 @@
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
this.gridColumn4.FieldName = "itemModel";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gvMx2itemSname
//
this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx2itemSname.FieldName = "itemName";
- this.gvMx2itemSname.MinWidth = 50;
+ this.gvMx2itemSname.MinWidth = 62;
this.gvMx2itemSname.Name = "gvMx2itemSname";
this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx2itemSname.Visible = true;
this.gvMx2itemSname.VisibleIndex = 2;
- this.gvMx2itemSname.Width = 94;
+ this.gvMx2itemSname.Width = 117;
//
// gvMx2quantity
//
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
this.gvMx2quantity.Caption = "鏁伴噺";
this.gvMx2quantity.FieldName = "quantity";
- this.gvMx2quantity.MinWidth = 50;
+ this.gvMx2quantity.MinWidth = 62;
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.QUANTITY";
this.gvMx2quantity.Visible = true;
this.gvMx2quantity.VisibleIndex = 3;
- this.gvMx2quantity.Width = 94;
+ this.gvMx2quantity.Width = 117;
//
// gvMx2unit
//
this.gvMx2unit.AppearanceCell.Options.UseFont = true;
this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
this.gvMx2unit.FieldName = "kcUnit";
- this.gvMx2unit.MinWidth = 50;
+ this.gvMx2unit.MinWidth = 62;
this.gvMx2unit.Name = "gvMx2unit";
this.gvMx2unit.Tag = "query_a.UNIT";
this.gvMx2unit.Visible = true;
this.gvMx2unit.VisibleIndex = 4;
- this.gvMx2unit.Width = 94;
+ this.gvMx2unit.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "寤虹珛鑰�";
- this.gridColumn5.FieldName = "createBy";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.FieldName = "createByName";
+ 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 = "createDate";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐢宠澶囨敞";
+ this.gridColumn8.FieldName = "sqRemark";
+ this.gridColumn8.MinWidth = 31;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 7;
+ this.gridColumn8.Width = 117;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 393);
+ this.tabMxPage2.Size = new System.Drawing.Size(1406, 482);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
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(1124, 393);
+ this.gcMx2.Size = new System.Drawing.Size(1406, 482);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1144,6 +1189,7 @@
this.gvMx1depotSectionCode,
this.gridColumn2,
this.gridColumn7});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1155,146 +1201,138 @@
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 50;
+ this.gvMx1itemBarcode.MinWidth = 62;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 0;
- this.gvMx1itemBarcode.Width = 94;
+ this.gvMx1itemBarcode.Width = 117;
//
// gvMx1cItemCode
//
this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
this.gvMx1cItemCode.FieldName = "itemNo";
- this.gvMx1cItemCode.MinWidth = 50;
+ this.gvMx1cItemCode.MinWidth = 62;
this.gvMx1cItemCode.Name = "gvMx1cItemCode";
this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
this.gvMx1cItemCode.Visible = true;
this.gvMx1cItemCode.VisibleIndex = 1;
- this.gvMx1cItemCode.Width = 94;
+ this.gvMx1cItemCode.Width = 117;
//
// gvMx1itemSname
//
this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx1itemSname.FieldName = "itemName";
- this.gvMx1itemSname.MinWidth = 50;
+ this.gvMx1itemSname.MinWidth = 62;
this.gvMx1itemSname.Name = "gvMx1itemSname";
this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx1itemSname.Visible = true;
this.gvMx1itemSname.VisibleIndex = 2;
- this.gvMx1itemSname.Width = 94;
+ this.gvMx1itemSname.Width = 117;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
this.gvMx1itemNo.FieldName = "itemModel";
- this.gvMx1itemNo.MinWidth = 50;
+ this.gvMx1itemNo.MinWidth = 62;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 3;
- this.gvMx1itemNo.Width = 94;
+ this.gvMx1itemNo.Width = 117;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.MinWidth = 62;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 4;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 117;
//
// gvMx1unit
//
this.gvMx1unit.AppearanceCell.Options.UseFont = true;
this.gvMx1unit.Caption = "搴撳瓨鍗曚綅";
this.gvMx1unit.FieldName = "kcUnit";
- this.gvMx1unit.MinWidth = 50;
+ this.gvMx1unit.MinWidth = 62;
this.gvMx1unit.Name = "gvMx1unit";
this.gvMx1unit.Tag = "query_a.UNIT";
this.gvMx1unit.Visible = true;
this.gvMx1unit.VisibleIndex = 5;
- this.gvMx1unit.Width = 94;
+ this.gvMx1unit.Width = 117;
//
// gvMx1depotCode
//
this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
this.gvMx1depotCode.FieldName = "depotCode";
- this.gvMx1depotCode.MinWidth = 50;
+ this.gvMx1depotCode.MinWidth = 62;
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
this.gvMx1depotCode.VisibleIndex = 6;
- this.gvMx1depotCode.Width = 94;
+ this.gvMx1depotCode.Width = 117;
//
// gvMx1depotSectionCode
//
this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
- this.gvMx1depotSectionCode.MinWidth = 50;
+ this.gvMx1depotSectionCode.MinWidth = 62;
this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx1depotSectionCode.Visible = true;
this.gvMx1depotSectionCode.VisibleIndex = 7;
- this.gvMx1depotSectionCode.Width = 94;
+ this.gvMx1depotSectionCode.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
- this.gridColumn2.FieldName = "createBy";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.FieldName = "createByName";
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 8;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "寤虹珛鏃堕棿";
this.gridColumn7.FieldName = "createDate";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 9;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(968, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1210, 67);
+ 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 = 10;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn8
- //
- this.gridColumn8.Caption = "鐢宠澶囨敞";
- this.gridColumn8.FieldName = "sqRemark";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 7;
- this.gridColumn8.Width = 94;
- //
// Frm_WwTblDj
//
- 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(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1410, 834);
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_WwTblDj";
this.Text = "閫�鏂欏崟";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1322,15 +1360,15 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.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_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1400,10 +1438,10 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_workNo;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkUserName;
private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createByName;
private DevExpress.XtraEditors.TextEdit txt_taskNo;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
@@ -1420,7 +1458,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraEditors.TextEdit txt_cbillNo;
private DevExpress.XtraEditors.CheckEdit txt_status;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
+ private DevExpress.XtraEditors.TextEdit txt_lastupdateByName;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraTab.XtraTabControl tabMx;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
index a01f00a..1d0a66e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
@@ -73,12 +73,12 @@
this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
this.txt_wwOrgTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_outType = new DevExpress.XtraEditors.TextEdit();
this.txt_wwGys = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
@@ -154,12 +154,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wwOrgTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wwGys.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
@@ -201,10 +201,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(4);
+ 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(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -212,10 +212,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(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -224,8 +225,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(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -234,6 +236,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
@@ -246,17 +249,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1408, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 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(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -266,7 +271,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_status,
this.gv_itemOutNo,
@@ -286,8 +291,9 @@
this.gridColumn11,
this.gridColumn12,
this.gridColumn1});
+ 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;
@@ -300,230 +306,231 @@
this.gv_status.AppearanceCell.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gv_status.Caption = "瀹℃牳鏍囪瘑";
this.gv_status.FieldName = "statusChk";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
+ this.gv_status.MaxWidth = 62;
+ this.gv_status.MinWidth = 62;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.status";
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 0;
- this.gv_status.Width = 50;
+ this.gv_status.Width = 62;
//
// gv_itemOutNo
//
this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
this.gv_itemOutNo.FieldName = "itemOutNo";
- this.gv_itemOutNo.MinWidth = 100;
+ this.gv_itemOutNo.MinWidth = 125;
this.gv_itemOutNo.Name = "gv_itemOutNo";
this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
this.gv_itemOutNo.Tag = "query_a.item_out_no";
this.gv_itemOutNo.Visible = true;
this.gv_itemOutNo.VisibleIndex = 1;
- this.gv_itemOutNo.Width = 150;
+ this.gv_itemOutNo.Width = 187;
//
// gv_workNo
//
this.gv_workNo.AppearanceCell.Options.UseFont = true;
this.gv_workNo.Caption = "濮斿浠诲姟鍗曞彿";
this.gv_workNo.FieldName = "workNo";
- this.gv_workNo.MinWidth = 100;
+ this.gv_workNo.MinWidth = 125;
this.gv_workNo.Name = "gv_workNo";
this.gv_workNo.OptionsColumn.AllowEdit = false;
this.gv_workNo.Tag = "query_a.work_no";
this.gv_workNo.Visible = true;
this.gv_workNo.VisibleIndex = 14;
- this.gv_workNo.Width = 100;
+ this.gv_workNo.Width = 125;
//
// gv_pbillNo
//
this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
this.gv_pbillNo.Caption = "濮斿宸ュ崟鍙�";
this.gv_pbillNo.FieldName = "pbillNo";
- this.gv_pbillNo.MinWidth = 50;
+ this.gv_pbillNo.MinWidth = 62;
this.gv_pbillNo.Name = "gv_pbillNo";
this.gv_pbillNo.OptionsColumn.AllowEdit = false;
this.gv_pbillNo.Tag = "query_a.pbill_no";
this.gv_pbillNo.Visible = true;
this.gv_pbillNo.VisibleIndex = 15;
- this.gv_pbillNo.Width = 94;
+ this.gv_pbillNo.Width = 117;
//
// gv_outDate
//
this.gv_outDate.AppearanceCell.Options.UseFont = true;
this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
this.gv_outDate.FieldName = "outDate";
- this.gv_outDate.MinWidth = 120;
+ this.gv_outDate.MinWidth = 150;
this.gv_outDate.Name = "gv_outDate";
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
this.gv_outDate.VisibleIndex = 3;
- this.gv_outDate.Width = 120;
+ this.gv_outDate.Width = 150;
//
// gv_outType
//
this.gv_outType.AppearanceCell.Options.UseFont = true;
this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
this.gv_outType.FieldName = "outType";
- this.gv_outType.MinWidth = 50;
+ this.gv_outType.MinWidth = 62;
this.gv_outType.Name = "gv_outType";
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
this.gv_outType.VisibleIndex = 5;
- this.gv_outType.Width = 94;
+ this.gv_outType.Width = 117;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 50;
+ this.gv_checkUser.FieldName = "checkUserName";
+ this.gv_checkUser.MinWidth = 62;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 6;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.Width = 117;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 120;
+ this.gv_checkDate.MinWidth = 150;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 7;
- this.gv_checkDate.Width = 120;
+ this.gv_checkDate.Width = 150;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.MinWidth = 62;
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 = 8;
- this.gv_createBy.Width = 94;
+ this.gv_createBy.Width = 117;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
+ this.gv_createDate.MinWidth = 62;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 9;
- this.gv_createDate.Width = 94;
+ this.gv_createDate.Width = 117;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞淇℃伅 ";
this.gv_remark.FieldName = "sqRemark";
- this.gv_remark.MinWidth = 50;
+ this.gv_remark.MinWidth = 62;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 10;
- this.gv_remark.Width = 94;
+ this.gv_remark.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "濮斿缁勭粐";
this.gridColumn6.FieldName = "wwOrgTxt";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 11;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍙戞枡缁勭粐";
this.gridColumn7.FieldName = "orgIdTxt";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 12;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "濮斿渚涘簲鍟�";
this.gridColumn8.FieldName = "wwGys";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 13;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 117;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐢宠鍗曞彿";
this.gridColumn9.FieldName = "taskNo";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 2;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// gridColumn11
//
this.gridColumn11.Caption = "濮斿鎶曟枡鍗曞彿";
this.gridColumn11.FieldName = "rwdno";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 16;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn12
//
this.gridColumn12.Caption = "涓婚敭Guid";
this.gridColumn12.FieldName = "guid";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍙戞枡浠撳簱";
this.gridColumn1.FieldName = "ckName";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -531,6 +538,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
@@ -543,8 +551,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 158;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 193;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -557,12 +565,12 @@
this.layoutMx1.Controls.Add(this.txt_pbillNo);
this.layoutMx1.Controls.Add(this.txt_taskNo);
this.layoutMx1.Controls.Add(this.txt_workNo);
- this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_createByName);
this.layoutMx1.Controls.Add(this.txt_wwOrgTxt);
this.layoutMx1.Controls.Add(this.txt_outType);
this.layoutMx1.Controls.Add(this.txt_wwGys);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_checkUserName);
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_daa014);
this.layoutMx1.Controls.Add(this.txt_itemOutNo);
@@ -570,166 +578,184 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem19});
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(581, 278, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 158);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 193);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(564, 130);
+ this.lbGuid.Location = new System.Drawing.Point(705, 159);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(272, 26);
+ this.lbGuid.Size = new System.Drawing.Size(340, 32);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_orgIdTxt
//
- this.txt_orgIdTxt.Location = new System.Drawing.Point(99, 68);
+ this.txt_orgIdTxt.Location = new System.Drawing.Point(119, 81);
+ this.txt_orgIdTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_orgIdTxt.Name = "txt_orgIdTxt";
this.txt_orgIdTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_orgIdTxt.Size = new System.Drawing.Size(180, 24);
+ this.txt_orgIdTxt.Size = new System.Drawing.Size(237, 28);
this.txt_orgIdTxt.StyleController = this.layoutMx1;
this.txt_orgIdTxt.TabIndex = 589;
this.txt_orgIdTxt.Tag = "readonly";
//
// txt_ckName
//
- this.txt_ckName.Location = new System.Drawing.Point(370, 96);
+ this.txt_ckName.Location = new System.Drawing.Point(465, 115);
+ this.txt_ckName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_ckName.Name = "txt_ckName";
this.txt_ckName.Properties.Appearance.Options.UseFont = true;
- this.txt_ckName.Size = new System.Drawing.Size(180, 24);
+ this.txt_ckName.Size = new System.Drawing.Size(237, 28);
this.txt_ckName.StyleController = this.layoutMx1;
this.txt_ckName.TabIndex = 587;
this.txt_ckName.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(912, 40);
+ this.txt_checkDate.Location = new System.Drawing.Point(1157, 47);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(181, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(237, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 262;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(99, 124);
+ this.txt_remark.Location = new System.Drawing.Point(119, 149);
+ this.txt_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(180, 24);
+ this.txt_remark.Size = new System.Drawing.Size(237, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 243;
//
// txt_pbillNo
//
- this.txt_pbillNo.Location = new System.Drawing.Point(99, 40);
+ this.txt_pbillNo.Location = new System.Drawing.Point(119, 47);
+ this.txt_pbillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_pbillNo.Name = "txt_pbillNo";
this.txt_pbillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_pbillNo.Size = new System.Drawing.Size(180, 24);
+ this.txt_pbillNo.Size = new System.Drawing.Size(237, 28);
this.txt_pbillNo.StyleController = this.layoutMx1;
this.txt_pbillNo.TabIndex = 586;
//
// txt_taskNo
//
- this.txt_taskNo.Location = new System.Drawing.Point(370, 12);
+ this.txt_taskNo.Location = new System.Drawing.Point(465, 14);
+ this.txt_taskNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_taskNo.Name = "txt_taskNo";
this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
- this.txt_taskNo.Size = new System.Drawing.Size(180, 24);
+ this.txt_taskNo.Size = new System.Drawing.Size(237, 28);
this.txt_taskNo.StyleController = this.layoutMx1;
this.txt_taskNo.TabIndex = 216;
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(641, 12);
+ this.txt_workNo.Location = new System.Drawing.Point(811, 14);
+ this.txt_workNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(180, 24);
+ this.txt_workNo.Size = new System.Drawing.Size(237, 28);
this.txt_workNo.StyleController = this.layoutMx1;
this.txt_workNo.TabIndex = 387;
//
- // txt_createBy
+ // txt_createByName
//
- this.txt_createBy.Location = new System.Drawing.Point(641, 68);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(180, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 222;
+ this.txt_createByName.Location = new System.Drawing.Point(811, 81);
+ this.txt_createByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_createByName.Name = "txt_createByName";
+ this.txt_createByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_createByName.Size = new System.Drawing.Size(237, 28);
+ this.txt_createByName.StyleController = this.layoutMx1;
+ this.txt_createByName.TabIndex = 222;
//
// txt_wwOrgTxt
//
- this.txt_wwOrgTxt.Location = new System.Drawing.Point(370, 40);
+ this.txt_wwOrgTxt.Location = new System.Drawing.Point(465, 47);
+ this.txt_wwOrgTxt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_wwOrgTxt.Name = "txt_wwOrgTxt";
this.txt_wwOrgTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_wwOrgTxt.Size = new System.Drawing.Size(180, 24);
+ this.txt_wwOrgTxt.Size = new System.Drawing.Size(237, 28);
this.txt_wwOrgTxt.StyleController = this.layoutMx1;
this.txt_wwOrgTxt.TabIndex = 576;
this.txt_wwOrgTxt.Tag = "readonly";
//
// txt_outType
//
- this.txt_outType.Location = new System.Drawing.Point(370, 68);
+ this.txt_outType.Location = new System.Drawing.Point(465, 81);
+ this.txt_outType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_outType.Name = "txt_outType";
this.txt_outType.Properties.Appearance.Options.UseFont = true;
- this.txt_outType.Size = new System.Drawing.Size(180, 24);
+ this.txt_outType.Size = new System.Drawing.Size(237, 28);
this.txt_outType.StyleController = this.layoutMx1;
this.txt_outType.TabIndex = 450;
//
// txt_wwGys
//
- this.txt_wwGys.Location = new System.Drawing.Point(641, 40);
+ this.txt_wwGys.Location = new System.Drawing.Point(811, 47);
+ this.txt_wwGys.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_wwGys.Name = "txt_wwGys";
this.txt_wwGys.Properties.Appearance.Options.UseFont = true;
- this.txt_wwGys.Size = new System.Drawing.Size(180, 24);
+ this.txt_wwGys.Size = new System.Drawing.Size(237, 28);
this.txt_wwGys.StyleController = this.layoutMx1;
this.txt_wwGys.TabIndex = 578;
this.txt_wwGys.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(641, 96);
+ this.txt_createDate.Location = new System.Drawing.Point(811, 115);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(180, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(237, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 226;
//
- // txt_checkUser
+ // txt_checkUserName
//
- this.txt_checkUser.Location = new System.Drawing.Point(912, 12);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(181, 24);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 258;
+ this.txt_checkUserName.Location = new System.Drawing.Point(1157, 14);
+ this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkUserName.Name = "txt_checkUserName";
+ this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUserName.Size = new System.Drawing.Size(237, 28);
+ this.txt_checkUserName.StyleController = this.layoutMx1;
+ this.txt_checkUserName.TabIndex = 258;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(825, 68);
+ this.txt_status.Location = new System.Drawing.Point(1052, 81);
+ this.txt_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(268, 24);
+ this.txt_status.Size = new System.Drawing.Size(342, 27);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 590;
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(99, 96);
+ this.txt_daa014.Location = new System.Drawing.Point(119, 115);
+ this.txt_daa014.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(180, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(237, 28);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 591;
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(99, 12);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(119, 14);
+ this.txt_itemOutNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemOutNo.Size = new System.Drawing.Size(180, 24);
+ this.txt_itemOutNo.Size = new System.Drawing.Size(237, 28);
this.txt_itemOutNo.StyleController = this.layoutMx1;
this.txt_itemOutNo.TabIndex = 213;
//
@@ -797,81 +823,81 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1105, 160);
+ this.Root.Size = new System.Drawing.Size(1408, 193);
this.Root.TextVisible = false;
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_taskNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(346, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(346, 33);
this.layoutControlItem2.Text = "鐢宠鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_workNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(692, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(346, 33);
this.layoutControlItem3.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_pbillNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem5.Text = "濮斿宸ュ崟鍙�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_wwOrgTxt;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(346, 33);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem6.Text = "濮斿缁勭粐";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_wwGys;
- this.layoutControlItem7.Location = new System.Drawing.Point(542, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(692, 33);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem7.Text = "濮斿渚涘簲鍟�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_orgIdTxt;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 67);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem9.Text = "鍙戞枡缁勭粐";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_outType;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(346, 67);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem11.Text = "鍑哄簱绫诲埆";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem1
//
@@ -880,92 +906,92 @@
this.layoutControlItem1.CustomizationFormText = "鍑哄簱鍗曞彿";
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(346, 33);
this.layoutControlItem1.Text = "鍑哄簱鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
//
// lb_rwd
//
this.lb_rwd.Control = this.txt_daa014;
- this.lb_rwd.Location = new System.Drawing.Point(0, 84);
+ this.lb_rwd.Location = new System.Drawing.Point(0, 101);
this.lb_rwd.Name = "lb_rwd";
this.lb_rwd.OptionsTableLayoutItem.RowIndex = 3;
- this.lb_rwd.Size = new System.Drawing.Size(271, 28);
+ this.lb_rwd.Size = new System.Drawing.Size(346, 34);
this.lb_rwd.Text = "鎶曟枡鍗曞彿";
- this.lb_rwd.TextSize = new System.Drawing.Size(75, 18);
+ this.lb_rwd.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_ckName;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 84);
+ this.layoutControlItem10.Location = new System.Drawing.Point(346, 101);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem10.Text = "鍙戞枡浠撳簱";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 135);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem17.Text = "澶囨敞淇℃伅";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem4
//
- this.layoutControlItem4.Control = this.txt_createBy;
- this.layoutControlItem4.Location = new System.Drawing.Point(542, 56);
+ this.layoutControlItem4.Control = this.txt_createByName;
+ this.layoutControlItem4.Location = new System.Drawing.Point(692, 67);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem4.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_createDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(542, 84);
+ this.layoutControlItem8.Location = new System.Drawing.Point(692, 101);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem8.Text = "鍒涘缓鏃堕棿 ";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem12
//
- this.layoutControlItem12.Control = this.txt_checkUser;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem12.Control = this.txt_checkUserName;
+ this.layoutControlItem12.Location = new System.Drawing.Point(1038, 0);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(346, 33);
this.layoutControlItem12.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_checkDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(813, 28);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1038, 33);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem16.Text = "瀹℃牳鏃ユ湡 ";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_status;
- this.layoutControlItem18.Location = new System.Drawing.Point(813, 56);
+ this.layoutControlItem18.Location = new System.Drawing.Point(1038, 67);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(346, 34);
this.layoutControlItem18.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
@@ -974,9 +1000,10 @@
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 400);
+ this.tabMx.Size = new System.Drawing.Size(1408, 490);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -985,17 +1012,20 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 368);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 452);
this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
//
// 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(1124, 368);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 452);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1014,6 +1044,7 @@
this.gvMx1remark,
this.gridColumn4,
this.gridColumn5});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1025,141 +1056,144 @@
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;
//
// gvMx1workNo
//
this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
this.gvMx1workNo.Caption = "浠诲姟鍗曞彿";
this.gvMx1workNo.FieldName = "workNo";
- this.gvMx1workNo.MinWidth = 50;
+ this.gvMx1workNo.MinWidth = 62;
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.work_no";
this.gvMx1workNo.Visible = true;
this.gvMx1workNo.VisibleIndex = 0;
- this.gvMx1workNo.Width = 94;
+ this.gvMx1workNo.Width = 117;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1itemNo.FieldName = "itemNo";
- this.gvMx1itemNo.MinWidth = 50;
+ this.gvMx1itemNo.MinWidth = 62;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.item_no";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 1;
- this.gvMx1itemNo.Width = 94;
+ this.gvMx1itemNo.Width = 117;
//
// gvMx1itemId
//
this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
this.gvMx1itemId.Caption = "鐗╂枡ID ";
this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 50;
+ this.gvMx1itemId.MinWidth = 62;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.item_id";
this.gvMx1itemId.Visible = true;
this.gvMx1itemId.VisibleIndex = 2;
- this.gvMx1itemId.Width = 94;
+ this.gvMx1itemId.Width = 117;
//
// gvMx1createBy
//
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
this.gvMx1createBy.FieldName = "itemName";
- this.gvMx1createBy.MinWidth = 50;
+ this.gvMx1createBy.MinWidth = 62;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.create_by";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 3;
- this.gvMx1createBy.Width = 94;
+ this.gvMx1createBy.Width = 117;
//
// gvMx1createDate
//
this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
this.gvMx1createDate.FieldName = "itemModel";
- this.gvMx1createDate.MinWidth = 50;
+ this.gvMx1createDate.MinWidth = 62;
this.gvMx1createDate.Name = "gvMx1createDate";
this.gvMx1createDate.Tag = "query_a.create_date";
this.gvMx1createDate.Visible = true;
this.gvMx1createDate.VisibleIndex = 4;
- this.gvMx1createDate.Width = 94;
+ this.gvMx1createDate.Width = 117;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鐢宠鏁伴噺 ";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.MinWidth = 62;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.quantity";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 5;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 117;
//
// gvMx1tlQty
//
this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
this.gvMx1tlQty.FieldName = "tlQty";
- this.gvMx1tlQty.MinWidth = 50;
+ this.gvMx1tlQty.MinWidth = 62;
this.gvMx1tlQty.Name = "gvMx1tlQty";
this.gvMx1tlQty.Tag = "query_a.tl_qty";
this.gvMx1tlQty.Visible = true;
this.gvMx1tlQty.VisibleIndex = 6;
- this.gvMx1tlQty.Width = 94;
+ this.gvMx1tlQty.Width = 117;
//
// gvMx1remark
//
this.gvMx1remark.AppearanceCell.Options.UseFont = true;
this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
this.gvMx1remark.FieldName = "sqRemark";
- this.gvMx1remark.MinWidth = 50;
+ this.gvMx1remark.MinWidth = 62;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "query_a.remark";
this.gvMx1remark.Visible = true;
this.gvMx1remark.VisibleIndex = 7;
- this.gvMx1remark.Width = 94;
+ this.gvMx1remark.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "寤虹珛鑰�";
- this.gridColumn4.FieldName = "createBy";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.FieldName = "createByName";
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 8;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "寤虹珛鏃堕棿";
this.gridColumn5.FieldName = "createDate";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 9;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 368);
+ this.tabMxPage2.Size = new System.Drawing.Size(1406, 452);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
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(1124, 368);
+ this.gcMx2.Size = new System.Drawing.Size(1406, 452);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1175,6 +1209,7 @@
this.gvMx2depotSectionCode,
this.gridColumn2,
this.gridColumn3});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1186,99 +1221,100 @@
this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 50;
+ this.gvMx2itemBarcode.MinWidth = 62;
this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx2itemBarcode.Visible = true;
this.gvMx2itemBarcode.VisibleIndex = 0;
- this.gvMx2itemBarcode.Width = 94;
+ this.gvMx2itemBarcode.Width = 117;
//
// gvMx2itemNo
//
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 50;
+ this.gvMx2itemNo.MinWidth = 62;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 1;
- this.gvMx2itemNo.Width = 94;
+ this.gvMx2itemNo.Width = 117;
//
// gvMx2lotNo
//
this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
this.gvMx2lotNo.FieldName = "itemName";
- this.gvMx2lotNo.MinWidth = 50;
+ this.gvMx2lotNo.MinWidth = 62;
this.gvMx2lotNo.Name = "gvMx2lotNo";
this.gvMx2lotNo.Tag = "query_a.LOT_NO";
this.gvMx2lotNo.Visible = true;
this.gvMx2lotNo.VisibleIndex = 2;
- this.gvMx2lotNo.Width = 94;
+ this.gvMx2lotNo.Width = 117;
//
// gvMx2quantity
//
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
this.gvMx2quantity.Caption = "鏁伴噺";
this.gvMx2quantity.FieldName = "quantity";
- this.gvMx2quantity.MinWidth = 50;
+ this.gvMx2quantity.MinWidth = 62;
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.QUANTITY";
this.gvMx2quantity.Visible = true;
this.gvMx2quantity.VisibleIndex = 3;
- this.gvMx2quantity.Width = 94;
+ this.gvMx2quantity.Width = 117;
//
// gvMx2depotCode
//
this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
this.gvMx2depotCode.FieldName = "depotCode";
- this.gvMx2depotCode.MinWidth = 50;
+ this.gvMx2depotCode.MinWidth = 62;
this.gvMx2depotCode.Name = "gvMx2depotCode";
this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx2depotCode.Visible = true;
this.gvMx2depotCode.VisibleIndex = 4;
- this.gvMx2depotCode.Width = 94;
+ this.gvMx2depotCode.Width = 117;
//
// gvMx2depotSectionCode
//
this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
- this.gvMx2depotSectionCode.MinWidth = 50;
+ this.gvMx2depotSectionCode.MinWidth = 62;
this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx2depotSectionCode.Visible = true;
this.gvMx2depotSectionCode.VisibleIndex = 5;
- this.gvMx2depotSectionCode.Width = 94;
+ this.gvMx2depotSectionCode.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
- this.gridColumn2.FieldName = "createBy";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.FieldName = "createByName";
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 6;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "寤虹珛鏃堕棿";
this.gridColumn3.FieldName = "createDate";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 7;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(961, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1201, 67);
+ 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 = 11;
this.picCheckBox.TabStop = false;
@@ -1286,13 +1322,14 @@
//
// WwBlclDj
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
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 = "WwBlclDj";
- this.Size = new System.Drawing.Size(1128, 682);
+ this.Size = new System.Drawing.Size(1410, 834);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -1319,12 +1356,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wwOrgTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wwGys.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
@@ -1396,10 +1433,10 @@
private DevExpress.XtraEditors.TextEdit txt_outType;
private DevExpress.XtraEditors.TextEdit txt_workNo;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkUserName;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createByName;
private DevExpress.XtraEditors.TextEdit txt_taskNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
--
Gitblit v1.9.3