From a516bd113181c846d0176d773770d818aeb59fac Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 06 十一月 2025 08:53:45 +0800
Subject: [PATCH] 工单排产、生产工单、生产入库单、返工列表：显示人员ID改为显示人员姓名
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs | 821 +++++++++-------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 522 +++++-----
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 340 +++---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1172 +++++++++++++-----------
4 files changed, 1,544 insertions(+), 1,311 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
index de39ac9..ebb38f4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
@@ -30,15 +30,15 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -48,11 +48,11 @@
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_creatByName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateByName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_checkUserName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_taskNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -71,7 +71,7 @@
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
- this.txt_fcheckUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
@@ -80,7 +80,7 @@
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_rkOrg = 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_depotName = new DevExpress.XtraEditors.TextEdit();
this.txt_cbillNo = new DevExpress.XtraEditors.TextEdit();
@@ -88,6 +88,8 @@
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_tldh = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -97,8 +99,15 @@
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -125,15 +134,6 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -154,7 +154,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
@@ -163,7 +163,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_rkOrg.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_depotName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).BeginInit();
@@ -171,6 +171,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tldh.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -180,17 +182,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.tabMxPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- this.xtraTabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -200,6 +191,15 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ this.xtraTabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -211,9 +211,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(1469, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1836, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -221,10 +222,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(1469, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1836, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -233,8 +235,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(1467, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1834, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -243,6 +246,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
@@ -255,17 +259,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1467, 570);
+ this.split1.Size = new System.Drawing.Size(1834, 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(1467, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1834, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -277,11 +283,11 @@
this.gv_guid,
this.bandedGridColumn7,
this.gv_billNo,
- this.gv_createBy,
+ this.gv_creatByName,
this.gv_createDate,
- this.gv_lastupdateBy,
+ this.gv_lastupdateByName,
this.gv_lastupdateDate,
- this.gv_checkUser,
+ this.gv_checkUserName,
this.gv_checkDate,
this.gv_taskNo,
this.gridColumn8,
@@ -294,8 +300,9 @@
this.bandedGridColumn5,
this.bandedGridColumn6,
this.gridColumn7});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -306,237 +313,248 @@
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭Guid";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
+ this.gv_guid.MinWidth = 62;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.GUID";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 117;
//
// bandedGridColumn7
//
this.bandedGridColumn7.Caption = "瀹℃牳";
this.bandedGridColumn7.FieldName = "checkStatus";
- this.bandedGridColumn7.MinWidth = 25;
+ this.bandedGridColumn7.MinWidth = 31;
this.bandedGridColumn7.Name = "bandedGridColumn7";
this.bandedGridColumn7.Tag = "query_a.BILL_NO";
this.bandedGridColumn7.Visible = true;
this.bandedGridColumn7.VisibleIndex = 0;
- this.bandedGridColumn7.Width = 94;
+ this.bandedGridColumn7.Width = 117;
//
// 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.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 = 180;
+ this.gv_billNo.Width = 225;
//
- // gv_createBy
+ // gv_creatByName
//
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
- 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 = 9;
- this.gv_createBy.Width = 80;
+ this.gv_creatByName.AppearanceCell.Options.UseFont = true;
+ this.gv_creatByName.Caption = "鍒涘缓浜� ";
+ this.gv_creatByName.FieldName = "creatByName";
+ this.gv_creatByName.MinWidth = 25;
+ this.gv_creatByName.Name = "gv_creatByName";
+ this.gv_creatByName.OptionsColumn.AllowEdit = false;
+ this.gv_creatByName.Tag = "query_a.creatByName";
+ this.gv_creatByName.Visible = true;
+ this.gv_creatByName.VisibleIndex = 9;
+ this.gv_creatByName.Width = 100;
//
// 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.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 = 10;
- this.gv_createDate.Width = 180;
+ this.gv_createDate.Width = 225;
//
- // gv_lastupdateBy
+ // gv_lastupdateByName
//
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- 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 = 11;
- this.gv_lastupdateBy.Width = 94;
+ this.gv_lastupdateByName.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateByName.Caption = "鏈�鍚庢洿鏂颁汉 ";
+ this.gv_lastupdateByName.FieldName = "lastupdateByName";
+ this.gv_lastupdateByName.MinWidth = 25;
+ this.gv_lastupdateByName.Name = "gv_lastupdateByName";
+ this.gv_lastupdateByName.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateByName.Tag = "query_a.lastupdateByName";
+ this.gv_lastupdateByName.Visible = true;
+ this.gv_lastupdateByName.VisibleIndex = 11;
+ this.gv_lastupdateByName.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.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 = 12;
- this.gv_lastupdateDate.Width = 94;
+ this.gv_lastupdateDate.Width = 117;
//
- // gv_checkUser
+ // gv_checkUserName
//
- this.gv_checkUser.AppearanceCell.Options.UseFont = true;
- this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
- 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 = 13;
- this.gv_checkUser.Width = 60;
+ this.gv_checkUserName.AppearanceCell.Options.UseFont = true;
+ this.gv_checkUserName.Caption = "瀹℃牳浜� ";
+ this.gv_checkUserName.FieldName = "checkUserName";
+ this.gv_checkUserName.MinWidth = 25;
+ this.gv_checkUserName.Name = "gv_checkUserName";
+ this.gv_checkUserName.OptionsColumn.AllowEdit = false;
+ this.gv_checkUserName.Tag = "query_a.checkUserName";
+ this.gv_checkUserName.Visible = true;
+ this.gv_checkUserName.VisibleIndex = 13;
//
// 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.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 = 14;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.Width = 225;
//
// gv_taskNo
//
this.gv_taskNo.AppearanceCell.Options.UseFont = true;
this.gv_taskNo.Caption = "鐢熶骇宸ュ崟鍙�";
this.gv_taskNo.FieldName = "taskNo";
+ this.gv_taskNo.MinWidth = 25;
this.gv_taskNo.Name = "gv_taskNo";
this.gv_taskNo.OptionsColumn.AllowEdit = false;
this.gv_taskNo.Tag = "query_a.TASK_NO";
this.gv_taskNo.Visible = true;
this.gv_taskNo.VisibleIndex = 3;
- this.gv_taskNo.Width = 94;
+ this.gv_taskNo.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "浠诲姟鍗曞彿";
this.gridColumn8.FieldName = "workNo";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 2;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 117;
//
// gridColumn9
//
this.gridColumn9.Caption = "鎶曟枡鍗曞彿";
this.gridColumn9.FieldName = "tldh";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 4;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "浠撳簱缂栧彿";
this.bandedGridColumn1.FieldName = "depotCode";
+ this.bandedGridColumn1.MinWidth = 25;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.VisibleIndex = 8;
- this.bandedGridColumn1.Width = 100;
+ this.bandedGridColumn1.Width = 125;
//
// gv_depotsId
//
this.gv_depotsId.AppearanceCell.Options.UseFont = true;
this.gv_depotsId.Caption = "浠撳簱鍚嶇О";
this.gv_depotsId.FieldName = "depotName";
+ this.gv_depotsId.MinWidth = 25;
this.gv_depotsId.Name = "gv_depotsId";
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
this.gv_depotsId.VisibleIndex = 7;
- this.gv_depotsId.Width = 100;
+ this.gv_depotsId.Width = 125;
//
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn2.FieldName = "rkOrg";
+ this.bandedGridColumn2.MinWidth = 25;
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.Tag = "org.fnamber";
this.bandedGridColumn2.Visible = true;
this.bandedGridColumn2.VisibleIndex = 15;
- this.bandedGridColumn2.Width = 250;
+ this.bandedGridColumn2.Width = 312;
//
// bandedGridColumn3
//
this.bandedGridColumn3.Caption = "鐢熶骇缁勭粐";
this.bandedGridColumn3.FieldName = "scOrg";
- this.bandedGridColumn3.MinWidth = 25;
+ this.bandedGridColumn3.MinWidth = 31;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Visible = true;
this.bandedGridColumn3.VisibleIndex = 16;
- this.bandedGridColumn3.Width = 94;
+ this.bandedGridColumn3.Width = 117;
//
// bandedGridColumn4
//
this.bandedGridColumn4.Caption = "鐗╂枡缂栫爜";
this.bandedGridColumn4.FieldName = "itemNo";
- this.bandedGridColumn4.MinWidth = 25;
+ this.bandedGridColumn4.MinWidth = 31;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Visible = true;
this.bandedGridColumn4.VisibleIndex = 5;
- this.bandedGridColumn4.Width = 94;
+ this.bandedGridColumn4.Width = 117;
//
// bandedGridColumn5
//
this.bandedGridColumn5.Caption = "鐗╂枡鍚嶇О";
this.bandedGridColumn5.FieldName = "itemName";
- this.bandedGridColumn5.MinWidth = 25;
+ this.bandedGridColumn5.MinWidth = 31;
this.bandedGridColumn5.Name = "bandedGridColumn5";
this.bandedGridColumn5.Visible = true;
this.bandedGridColumn5.VisibleIndex = 6;
- this.bandedGridColumn5.Width = 94;
+ this.bandedGridColumn5.Width = 117;
//
// bandedGridColumn6
//
this.bandedGridColumn6.Caption = "瑙勬牸鍨嬪彿";
this.bandedGridColumn6.FieldName = "itemModel";
- this.bandedGridColumn6.MinWidth = 25;
+ this.bandedGridColumn6.MinWidth = 31;
this.bandedGridColumn6.Name = "bandedGridColumn6";
this.bandedGridColumn6.Visible = true;
this.bandedGridColumn6.VisibleIndex = 17;
- this.bandedGridColumn6.Width = 94;
+ this.bandedGridColumn6.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍏ュ簱绫诲瀷";
this.gridColumn7.FieldName = "inType";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 18;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 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(1467, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1834, 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(1467, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1834, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -544,6 +562,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
@@ -556,15 +575,15 @@
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(1467, 570);
- this.splitMx1.SplitterPosition = 172;
+ this.splitMx1.Size = new System.Drawing.Size(1834, 698);
+ this.splitMx1.SplitterPosition = 210;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_dptName);
- this.layoutMx1.Controls.Add(this.txt_fcheckUser);
+ this.layoutMx1.Controls.Add(this.txt_checkUserName);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_itemNo);
@@ -573,7 +592,7 @@
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_rkOrg);
- 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_depotName);
this.layoutMx1.Controls.Add(this.txt_cbillNo);
@@ -586,187 +605,230 @@
this.layoutControlItem17,
this.layoutControlItem18});
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(486, 477, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1467, 172);
+ this.layoutMx1.Size = new System.Drawing.Size(1834, 210);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1097, 102);
+ this.lbGuid.Location = new System.Drawing.Point(1371, 125);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(358, 26);
+ this.lbGuid.Size = new System.Drawing.Size(448, 32);
this.lbGuid.TabIndex = 607;
this.lbGuid.Text = "lbGuid";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(807, 42);
+ this.txt_dptName.Location = new System.Drawing.Point(1005, 51);
+ this.txt_dptName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(286, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(361, 28);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 605;
this.txt_dptName.Tag = "readonly";
//
- // txt_fcheckUser
+ // txt_checkUserName
//
- this.txt_fcheckUser.Location = new System.Drawing.Point(1169, 72);
- this.txt_fcheckUser.Name = "txt_fcheckUser";
- this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckUser.Size = new System.Drawing.Size(286, 24);
- this.txt_fcheckUser.StyleController = this.layoutMx1;
- this.txt_fcheckUser.TabIndex = 595;
+ this.txt_checkUserName.Location = new System.Drawing.Point(1457, 88);
+ 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(363, 28);
+ this.txt_checkUserName.StyleController = this.layoutMx1;
+ this.txt_checkUserName.TabIndex = 595;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1169, 102);
+ this.txt_checkDate.Location = new System.Drawing.Point(1457, 125);
+ 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(286, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(363, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 587;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 102);
+ this.txt_itemName.Location = new System.Drawing.Point(101, 125);
+ 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(285, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(361, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 599;
this.txt_itemName.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(445, 102);
+ this.txt_itemNo.Location = new System.Drawing.Point(553, 125);
+ 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(286, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(361, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 597;
this.txt_itemNo.Tag = "readonly";
//
// txt_scOrg
//
- this.txt_scOrg.Location = new System.Drawing.Point(807, 12);
+ this.txt_scOrg.Location = new System.Drawing.Point(1005, 14);
+ this.txt_scOrg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_scOrg.Name = "txt_scOrg";
this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_scOrg.Size = new System.Drawing.Size(286, 24);
+ this.txt_scOrg.Size = new System.Drawing.Size(361, 28);
this.txt_scOrg.StyleController = this.layoutMx1;
this.txt_scOrg.TabIndex = 603;
this.txt_scOrg.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(84, 132);
+ this.txt_remark.Location = new System.Drawing.Point(101, 162);
+ 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(647, 24);
+ this.txt_remark.Size = new System.Drawing.Size(813, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(445, 72);
+ this.txt_itemModel.Location = new System.Drawing.Point(553, 88);
+ 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(286, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(361, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 601;
this.txt_itemModel.Tag = "readonly";
//
// 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(285, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(361, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_rkOrg
//
- this.txt_rkOrg.Location = new System.Drawing.Point(445, 12);
+ this.txt_rkOrg.Location = new System.Drawing.Point(553, 14);
+ this.txt_rkOrg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_rkOrg.Name = "txt_rkOrg";
this.txt_rkOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_rkOrg.Size = new System.Drawing.Size(286, 24);
+ this.txt_rkOrg.Size = new System.Drawing.Size(361, 28);
this.txt_rkOrg.StyleController = this.layoutMx1;
this.txt_rkOrg.TabIndex = 592;
this.txt_rkOrg.Tag = "readonly";
//
- // txt_createBy
+ // txt_createbyName
//
- this.txt_createBy.Location = new System.Drawing.Point(1169, 12);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(286, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 219;
+ this.txt_createbyName.Location = new System.Drawing.Point(1457, 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(363, 28);
+ this.txt_createbyName.StyleController = this.layoutMx1;
+ this.txt_createbyName.TabIndex = 219;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1169, 42);
+ this.txt_createDate.Location = new System.Drawing.Point(1457, 51);
+ 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(286, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(363, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 222;
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(807, 72);
+ this.txt_depotName.Location = new System.Drawing.Point(1005, 88);
+ 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(286, 24);
+ this.txt_depotName.Size = new System.Drawing.Size(361, 28);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 593;
this.txt_depotName.Tag = "readonly";
//
// txt_cbillNo
//
- this.txt_cbillNo.Location = new System.Drawing.Point(84, 42);
+ this.txt_cbillNo.Location = new System.Drawing.Point(101, 51);
+ this.txt_cbillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_cbillNo.Name = "txt_cbillNo";
this.txt_cbillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_cbillNo.Size = new System.Drawing.Size(285, 24);
+ this.txt_cbillNo.Size = new System.Drawing.Size(361, 28);
this.txt_cbillNo.StyleController = this.layoutMx1;
this.txt_cbillNo.TabIndex = 507;
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(84, 72);
+ this.txt_workNo.Location = new System.Drawing.Point(101, 88);
+ 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(285, 24);
+ this.txt_workNo.Size = new System.Drawing.Size(361, 28);
this.txt_workNo.StyleController = this.layoutMx1;
this.txt_workNo.TabIndex = 243;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(1097, 132);
+ this.txt_fstatus.Location = new System.Drawing.Point(1370, 162);
+ this.txt_fstatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(358, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(450, 27);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 606;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1169, 132);
+ this.txt_guid.Location = new System.Drawing.Point(1461, 161);
+ 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(286, 24);
+ this.txt_guid.Size = new System.Drawing.Size(358, 28);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 608;
//
// txt_tldh
//
- this.txt_tldh.Location = new System.Drawing.Point(445, 42);
+ this.txt_tldh.Location = new System.Drawing.Point(553, 51);
+ this.txt_tldh.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_tldh.Name = "txt_tldh";
- this.txt_tldh.Size = new System.Drawing.Size(286, 24);
+ this.txt_tldh.Size = new System.Drawing.Size(361, 28);
this.txt_tldh.StyleController = this.layoutMx1;
this.txt_tldh.TabIndex = 609;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lbGuid;
+ this.layoutControlItem17.Location = new System.Drawing.Point(1085, 90);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem17.Text = "lbGuid";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_guid;
+ this.layoutControlItem18.Location = new System.Drawing.Point(1085, 120);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.Size = new System.Drawing.Size(362, 32);
+ this.layoutControlItem18.Text = "涓婚敭Guid";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 22);
//
// Root
//
@@ -792,36 +854,36 @@
this.layoutControlItem6});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1467, 172);
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15});
+ this.Root.Size = new System.Drawing.Size(1834, 210);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -829,113 +891,189 @@
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(361, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(452, 37);
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_rkOrg;
- this.layoutControlItem2.Location = new System.Drawing.Point(361, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(452, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(452, 37);
this.layoutControlItem2.Text = "鍏ュ簱缁勭粐";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_depotName;
- this.layoutControlItem5.Location = new System.Drawing.Point(723, 60);
+ this.layoutControlItem5.Location = new System.Drawing.Point(904, 74);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(452, 37);
this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_cbillNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 37);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(361, 30);
+ this.layoutControlItem7.Size = new System.Drawing.Size(452, 37);
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_workNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 74);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(361, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(452, 37);
this.layoutControlItem9.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemName;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 90);
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 111);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(361, 30);
+ this.layoutControlItem11.Size = new System.Drawing.Size(452, 37);
this.layoutControlItem11.Text = "浜у搧缂栫爜";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemNo;
- this.layoutControlItem12.Location = new System.Drawing.Point(361, 90);
+ this.layoutControlItem12.Location = new System.Drawing.Point(452, 111);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(362, 30);
+ this.layoutControlItem12.Size = new System.Drawing.Size(452, 37);
this.layoutControlItem12.Text = "浜у搧鍚嶇О";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_remark;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 120);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 148);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(723, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(904, 38);
this.layoutControlItem13.Text = "澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
- // layoutControlItem17
+ // layoutControlItem16
//
- this.layoutControlItem17.Control = this.lbGuid;
- this.layoutControlItem17.Location = new System.Drawing.Point(1085, 90);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem17.Text = "lbGuid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
+ this.layoutControlItem16.Control = this.txt_fstatus;
+ this.layoutControlItem16.Location = new System.Drawing.Point(1356, 148);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem16.Size = new System.Drawing.Size(454, 38);
+ this.layoutControlItem16.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
//
- // layoutControlItem18
+ // layoutControlItem15
//
- this.layoutControlItem18.Control = this.txt_guid;
- this.layoutControlItem18.Location = new System.Drawing.Point(1085, 120);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(362, 32);
- this.layoutControlItem18.Text = "涓婚敭Guid";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.Control = this.txt_checkDate;
+ this.layoutControlItem15.Location = new System.Drawing.Point(1356, 111);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(454, 37);
+ this.layoutControlItem15.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_checkUserName;
+ this.layoutControlItem14.Location = new System.Drawing.Point(1356, 74);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(454, 37);
+ this.layoutControlItem14.Text = "瀹℃牳浜�";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_createbyName;
+ this.layoutControlItem3.Location = new System.Drawing.Point(1356, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(454, 37);
+ this.layoutControlItem3.Text = "鍒涘缓浜�";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_createDate;
+ this.layoutControlItem4.Location = new System.Drawing.Point(1356, 37);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(454, 37);
+ this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_scOrg;
+ this.layoutControlItem8.Location = new System.Drawing.Point(904, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(452, 37);
+ this.layoutControlItem8.Text = "鐢熶骇缁勭粐";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_tldh;
+ this.layoutControlItem19.Location = new System.Drawing.Point(452, 37);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(452, 37);
+ this.layoutControlItem19.Text = "鎶曟枡鍗曞彿";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_dptName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(904, 37);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(452, 37);
+ this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_itemModel;
+ this.layoutControlItem6.Location = new System.Drawing.Point(452, 74);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(452, 37);
+ this.layoutControlItem6.Text = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 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.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1467, 386);
+ this.tabMx.Size = new System.Drawing.Size(1834, 473);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -944,17 +1082,20 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx1);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1465, 354);
+ this.tabMxPage2.Size = new System.Drawing.Size(1832, 435);
this.tabMxPage2.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(1465, 354);
+ this.gcMx1.Size = new System.Drawing.Size(1832, 435);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -970,6 +1111,7 @@
this.gvMx2unit,
this.gridColumn5,
this.gridColumn6});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -980,87 +1122,95 @@
//
this.gridColumn2.Caption = "鐗╂枡缂栧彿";
this.gridColumn2.FieldName = "itemNo";
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gvMx2itemSname
//
this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx2itemSname.FieldName = "itemName";
+ this.gvMx2itemSname.MinWidth = 25;
this.gvMx2itemSname.Name = "gvMx2itemSname";
this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx2itemSname.Visible = true;
this.gvMx2itemSname.VisibleIndex = 1;
- this.gvMx2itemSname.Width = 94;
+ this.gvMx2itemSname.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
this.gridColumn1.FieldName = "itemModel";
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gvMx2quantity
//
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
this.gvMx2quantity.Caption = "鏁伴噺";
this.gvMx2quantity.FieldName = "quantity";
+ this.gvMx2quantity.MinWidth = 25;
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 = 25;
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 = "createUserName1";
+ 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;
//
// 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(1344, 354);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1832, 435);
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(1344, 354);
+ this.gcMx2.Size = new System.Drawing.Size(1832, 435);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1079,6 +1229,7 @@
this.gvMx1depotCode,
this.gridColumn3,
this.gridColumn4});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1090,226 +1241,138 @@
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
+ this.gvMx1itemBarcode.MinWidth = 25;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 0;
- this.gvMx1itemBarcode.Width = 250;
+ this.gvMx1itemBarcode.Width = 312;
//
// gvMx1cItemCode
//
this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
this.gvMx1cItemCode.FieldName = "itemNo";
+ this.gvMx1cItemCode.MinWidth = 25;
this.gvMx1cItemCode.Name = "gvMx1cItemCode";
this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
this.gvMx1cItemCode.Visible = true;
this.gvMx1cItemCode.VisibleIndex = 1;
- this.gvMx1cItemCode.Width = 100;
+ this.gvMx1cItemCode.Width = 125;
//
// gvMx1itemSname
//
this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx1itemSname.FieldName = "itemName";
+ this.gvMx1itemSname.MinWidth = 25;
this.gvMx1itemSname.Name = "gvMx1itemSname";
this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx1itemSname.Visible = true;
this.gvMx1itemSname.VisibleIndex = 2;
- this.gvMx1itemSname.Width = 250;
+ this.gvMx1itemSname.Width = 312;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
this.gvMx1itemNo.FieldName = "itemModel";
+ this.gvMx1itemNo.MinWidth = 25;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 3;
- this.gvMx1itemNo.Width = 250;
+ this.gvMx1itemNo.Width = 312;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
+ this.gvMx1quantity.MinWidth = 25;
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 = 25;
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;
//
// gvMx1depotSectionCode
//
this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
+ this.gvMx1depotSectionCode.MinWidth = 25;
this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx1depotSectionCode.Visible = true;
this.gvMx1depotSectionCode.VisibleIndex = 6;
- this.gvMx1depotSectionCode.Width = 94;
+ this.gvMx1depotSectionCode.Width = 117;
//
// gvMx1depotCode
//
this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
this.gvMx1depotCode.FieldName = "depotCode";
+ this.gvMx1depotCode.MinWidth = 25;
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
this.gvMx1depotCode.VisibleIndex = 7;
- this.gvMx1depotCode.Width = 94;
+ this.gvMx1depotCode.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "寤虹珛鑰�";
- this.gridColumn3.FieldName = "createBy";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.FieldName = "createUserName2";
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 8;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "寤虹珛鏃堕棿";
this.gridColumn4.FieldName = "createDate";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 9;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.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 = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_fstatus;
- this.layoutControlItem16.Location = new System.Drawing.Point(1085, 120);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(362, 32);
- this.layoutControlItem16.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_checkDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(1085, 90);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem15.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_fcheckUser;
- this.layoutControlItem14.Location = new System.Drawing.Point(1085, 60);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem14.Text = "瀹℃牳浜�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(1085, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem3.Text = "鍒涘缓浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_createDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(1085, 30);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_scOrg;
- this.layoutControlItem8.Location = new System.Drawing.Point(723, 0);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem8.Text = "鐢熶骇缁勭粐";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_tldh;
- this.layoutControlItem19.Location = new System.Drawing.Point(361, 30);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem19.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_dptName;
- this.layoutControlItem10.Location = new System.Drawing.Point(723, 30);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(361, 60);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(362, 30);
- this.layoutControlItem6.Text = "瑙勬牸鍨嬪彿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
// Frm_MesScrkDj
//
- 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(1469, 682);
+ this.ClientSize = new System.Drawing.Size(1836, 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_MesScrkDj";
this.Text = "浜у搧鍏ュ簱鍗�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1332,7 +1395,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
@@ -1341,7 +1404,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_rkOrg.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_depotName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).EndInit();
@@ -1349,6 +1412,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tldh.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1358,17 +1423,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.tabMxPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- this.xtraTabPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -1378,6 +1432,15 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ this.xtraTabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1396,7 +1459,7 @@
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
- private DevExpress.XtraEditors.TextEdit txt_fcheckUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkUserName;
private DevExpress.XtraEditors.TextEdit txt_depotName;
private DevExpress.XtraEditors.TextEdit txt_rkOrg;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
@@ -1404,7 +1467,7 @@
private DevExpress.XtraEditors.TextEdit txt_workNo;
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_billNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
@@ -1446,11 +1509,11 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_creatByName;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateByName;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkUserName;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_taskNo;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index 129fa5d..479d75a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -48,16 +48,17 @@
this.gv_documentStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_documentType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_businessType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.bandedGridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.createUserName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaseDept = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvcol6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.fcheckByUserName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -68,7 +69,7 @@
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo2 = 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_kbSl = new DevExpress.XtraEditors.TextEdit();
this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
@@ -78,7 +79,7 @@
this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
this.txt_msg = new DevExpress.XtraEditors.TextEdit();
this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
- this.txt_fgCheckBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fgCheckByName = new DevExpress.XtraEditors.TextEdit();
this.txt_fgCheckDatet = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -136,7 +137,6 @@
this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn19 = 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_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo2.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_kbSl.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
@@ -170,7 +170,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -214,9 +214,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_rohin{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1365, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1706, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = "xlsOut_rohin{}";
@@ -224,10 +225,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1365, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1706, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -236,8 +238,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1363, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1704, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -246,6 +249,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -258,17 +262,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1363, 570);
+ this.split1.Size = new System.Drawing.Size(1704, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1363, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1704, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -279,25 +285,26 @@
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 = 30;
+ this.gridView1.ColumnPanelRowHeight = 37;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_billNo,
this.gv_documentStatus,
this.gv_documentType,
this.gv_businessType,
- this.bandedGridColumn1,
+ this.createUserName,
this.gv_closeStatus,
this.bandedGridColumn2,
this.gv_purchaseDept,
this.gv_purchaser,
this.gvcol6,
this.gridColumn10,
- this.gridColumn11,
+ this.fcheckByUserName,
this.gridColumn13,
this.gridColumn18,
this.gridColumn19});
+ 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.AllowHtmlDrawHeaders = true;
@@ -309,179 +316,190 @@
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "妫�楠屽崟鍙�";
this.gv_billNo.FieldName = "releaseNo";
- 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 = 120;
+ this.gv_billNo.Width = 150;
//
// gv_documentStatus
//
this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
this.gv_documentStatus.Caption = "浜у搧缂栫爜";
this.gv_documentStatus.FieldName = "itemNo2";
- this.gv_documentStatus.MinWidth = 25;
+ this.gv_documentStatus.MinWidth = 31;
this.gv_documentStatus.Name = "gv_documentStatus";
this.gv_documentStatus.OptionsColumn.AllowEdit = false;
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
this.gv_documentStatus.VisibleIndex = 3;
- this.gv_documentStatus.Width = 70;
+ this.gv_documentStatus.Width = 87;
//
// gv_documentType
//
this.gv_documentType.AppearanceCell.Options.UseFont = true;
this.gv_documentType.Caption = "杩斿伐宸ュ簭";
this.gv_documentType.FieldName = "fggx";
- this.gv_documentType.MinWidth = 25;
+ this.gv_documentType.MinWidth = 31;
this.gv_documentType.Name = "gv_documentType";
this.gv_documentType.OptionsColumn.AllowEdit = false;
this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE";
this.gv_documentType.Visible = true;
this.gv_documentType.VisibleIndex = 4;
- this.gv_documentType.Width = 80;
+ this.gv_documentType.Width = 100;
//
// gv_businessType
//
this.gv_businessType.AppearanceCell.Options.UseFont = true;
this.gv_businessType.Caption = "寮�鍗曟棩鏈�";
this.gv_businessType.FieldName = "createDate";
- this.gv_businessType.MinWidth = 25;
+ this.gv_businessType.MinWidth = 31;
this.gv_businessType.Name = "gv_businessType";
this.gv_businessType.OptionsColumn.AllowEdit = false;
this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
this.gv_businessType.Visible = true;
this.gv_businessType.VisibleIndex = 8;
- this.gv_businessType.Width = 80;
+ this.gv_businessType.Width = 100;
//
- // bandedGridColumn1
+ // createUserName
//
- this.bandedGridColumn1.Caption = "寮�鍗曚汉";
- this.bandedGridColumn1.FieldName = "createBy";
- this.bandedGridColumn1.MinWidth = 25;
- this.bandedGridColumn1.Name = "bandedGridColumn1";
- this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
- this.bandedGridColumn1.Tag = "query_a.suppName";
- this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 7;
- this.bandedGridColumn1.Width = 134;
+ this.createUserName.Caption = "寮�鍗曚汉";
+ this.createUserName.FieldName = "createUserName";
+ this.createUserName.MinWidth = 31;
+ this.createUserName.Name = "createUserName";
+ this.createUserName.OptionsColumn.AllowEdit = false;
+ this.createUserName.Tag = "createUserName";
+ this.createUserName.Visible = true;
+ this.createUserName.VisibleIndex = 7;
+ this.createUserName.Width = 167;
//
// gv_closeStatus
//
this.gv_closeStatus.AppearanceCell.Options.UseFont = true;
this.gv_closeStatus.Caption = "杩斿伐鏁伴噺";
this.gv_closeStatus.FieldName = "fbatchQty";
- this.gv_closeStatus.MinWidth = 25;
+ this.gv_closeStatus.MinWidth = 31;
this.gv_closeStatus.Name = "gv_closeStatus";
this.gv_closeStatus.OptionsColumn.AllowEdit = false;
this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS";
this.gv_closeStatus.Visible = true;
this.gv_closeStatus.VisibleIndex = 9;
- this.gv_closeStatus.Width = 80;
+ this.gv_closeStatus.Width = 100;
//
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "鐢熸垚鏉＄爜鏁�";
this.bandedGridColumn2.FieldName = "departmentname";
- this.bandedGridColumn2.MinWidth = 25;
+ this.bandedGridColumn2.MinWidth = 31;
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.OptionsColumn.AllowEdit = false;
this.bandedGridColumn2.Tag = "query_a.departmentname";
- this.bandedGridColumn2.Width = 80;
+ this.bandedGridColumn2.Width = 100;
//
// gv_purchaseDept
//
this.gv_purchaseDept.AppearanceCell.Options.UseFont = true;
this.gv_purchaseDept.Caption = "浜у搧鍚嶇О";
this.gv_purchaseDept.FieldName = "itemName";
- this.gv_purchaseDept.MinWidth = 25;
+ this.gv_purchaseDept.MinWidth = 31;
this.gv_purchaseDept.Name = "gv_purchaseDept";
this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
this.gv_purchaseDept.Visible = true;
this.gv_purchaseDept.VisibleIndex = 10;
- this.gv_purchaseDept.Width = 50;
+ this.gv_purchaseDept.Width = 62;
//
// gv_purchaser
//
this.gv_purchaser.AppearanceCell.Options.UseFont = true;
this.gv_purchaser.Caption = "浜у搧瑙勬牸";
this.gv_purchaser.FieldName = "itemModel";
- this.gv_purchaser.MinWidth = 25;
+ this.gv_purchaser.MinWidth = 31;
this.gv_purchaser.Name = "gv_purchaser";
this.gv_purchaser.OptionsColumn.AllowEdit = false;
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
this.gv_purchaser.VisibleIndex = 11;
- this.gv_purchaser.Width = 60;
//
// gvcol6
//
this.gvcol6.Caption = "涓婚敭GUID";
this.gvcol6.FieldName = "guid";
- this.gvcol6.MinWidth = 25;
+ this.gvcol6.MinWidth = 31;
this.gvcol6.Name = "gvcol6";
- this.gvcol6.Width = 94;
+ this.gvcol6.Width = 117;
//
// gridColumn10
//
this.gridColumn10.Caption = "瀹℃牳鐘舵��";
this.gridColumn10.FieldName = "fgCheckStatusChk";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 0;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 117;
//
- // gridColumn11
+ // fcheckByUserName
//
- this.gridColumn11.Caption = "瀹℃牳浜�";
- this.gridColumn11.FieldName = "fgCheckBy";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 5;
- this.gridColumn11.Width = 94;
+ this.fcheckByUserName.Caption = "瀹℃牳浜�";
+ this.fcheckByUserName.FieldName = "fcheckByUserName";
+ this.fcheckByUserName.MinWidth = 31;
+ this.fcheckByUserName.Name = "fcheckByUserName";
+ this.fcheckByUserName.Tag = "fcheckByUserName";
+ this.fcheckByUserName.Visible = true;
+ this.fcheckByUserName.VisibleIndex = 5;
+ this.fcheckByUserName.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "瀹℃牳鏃堕棿";
this.gridColumn13.FieldName = "fgCheckDatet";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 6;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gridColumn18
//
this.gridColumn18.Caption = "宸ュ崟鍗曞彿";
this.gridColumn18.FieldName = "daa001";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 2;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn19.FieldName = "fSubsidiary";
+ this.gridColumn19.MinWidth = 31;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 12;
+ this.gridColumn19.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(1363, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1704, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1363, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1704, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -489,6 +507,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -501,8 +520,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(1363, 570);
- this.splitMx1.SplitterPosition = 150;
+ this.splitMx1.Size = new System.Drawing.Size(1704, 698);
+ this.splitMx1.SplitterPosition = 183;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -513,7 +532,7 @@
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_itemNo2);
- 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_kbSl);
this.layoutMx1.Controls.Add(this.txt_fmrmode);
@@ -523,7 +542,7 @@
this.layoutMx1.Controls.Add(this.txt_daa001);
this.layoutMx1.Controls.Add(this.txt_msg);
this.layoutMx1.Controls.Add(this.txt_fngHandle);
- this.layoutMx1.Controls.Add(this.txt_fgCheckBy);
+ this.layoutMx1.Controls.Add(this.txt_fgCheckByName);
this.layoutMx1.Controls.Add(this.txt_fgCheckDatet);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -531,10 +550,11 @@
this.layoutControlItem4,
this.txt_daa00111111});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(239, 530, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1363, 150);
+ this.layoutMx1.Size = new System.Drawing.Size(1704, 183);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -542,147 +562,164 @@
//
this.ucBtnPrint98.allClickKey = null;
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(347, 111);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(433, 134);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(332, 29);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(417, 37);
this.ucBtnPrint98.TabIndex = 9;
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(672, 12);
+ this.lbGuid.Location = new System.Drawing.Point(840, 15);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(326, 25);
+ this.lbGuid.Size = new System.Drawing.Size(408, 31);
this.lbGuid.TabIndex = 230;
this.lbGuid.Text = "lbGuid";
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(99, 12);
+ this.txt_releaseNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(244, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(315, 28);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(759, 12);
+ this.txt_guid.Location = new System.Drawing.Point(949, 15);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(4);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(239, 24);
+ this.txt_guid.Size = new System.Drawing.Size(299, 28);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 229;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(770, 12);
+ this.txt_itemName.Location = new System.Drawing.Point(956, 12);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(315, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 231;
//
// txt_itemNo2
//
- this.txt_itemNo2.Location = new System.Drawing.Point(434, 12);
+ this.txt_itemNo2.Location = new System.Drawing.Point(535, 12);
+ this.txt_itemNo2.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemNo2.Name = "txt_itemNo2";
- this.txt_itemNo2.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemNo2.Size = new System.Drawing.Size(315, 28);
this.txt_itemNo2.StyleController = this.layoutMx1;
this.txt_itemNo2.TabIndex = 232;
//
- // txt_createBy
+ // txt_createByName
//
- this.txt_createBy.Location = new System.Drawing.Point(770, 45);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(245, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 233;
+ this.txt_createByName.Location = new System.Drawing.Point(956, 52);
+ this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createByName.Name = "txt_createByName";
+ this.txt_createByName.Size = new System.Drawing.Size(315, 28);
+ this.txt_createByName.StyleController = this.layoutMx1;
+ this.txt_createByName.TabIndex = 233;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1106, 45);
+ this.txt_createDate.Location = new System.Drawing.Point(1377, 52);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(245, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(315, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 234;
//
// txt_kbSl
//
- this.txt_kbSl.Location = new System.Drawing.Point(99, 45);
+ this.txt_kbSl.Location = new System.Drawing.Point(114, 52);
+ this.txt_kbSl.Margin = new System.Windows.Forms.Padding(4);
this.txt_kbSl.Name = "txt_kbSl";
- this.txt_kbSl.Size = new System.Drawing.Size(244, 24);
+ this.txt_kbSl.Size = new System.Drawing.Size(315, 28);
this.txt_kbSl.StyleController = this.layoutMx1;
this.txt_kbSl.TabIndex = 236;
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(99, 111);
+ this.txt_fmrmode.Location = new System.Drawing.Point(114, 134);
+ this.txt_fmrmode.Margin = new System.Windows.Forms.Padding(4);
this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Size = new System.Drawing.Size(244, 24);
+ this.txt_fmrmode.Size = new System.Drawing.Size(315, 28);
this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 237;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(1106, 12);
+ this.txt_itemModel.Location = new System.Drawing.Point(1377, 12);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(315, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 238;
//
// txt_aboutGuid
//
- this.txt_aboutGuid.Location = new System.Drawing.Point(770, 80);
+ this.txt_aboutGuid.Location = new System.Drawing.Point(962, 98);
+ this.txt_aboutGuid.Margin = new System.Windows.Forms.Padding(4);
this.txt_aboutGuid.Name = "txt_aboutGuid";
- this.txt_aboutGuid.Size = new System.Drawing.Size(245, 24);
+ this.txt_aboutGuid.Size = new System.Drawing.Size(306, 28);
this.txt_aboutGuid.StyleController = this.layoutMx1;
this.txt_aboutGuid.TabIndex = 243;
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(434, 45);
+ this.txt_lineName.Location = new System.Drawing.Point(535, 52);
+ this.txt_lineName.Margin = new System.Windows.Forms.Padding(4);
this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(245, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(315, 28);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 244;
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(99, 78);
+ this.txt_daa001.Location = new System.Drawing.Point(114, 93);
+ this.txt_daa001.Margin = new System.Windows.Forms.Padding(4);
this.txt_daa001.Name = "txt_daa001";
- this.txt_daa001.Size = new System.Drawing.Size(244, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(315, 28);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 245;
//
// txt_msg
//
- this.txt_msg.Location = new System.Drawing.Point(770, 111);
+ this.txt_msg.Location = new System.Drawing.Point(956, 134);
+ this.txt_msg.Margin = new System.Windows.Forms.Padding(4);
this.txt_msg.Name = "txt_msg";
- this.txt_msg.Size = new System.Drawing.Size(581, 24);
+ this.txt_msg.Size = new System.Drawing.Size(736, 28);
this.txt_msg.StyleController = this.layoutMx1;
this.txt_msg.TabIndex = 246;
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(434, 78);
+ this.txt_fngHandle.Location = new System.Drawing.Point(535, 93);
+ this.txt_fngHandle.Margin = new System.Windows.Forms.Padding(4);
this.txt_fngHandle.Name = "txt_fngHandle";
- this.txt_fngHandle.Size = new System.Drawing.Size(245, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(315, 28);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 247;
//
- // txt_fgCheckBy
+ // txt_fgCheckByName
//
- this.txt_fgCheckBy.Location = new System.Drawing.Point(770, 78);
- this.txt_fgCheckBy.Name = "txt_fgCheckBy";
- this.txt_fgCheckBy.Size = new System.Drawing.Size(245, 24);
- this.txt_fgCheckBy.StyleController = this.layoutMx1;
- this.txt_fgCheckBy.TabIndex = 248;
+ this.txt_fgCheckByName.Location = new System.Drawing.Point(956, 93);
+ this.txt_fgCheckByName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fgCheckByName.Name = "txt_fgCheckByName";
+ this.txt_fgCheckByName.Size = new System.Drawing.Size(315, 28);
+ this.txt_fgCheckByName.StyleController = this.layoutMx1;
+ this.txt_fgCheckByName.TabIndex = 248;
//
// txt_fgCheckDatet
//
- this.txt_fgCheckDatet.Location = new System.Drawing.Point(1106, 78);
+ this.txt_fgCheckDatet.Location = new System.Drawing.Point(1377, 93);
+ this.txt_fgCheckDatet.Margin = new System.Windows.Forms.Padding(4);
this.txt_fgCheckDatet.Name = "txt_fgCheckDatet";
- this.txt_fgCheckDatet.Size = new System.Drawing.Size(245, 24);
+ this.txt_fgCheckDatet.Size = new System.Drawing.Size(315, 28);
this.txt_fgCheckDatet.StyleController = this.layoutMx1;
this.txt_fgCheckDatet.TabIndex = 249;
//
@@ -705,7 +742,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem4.Text = "涓婚敭GUID";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(62, 24);
//
// txt_daa00111111
//
@@ -716,7 +753,7 @@
this.txt_daa00111111.OptionsTableLayoutItem.RowIndex = 2;
this.txt_daa00111111.Size = new System.Drawing.Size(336, 34);
this.txt_daa00111111.Text = "宸ュ崟Guid";
- this.txt_daa00111111.TextSize = new System.Drawing.Size(75, 18);
+ this.txt_daa00111111.TextSize = new System.Drawing.Size(94, 22);
//
// Root
//
@@ -766,7 +803,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1363, 152);
+ this.Root.Size = new System.Drawing.Size(1704, 183);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -774,122 +811,122 @@
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(335, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(421, 40);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo2;
- this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(421, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(421, 40);
this.layoutControlItem5.Text = "浜у搧缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemName;
- this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(842, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(421, 40);
this.layoutControlItem2.Text = "浜у搧鍚嶇О";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_createBy;
- this.layoutControlItem6.Location = new System.Drawing.Point(671, 33);
+ this.layoutControlItem6.Control = this.txt_createByName;
+ this.layoutControlItem6.Location = new System.Drawing.Point(842, 40);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem6.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem6.Text = "寮�鍗曚汉鍛�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_kbSl;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 33);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 40);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 33);
+ this.layoutControlItem9.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem9.Text = "闇�杩斿伐鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(1007, 33);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1263, 40);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem7.Text = "寮�鍗曟棩鏈�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1263, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem11.Size = new System.Drawing.Size(421, 40);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_lineName;
- this.layoutControlItem12.Location = new System.Drawing.Point(335, 33);
+ this.layoutControlItem12.Location = new System.Drawing.Point(421, 40);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem12.Text = "浜х嚎";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_fngHandle;
- this.layoutControlItem17.Location = new System.Drawing.Point(335, 66);
+ this.layoutControlItem17.Location = new System.Drawing.Point(421, 81);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem17.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem17.Text = "澶勭疆缁撴灉";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_daa001;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 81);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(335, 33);
+ this.layoutControlItem15.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem15.Text = "宸ュ崟鍗曞彿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fmrmode;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 122);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(335, 33);
+ this.layoutControlItem10.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.ucBtnPrint98;
- this.layoutControlItem13.Location = new System.Drawing.Point(335, 99);
+ this.layoutControlItem13.Location = new System.Drawing.Point(421, 122);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem13.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem13.Text = "纭畾鎵撳嵃";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
@@ -897,44 +934,45 @@
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_msg;
- this.layoutControlItem16.Location = new System.Drawing.Point(671, 99);
+ this.layoutControlItem16.Location = new System.Drawing.Point(842, 122);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(672, 33);
+ this.layoutControlItem16.Size = new System.Drawing.Size(842, 41);
this.layoutControlItem16.Text = "杩濊绫诲埆";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem8
//
- this.layoutControlItem8.Control = this.txt_fgCheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(671, 66);
+ this.layoutControlItem8.Control = this.txt_fgCheckByName;
+ this.layoutControlItem8.Location = new System.Drawing.Point(842, 81);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem8.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fgCheckDatet;
- this.layoutControlItem14.Location = new System.Drawing.Point(1007, 66);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1263, 81);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem14.Size = new System.Drawing.Size(421, 41);
this.layoutControlItem14.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 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);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1363, 408);
+ this.tabMx.Size = new System.Drawing.Size(1704, 500);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -944,17 +982,20 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1361, 376);
+ this.tabMxPage1.Size = new System.Drawing.Size(1702, 462);
this.tabMxPage1.Text = "鍗℃澘鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1361, 376);
+ this.gcMx1.Size = new System.Drawing.Size(1702, 462);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -963,7 +1004,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 60;
+ this.gvMx1.ColumnPanelRowHeight = 73;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn3,
this.gvMx1itemId,
@@ -972,6 +1013,7 @@
this.gvMx1pricingQty,
this.gvMx1pricingUnit,
this.gvMx1purchaseQty});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -982,88 +1024,91 @@
//
this.gridColumn3.Caption = "鍗℃澘鏉＄爜";
this.gridColumn3.FieldName = "tbBarcode";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
- this.gridColumn3.Width = 115;
+ this.gridColumn3.Width = 144;
//
// gvMx1itemId
//
this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
this.gvMx1itemId.Caption = "鐗╂枡ID";
this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 25;
+ this.gvMx1itemId.MinWidth = 31;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.ITEM_ID";
- this.gvMx1itemId.Width = 100;
+ this.gvMx1itemId.Width = 125;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡缂栫爜";
this.gridColumn2.FieldName = "itemNo";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 46;
+ this.gridColumn2.Width = 57;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡鍚嶇О";
this.gridColumn1.FieldName = "itemName";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 55;
+ this.gridColumn1.Width = 69;
//
// gvMx1pricingQty
//
this.gvMx1pricingQty.AppearanceCell.Options.UseFont = true;
this.gvMx1pricingQty.Caption = "宸ュ崟鍙�";
this.gvMx1pricingQty.FieldName = "daa001";
- this.gvMx1pricingQty.MinWidth = 25;
+ this.gvMx1pricingQty.MinWidth = 31;
this.gvMx1pricingQty.Name = "gvMx1pricingQty";
this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
- this.gvMx1pricingQty.Width = 25;
+ this.gvMx1pricingQty.Width = 31;
//
// gvMx1pricingUnit
//
this.gvMx1pricingUnit.AppearanceCell.Options.UseFont = true;
this.gvMx1pricingUnit.Caption = "绾垮埆";
this.gvMx1pricingUnit.FieldName = "lineName";
- this.gvMx1pricingUnit.MinWidth = 25;
+ this.gvMx1pricingUnit.MinWidth = 31;
this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
- this.gvMx1pricingUnit.Width = 25;
+ this.gvMx1pricingUnit.Width = 31;
//
// gvMx1purchaseQty
//
this.gvMx1purchaseQty.AppearanceCell.Options.UseFont = true;
this.gvMx1purchaseQty.Caption = "鏁伴噺";
this.gvMx1purchaseQty.FieldName = "tmQty";
- this.gvMx1purchaseQty.MinWidth = 25;
+ this.gvMx1purchaseQty.MinWidth = 31;
this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
this.gvMx1purchaseQty.Visible = true;
this.gvMx1purchaseQty.VisibleIndex = 3;
- this.gvMx1purchaseQty.Width = 25;
+ this.gvMx1purchaseQty.Width = 31;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1361, 376);
+ this.tabMxPage2.Size = new System.Drawing.Size(1702, 462);
this.tabMxPage2.Text = "杩芥函鐮佹槑缁�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1361, 376);
+ this.gcMx2.Size = new System.Drawing.Size(1702, 462);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1072,7 +1117,7 @@
//
this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx2.ColumnPanelRowHeight = 60;
+ this.gvMx2.ColumnPanelRowHeight = 73;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn4,
this.gridColumn14,
@@ -1086,6 +1131,7 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn9});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1096,143 +1142,146 @@
//
this.gridColumn4.Caption = "鏂扮殑杩芥函鐮�";
this.gridColumn4.FieldName = "barCode";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 0;
- this.gridColumn4.Width = 146;
+ this.gridColumn4.Width = 182;
//
// gridColumn14
//
this.gridColumn14.AppearanceCell.Options.UseFont = true;
this.gridColumn14.Caption = "鐗╂枡ID";
this.gridColumn14.FieldName = "itemId";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Tag = "query_a.ITEM_ID";
- this.gridColumn14.Width = 100;
+ this.gridColumn14.Width = 125;
//
// gridColumn15
//
this.gridColumn15.Caption = "鐗╂枡缂栫爜";
this.gridColumn15.FieldName = "itemNo";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 5;
- this.gridColumn15.Width = 69;
+ this.gridColumn15.Width = 86;
//
// gridColumn16
//
this.gridColumn16.Caption = "鐗╂枡鍚嶇О";
this.gridColumn16.FieldName = "itemName";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 6;
- this.gridColumn16.Width = 82;
+ this.gridColumn16.Width = 102;
//
// gridColumn17
//
this.gridColumn17.AppearanceCell.Options.UseFont = true;
this.gridColumn17.Caption = "鐗╂枡瑙勬牸";
this.gridColumn17.FieldName = "itemModel";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Tag = "query_a.PRICING_QTY";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 7;
- this.gridColumn17.Width = 56;
+ this.gridColumn17.Width = 70;
//
// gridColumn22
//
this.gridColumn22.AppearanceCell.Options.UseFont = true;
this.gridColumn22.Caption = "鏁伴噺";
this.gridColumn22.FieldName = "quantity";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 2;
- this.gridColumn22.Width = 37;
+ this.gridColumn22.Width = 46;
//
// gridColumn12
//
this.gridColumn12.Caption = "缁戝畾鏃堕棿";
this.gridColumn12.FieldName = "bdDateTime";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 4;
- this.gridColumn12.Width = 146;
+ this.gridColumn12.Width = 182;
//
// gridColumn5
//
this.gridColumn5.Caption = "缁戝畾浜�";
this.gridColumn5.FieldName = "bdUserBy";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 146;
+ this.gridColumn5.Width = 182;
//
// gridColumn6
//
this.gridColumn6.Caption = "鎵樻澘鐮�";
this.gridColumn6.FieldName = "tbCode";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 1;
- this.gridColumn6.Width = 142;
+ this.gridColumn6.Width = 177;
//
// gridColumn7
//
this.gridColumn7.Caption = "鐢熶骇宸ュ崟";
this.gridColumn7.FieldName = "daa001";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 8;
- this.gridColumn7.Width = 142;
+ this.gridColumn7.Width = 177;
//
// gridColumn8
//
this.gridColumn8.Caption = "绾垮埆";
this.gridColumn8.FieldName = "xtName";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 9;
- this.gridColumn8.Width = 156;
+ this.gridColumn8.Width = 195;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐘舵��";
this.gridColumn9.FieldName = "barCodeStatus";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 10;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx7);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1361, 376);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1702, 462);
this.xtraTabPage3.Text = "璇ュ伐鍗曠殑宸ュ簭鏄庣粏";
//
// gcMx7
//
this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx7.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
gridLevelNode1.RelationName = "Level1";
this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
gridLevelNode1});
this.gcMx7.Location = new System.Drawing.Point(0, 0);
this.gcMx7.MainView = this.gvMx7;
+ this.gcMx7.Margin = new System.Windows.Forms.Padding(4);
this.gcMx7.Name = "gcMx7";
- this.gcMx7.Size = new System.Drawing.Size(1361, 376);
+ this.gcMx7.Size = new System.Drawing.Size(1702, 462);
this.gcMx7.TabIndex = 2;
this.gcMx7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx7});
@@ -1241,7 +1290,7 @@
//
this.gvMx7.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx7.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx7.ColumnPanelRowHeight = 50;
+ this.gvMx7.ColumnPanelRowHeight = 61;
this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1daa002,
this.gvMx1daa010,
@@ -1249,6 +1298,7 @@
this.gridColumn63,
this.gridColumn64,
this.gridColumn65});
+ this.gvMx7.DetailHeight = 428;
this.gvMx7.GridControl = this.gcMx7;
this.gvMx7.Name = "gvMx7";
this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1260,105 +1310,97 @@
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "搴忓彿";
this.gvMx1daa002.FieldName = "fSeq";
- this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.MinWidth = 62;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa010";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 54;
+ this.gvMx1daa002.Width = 67;
//
// gvMx1daa010
//
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
this.gvMx1daa010.Caption = "宸ュ簭";
this.gvMx1daa010.FieldName = "processNo";
- this.gvMx1daa010.MinWidth = 50;
+ this.gvMx1daa010.MinWidth = 62;
this.gvMx1daa010.Name = "gvMx1daa010";
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
this.gvMx1daa010.VisibleIndex = 1;
- this.gvMx1daa010.Width = 129;
+ this.gvMx1daa010.Width = 161;
//
// gvMx1daa004
//
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "涓婂伐搴�";
this.gvMx1daa004.FieldName = "frontProcessNo";
- this.gvMx1daa004.MinWidth = 150;
+ this.gvMx1daa004.MinWidth = 187;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa010";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 2;
- this.gvMx1daa004.Width = 150;
+ this.gvMx1daa004.Width = 187;
//
// gridColumn63
//
this.gridColumn63.Caption = "鏄惁鍙繑宸�";
this.gridColumn63.FieldName = "isBack";
- this.gridColumn63.MinWidth = 25;
+ this.gridColumn63.MinWidth = 31;
this.gridColumn63.Name = "gridColumn63";
this.gridColumn63.OptionsColumn.ReadOnly = true;
this.gridColumn63.Tag = "query_a.daa010";
this.gridColumn63.Visible = true;
this.gridColumn63.VisibleIndex = 3;
- this.gridColumn63.Width = 94;
+ this.gridColumn63.Width = 117;
//
// gridColumn64
//
this.gridColumn64.Caption = "鏄惁杩旇拷婧爜";
this.gridColumn64.FieldName = "isZsm";
- this.gridColumn64.MinWidth = 25;
+ this.gridColumn64.MinWidth = 31;
this.gridColumn64.Name = "gridColumn64";
this.gridColumn64.OptionsColumn.ReadOnly = true;
this.gridColumn64.Tag = "query_a.daa010";
this.gridColumn64.Visible = true;
this.gridColumn64.VisibleIndex = 4;
- this.gridColumn64.Width = 94;
+ this.gridColumn64.Width = 117;
//
// gridColumn65
//
this.gridColumn65.Caption = "鏄惁杩旀墭鏉跨爜";
this.gridColumn65.FieldName = "isTbm";
- this.gridColumn65.MinWidth = 25;
+ this.gridColumn65.MinWidth = 31;
this.gridColumn65.Name = "gridColumn65";
this.gridColumn65.OptionsColumn.ReadOnly = true;
this.gridColumn65.Tag = "query_a.daa010";
this.gridColumn65.Visible = true;
this.gridColumn65.VisibleIndex = 5;
- this.gridColumn65.Width = 94;
+ this.gridColumn65.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1133, 30);
+ this.picCheckBox.Location = new System.Drawing.Point(1416, 37);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn19
- //
- this.gridColumn19.Caption = "鐢熶骇缁勭粐";
- this.gridColumn19.FieldName = "fSubsidiary";
- this.gridColumn19.MinWidth = 25;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 12;
- this.gridColumn19.Width = 94;
- //
// Frm_WomFanGong
//
- 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(1365, 682);
+ this.ClientSize = new System.Drawing.Size(1706, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_WomFanGong";
this.Text = "杩斿伐杩芥函鐮�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1384,7 +1426,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo2.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_kbSl.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
@@ -1394,7 +1436,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -1441,7 +1483,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_documentType;
private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
- private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn createUserName;
private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDept;
@@ -1472,7 +1514,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_itemNo2;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createByName;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
@@ -1508,7 +1550,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn fcheckByUserName;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
@@ -1524,7 +1566,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraEditors.TextEdit txt_fgCheckBy;
+ private DevExpress.XtraEditors.TextEdit txt_fgCheckByName;
private DevExpress.XtraEditors.TextEdit txt_fgCheckDatet;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 4e277bb..1d50f50 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -530,9 +530,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(1652, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(2065, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -540,10 +541,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(1652, 740);
+ this.xtraTabControl1.Size = new System.Drawing.Size(2065, 904);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -552,8 +554,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(1650, 708);
+ this.xtraTabPage1.Size = new System.Drawing.Size(2063, 866);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -562,6 +565,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
@@ -574,19 +578,21 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1650, 708);
+ this.split1.Size = new System.Drawing.Size(2063, 866);
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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMain1.Size = new System.Drawing.Size(1650, 657);
+ this.gcMain1.Size = new System.Drawing.Size(2063, 803);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -596,7 +602,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.gridColumn5,
this.gridColumn7,
@@ -630,8 +636,9 @@
this.gridColumn25,
this.gridColumn52,
this.gridColumn66});
+ 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;
@@ -641,167 +648,167 @@
//
this.gridColumn5.Caption = "缁撴鏍囪瘑";
this.gridColumn5.FieldName = "jabzChk";
- this.gridColumn5.MaxWidth = 50;
- this.gridColumn5.MinWidth = 50;
+ this.gridColumn5.MaxWidth = 62;
+ this.gridColumn5.MinWidth = 62;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.jabs";
- this.gridColumn5.Width = 50;
+ this.gridColumn5.Width = 62;
//
// gridColumn7
//
this.gridColumn7.Caption = "澶囨枡榻愬";
this.gridColumn7.FieldName = "isQt";
- this.gridColumn7.MaxWidth = 50;
- this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.MaxWidth = 62;
+ this.gridColumn7.MinWidth = 62;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.jabs";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 1;
- this.gridColumn7.Width = 50;
+ this.gridColumn7.Width = 62;
//
// gridColumn10
//
this.gridColumn10.Caption = "棣栨鍚堟牸";
this.gridColumn10.FieldName = "isSj";
- this.gridColumn10.MaxWidth = 50;
- this.gridColumn10.MinWidth = 50;
+ this.gridColumn10.MaxWidth = 62;
+ this.gridColumn10.MinWidth = 62;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "query_a.jabs";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 2;
- this.gridColumn10.Width = 50;
+ this.gridColumn10.Width = 62;
//
// gridColumn12
//
this.gridColumn12.Caption = "FQC鍚堟牸";
this.gridColumn12.FieldName = "fqcHg";
- this.gridColumn12.MaxWidth = 50;
- this.gridColumn12.MinWidth = 50;
+ this.gridColumn12.MaxWidth = 62;
+ this.gridColumn12.MinWidth = 62;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.jabs";
- this.gridColumn12.Width = 50;
+ this.gridColumn12.Width = 62;
//
// gridColumn6
//
this.gridColumn6.Caption = "閫氱煡澶囨枡";
this.gridColumn6.FieldName = "tzbs";
- this.gridColumn6.MaxWidth = 50;
- this.gridColumn6.MinWidth = 50;
+ this.gridColumn6.MaxWidth = 62;
+ this.gridColumn6.MinWidth = 62;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.jabs";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 3;
- this.gridColumn6.Width = 50;
+ this.gridColumn6.Width = 62;
//
// gridColumn27
//
this.gridColumn27.Caption = "澶囨枡绾у埆";
this.gridColumn27.FieldName = "daa022Remark";
- this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 18;
- this.gridColumn27.Width = 94;
+ this.gridColumn27.Width = 117;
//
// gv_daa018
//
this.gv_daa018.AppearanceCell.Options.UseFont = true;
this.gv_daa018.Caption = "宸ュ崟鐘舵��";
this.gv_daa018.FieldName = "daa018TxtColor";
- this.gv_daa018.MinWidth = 90;
+ this.gv_daa018.MinWidth = 112;
this.gv_daa018.Name = "gv_daa018";
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
this.gv_daa018.VisibleIndex = 4;
- this.gv_daa018.Width = 90;
+ this.gv_daa018.Width = 112;
//
// gridColoun100
//
this.gridColoun100.Caption = "鐢熶骇缁勭粐";
this.gridColoun100.FieldName = "fSubsidiary";
- this.gridColoun100.MinWidth = 50;
+ this.gridColoun100.MinWidth = 62;
this.gridColoun100.Name = "gridColoun100";
this.gridColoun100.Tag = "org.fnamber";
this.gridColoun100.Visible = true;
this.gridColoun100.VisibleIndex = 26;
- this.gridColoun100.Width = 250;
+ this.gridColoun100.Width = 312;
//
// gv_daa001
//
this.gv_daa001.AppearanceCell.Options.UseFont = true;
this.gv_daa001.Caption = "宸ュ崟鍗曞彿";
this.gv_daa001.FieldName = "daa001";
- this.gv_daa001.MinWidth = 50;
+ this.gv_daa001.MinWidth = 62;
this.gv_daa001.Name = "gv_daa001";
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
this.gv_daa001.VisibleIndex = 8;
- this.gv_daa001.Width = 120;
+ this.gv_daa001.Width = 150;
//
// gv_daa021
//
this.gv_daa021.AppearanceCell.Options.UseFont = true;
this.gv_daa021.Caption = "鎶曟枡鍗曞彿";
this.gv_daa021.FieldName = "daa014";
- this.gv_daa021.MinWidth = 50;
+ this.gv_daa021.MinWidth = 62;
this.gv_daa021.Name = "gv_daa021";
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
this.gv_daa021.VisibleIndex = 20;
- this.gv_daa021.Width = 100;
+ this.gv_daa021.Width = 125;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.MinWidth = 62;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 11;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gv_daa003
//
this.gv_daa003.AppearanceCell.Options.UseFont = true;
this.gv_daa003.Caption = "浜у搧鍚嶇О";
this.gv_daa003.FieldName = "daa003";
- this.gv_daa003.MinWidth = 50;
+ this.gv_daa003.MinWidth = 62;
this.gv_daa003.Name = "gv_daa003";
this.gv_daa003.OptionsColumn.AllowEdit = false;
this.gv_daa003.Tag = "query_a.daa003";
this.gv_daa003.Visible = true;
this.gv_daa003.VisibleIndex = 12;
- this.gv_daa003.Width = 150;
+ this.gv_daa003.Width = 187;
//
// gv_daa004
//
this.gv_daa004.AppearanceCell.Options.UseFont = true;
this.gv_daa004.Caption = "浜у搧瑙勬牸";
this.gv_daa004.FieldName = "daa004";
- this.gv_daa004.MinWidth = 50;
+ this.gv_daa004.MinWidth = 62;
this.gv_daa004.Name = "gv_daa004";
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
this.gv_daa004.VisibleIndex = 15;
- this.gv_daa004.Width = 150;
+ this.gv_daa004.Width = 187;
//
// gv_daa008
//
this.gv_daa008.AppearanceCell.Options.UseFont = true;
this.gv_daa008.Caption = "宸ュ崟鏁伴噺";
this.gv_daa008.FieldName = "daa008";
- this.gv_daa008.MaxWidth = 50;
- this.gv_daa008.MinWidth = 50;
+ this.gv_daa008.MaxWidth = 62;
+ this.gv_daa008.MinWidth = 62;
this.gv_daa008.Name = "gv_daa008";
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
this.gv_daa008.VisibleIndex = 5;
- this.gv_daa008.Width = 50;
+ this.gv_daa008.Width = 62;
//
// gridColumn4
//
@@ -811,195 +818,195 @@
this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn4.Caption = "寰呭叆搴撻噺";
this.gridColumn4.FieldName = "dscl";
- this.gridColumn4.MaxWidth = 50;
- this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.MaxWidth = 62;
+ this.gridColumn4.MinWidth = 62;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 7;
- this.gridColumn4.Width = 50;
+ this.gridColumn4.Width = 62;
//
// gv_daa010
//
this.gv_daa010.AppearanceCell.Options.UseFont = true;
this.gv_daa010.Caption = "宸插叆搴撻噺";
this.gv_daa010.FieldName = "daa010";
- this.gv_daa010.MaxWidth = 50;
- this.gv_daa010.MinWidth = 50;
+ this.gv_daa010.MaxWidth = 62;
+ this.gv_daa010.MinWidth = 62;
this.gv_daa010.Name = "gv_daa010";
this.gv_daa010.OptionsColumn.AllowEdit = false;
this.gv_daa010.Tag = "query_a.daa010";
this.gv_daa010.Visible = true;
this.gv_daa010.VisibleIndex = 6;
- this.gv_daa010.Width = 50;
+ this.gv_daa010.Width = 62;
//
// gv_daa005
//
this.gv_daa005.AppearanceCell.Options.UseFont = true;
this.gv_daa005.Caption = "鍗曚綅";
this.gv_daa005.FieldName = "fname";
- this.gv_daa005.MaxWidth = 50;
- this.gv_daa005.MinWidth = 50;
+ this.gv_daa005.MaxWidth = 62;
+ this.gv_daa005.MinWidth = 62;
this.gv_daa005.Name = "gv_daa005";
this.gv_daa005.OptionsColumn.AllowEdit = false;
this.gv_daa005.Tag = "query_a.daa005";
this.gv_daa005.Visible = true;
this.gv_daa005.VisibleIndex = 17;
- this.gv_daa005.Width = 50;
+ this.gv_daa005.Width = 62;
//
// gv_cust
//
this.gv_cust.AppearanceCell.Options.UseFont = true;
this.gv_cust.Caption = "闇�姹傚崟鍙�";
this.gv_cust.FieldName = "saleNo";
- this.gv_cust.MinWidth = 50;
+ this.gv_cust.MinWidth = 62;
this.gv_cust.Name = "gv_cust";
this.gv_cust.OptionsColumn.AllowEdit = false;
this.gv_cust.Tag = "query_a.cust";
- this.gv_cust.Width = 100;
+ this.gv_cust.Width = 125;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐢熶骇杞﹂棿";
this.gridColumn1.FieldName = "dptName";
- this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.MinWidth = 62;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 19;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gv_daa015
//
this.gv_daa015.AppearanceCell.Options.UseFont = true;
this.gv_daa015.Caption = "鐢熶骇绾垮埆";
this.gv_daa015.FieldName = "lineName";
- this.gv_daa015.MinWidth = 50;
+ this.gv_daa015.MinWidth = 62;
this.gv_daa015.Name = "gv_daa015";
this.gv_daa015.OptionsColumn.AllowEdit = false;
this.gv_daa015.Tag = "query_a.daa015";
this.gv_daa015.Visible = true;
this.gv_daa015.VisibleIndex = 9;
- this.gv_daa015.Width = 94;
+ this.gv_daa015.Width = 117;
//
// gv_daa009
//
this.gv_daa009.AppearanceCell.Options.UseFont = true;
this.gv_daa009.Caption = "澶囨敞";
this.gv_daa009.FieldName = "daa009";
- this.gv_daa009.MinWidth = 50;
+ this.gv_daa009.MinWidth = 62;
this.gv_daa009.Name = "gv_daa009";
this.gv_daa009.OptionsColumn.AllowEdit = false;
this.gv_daa009.Tag = "query_a.daa009";
this.gv_daa009.Visible = true;
this.gv_daa009.VisibleIndex = 16;
- this.gv_daa009.Width = 94;
+ this.gv_daa009.Width = 117;
//
// gv_daa016
//
this.gv_daa016.AppearanceCell.Options.UseFont = true;
this.gv_daa016.Caption = "瀹為檯寮�宸ユ棩";
this.gv_daa016.FieldName = "daa016";
- this.gv_daa016.MinWidth = 50;
+ this.gv_daa016.MinWidth = 62;
this.gv_daa016.Name = "gv_daa016";
this.gv_daa016.OptionsColumn.AllowEdit = false;
this.gv_daa016.Tag = "query_a.daa016";
this.gv_daa016.Visible = true;
this.gv_daa016.VisibleIndex = 22;
- this.gv_daa016.Width = 180;
+ this.gv_daa016.Width = 225;
//
// gv_daa017
//
this.gv_daa017.AppearanceCell.Options.UseFont = true;
this.gv_daa017.Caption = "瀹為檯瀹屽伐鏃�";
this.gv_daa017.FieldName = "daa017";
- this.gv_daa017.MinWidth = 50;
+ this.gv_daa017.MinWidth = 62;
this.gv_daa017.Name = "gv_daa017";
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
- this.gv_daa017.Width = 180;
+ this.gv_daa017.Width = 225;
//
// gv_mesStartProd
//
this.gv_mesStartProd.AppearanceCell.Options.UseFont = true;
this.gv_mesStartProd.Caption = "MES棰勮寮�宸ユ椂闂�";
this.gv_mesStartProd.FieldName = "mesStartProd";
- this.gv_mesStartProd.MinWidth = 50;
+ this.gv_mesStartProd.MinWidth = 62;
this.gv_mesStartProd.Name = "gv_mesStartProd";
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
this.gv_mesStartProd.VisibleIndex = 13;
- this.gv_mesStartProd.Width = 180;
+ this.gv_mesStartProd.Width = 225;
//
// gv_mesEndProd
//
this.gv_mesEndProd.AppearanceCell.Options.UseFont = true;
this.gv_mesEndProd.Caption = "MES棰勮瀹屽伐鏃堕棿";
this.gv_mesEndProd.FieldName = "mesEndProd";
- this.gv_mesEndProd.MinWidth = 50;
+ this.gv_mesEndProd.MinWidth = 62;
this.gv_mesEndProd.Name = "gv_mesEndProd";
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
this.gv_mesEndProd.VisibleIndex = 14;
- this.gv_mesEndProd.Width = 180;
+ this.gv_mesEndProd.Width = 225;
//
// gridColumn21
//
this.gridColumn21.Caption = "鎺掍骇浜�";
- this.gridColumn21.FieldName = "pcUser";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.FieldName = "pcUserName";
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 23;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "鎺掍骇鏃堕棿";
this.gridColumn22.FieldName = "pcDate";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 24;
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 117;
//
// gridColumn23
//
this.gridColumn23.Caption = "涓婚敭GUID";
this.gridColumn23.FieldName = "guid";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "鎺掍骇缂栧彿";
this.gridColumn24.FieldName = "pcHNo";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 25;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 117;
//
// gridColumn25
//
this.gridColumn25.Caption = "浠诲姟鍗曞彿";
this.gridColumn25.FieldName = "daa021";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 21;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
//
// gridColumn52
//
this.gridColumn52.Caption = "鐢熶骇绫诲瀷";
this.gridColumn52.FieldName = "daa025";
- this.gridColumn52.MinWidth = 25;
+ this.gridColumn52.MinWidth = 31;
this.gridColumn52.Name = "gridColumn52";
this.gridColumn52.Visible = true;
this.gridColumn52.VisibleIndex = 10;
- this.gridColumn52.Width = 94;
+ this.gridColumn52.Width = 117;
//
// gridColumn66
//
@@ -1009,11 +1016,11 @@
this.gridColumn66.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn66.Caption = "杩涘叆鐪嬫澘";
this.gridColumn66.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gridColumn66.MinWidth = 25;
+ this.gridColumn66.MinWidth = 31;
this.gridColumn66.Name = "gridColumn66";
this.gridColumn66.Visible = true;
this.gridColumn66.VisibleIndex = 0;
- this.gridColumn66.Width = 94;
+ this.gridColumn66.Width = 117;
//
// repositoryItemButtonEdit1
//
@@ -1034,19 +1041,20 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 657);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 803);
+ 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(1650, 39);
+ this.pageBar1.Size = new System.Drawing.Size(2063, 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(1650, 708);
+ this.xtraTabPage2.Size = new System.Drawing.Size(2063, 866);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -1054,6 +1062,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
@@ -1066,8 +1075,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(1650, 708);
- this.splitMx1.SplitterPosition = 200;
+ this.splitMx1.Size = new System.Drawing.Size(2063, 866);
+ this.splitMx1.SplitterPosition = 244;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -1105,240 +1114,265 @@
this.layoutControlItem18,
this.layoutControlItem41});
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(662, 232, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1650, 200);
+ this.layoutMx1.Size = new System.Drawing.Size(2063, 244);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_daa015
//
this.txt_daa015.IsReadly = false;
- this.txt_daa015.Location = new System.Drawing.Point(928, 162);
+ this.txt_daa015.Location = new System.Drawing.Point(1156, 197);
+ this.txt_daa015.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_daa015.Name = "txt_daa015";
- this.txt_daa015.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa015.Size = new System.Drawing.Size(383, 28);
this.txt_daa015.TabIndex = 478;
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 236);
+ this.lbGuid.Location = new System.Drawing.Point(1031, 288);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 25);
+ this.lbGuid.Size = new System.Drawing.Size(335, 31);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(521, 162);
+ this.txt_daa009.Location = new System.Drawing.Point(646, 197);
+ this.txt_daa009.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(383, 28);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
//
// txt_daa013
//
- this.txt_daa013.Location = new System.Drawing.Point(726, 119);
+ this.txt_daa013.Location = new System.Drawing.Point(908, 145);
+ this.txt_daa013.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa013.Name = "txt_daa013";
this.txt_daa013.Properties.Appearance.Options.UseFont = true;
- this.txt_daa013.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa013.Size = new System.Drawing.Size(250, 28);
this.txt_daa013.StyleController = this.layoutMx1;
this.txt_daa013.TabIndex = 472;
this.txt_daa013.Tag = "readonly";
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(114, 12);
+ this.txt_daa001.Location = new System.Drawing.Point(137, 14);
+ this.txt_daa001.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
- this.txt_daa001.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(382, 28);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
this.txt_daa001.Tag = "readonly";
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(928, 12);
+ this.txt_daa008.Location = new System.Drawing.Point(1156, 14);
+ this.txt_daa008.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
- this.txt_daa008.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa008.Size = new System.Drawing.Size(383, 28);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 235;
this.txt_daa008.Tag = "readonly";
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(928, 132);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(1156, 160);
+ this.txt_saleOrderNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_saleOrderNo.Size = new System.Drawing.Size(301, 24);
+ this.txt_saleOrderNo.Size = new System.Drawing.Size(383, 28);
this.txt_saleOrderNo.StyleController = this.layoutMx1;
this.txt_saleOrderNo.TabIndex = 465;
this.txt_saleOrderNo.Tag = "readonly";
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(114, 42);
+ this.txt_daa014.Location = new System.Drawing.Point(137, 49);
+ 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(301, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(382, 28);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 327;
this.txt_daa014.Tag = "readonly";
//
// txt_daa022Remark
//
- this.txt_daa022Remark.Location = new System.Drawing.Point(521, 12);
+ this.txt_daa022Remark.Location = new System.Drawing.Point(646, 14);
+ this.txt_daa022Remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa022Remark.Name = "txt_daa022Remark";
this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
- this.txt_daa022Remark.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa022Remark.Size = new System.Drawing.Size(383, 28);
this.txt_daa022Remark.StyleController = this.layoutMx1;
this.txt_daa022Remark.TabIndex = 462;
this.txt_daa022Remark.Tag = "readonly";
//
// txt_daa010
//
- this.txt_daa010.Location = new System.Drawing.Point(928, 42);
+ this.txt_daa010.Location = new System.Drawing.Point(1156, 49);
+ this.txt_daa010.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa010.Name = "txt_daa010";
this.txt_daa010.Properties.Appearance.Options.UseFont = true;
- this.txt_daa010.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa010.Size = new System.Drawing.Size(383, 28);
this.txt_daa010.StyleController = this.layoutMx1;
this.txt_daa010.TabIndex = 243;
this.txt_daa010.Tag = "readonly";
//
// txt_daa011
//
- this.txt_daa011.Location = new System.Drawing.Point(928, 72);
+ this.txt_daa011.Location = new System.Drawing.Point(1156, 86);
+ this.txt_daa011.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa011.Name = "txt_daa011";
this.txt_daa011.Properties.Appearance.Options.UseFont = true;
- this.txt_daa011.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa011.Size = new System.Drawing.Size(383, 28);
this.txt_daa011.StyleController = this.layoutMx1;
this.txt_daa011.TabIndex = 247;
this.txt_daa011.Tag = "readonly";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(521, 42);
+ this.txt_dptName.Location = new System.Drawing.Point(646, 49);
+ this.txt_dptName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(301, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(383, 28);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 258;
this.txt_dptName.Tag = "readonly";
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(1335, 72);
+ this.txt_daa016.Location = new System.Drawing.Point(1666, 86);
+ this.txt_daa016.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
- this.txt_daa016.Size = new System.Drawing.Size(303, 24);
+ this.txt_daa016.Size = new System.Drawing.Size(383, 28);
this.txt_daa016.StyleController = this.layoutMx1;
this.txt_daa016.TabIndex = 273;
this.txt_daa016.Tag = "readonly";
//
// txt_daa029
//
- this.txt_daa029.Location = new System.Drawing.Point(114, 102);
+ this.txt_daa029.Location = new System.Drawing.Point(137, 123);
+ this.txt_daa029.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
- this.txt_daa029.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa029.Size = new System.Drawing.Size(382, 28);
this.txt_daa029.StyleController = this.layoutMx1;
this.txt_daa029.TabIndex = 217;
this.txt_daa029.Tag = "readonly";
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(521, 72);
+ this.txt_lineName.Location = new System.Drawing.Point(646, 86);
+ this.txt_lineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lineName.Name = "txt_lineName";
this.txt_lineName.Properties.Appearance.Options.UseFont = true;
- this.txt_lineName.Size = new System.Drawing.Size(301, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(383, 28);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 267;
this.txt_lineName.Tag = "readonly";
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(1335, 102);
+ this.txt_daa017.Location = new System.Drawing.Point(1666, 123);
+ this.txt_daa017.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
- this.txt_daa017.Size = new System.Drawing.Size(303, 24);
+ this.txt_daa017.Size = new System.Drawing.Size(383, 28);
this.txt_daa017.StyleController = this.layoutMx1;
this.txt_daa017.TabIndex = 280;
this.txt_daa017.Tag = "readonly";
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 132);
+ this.txt_daa003.Location = new System.Drawing.Point(137, 160);
+ this.txt_daa003.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
- this.txt_daa003.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa003.Size = new System.Drawing.Size(382, 28);
this.txt_daa003.StyleController = this.layoutMx1;
this.txt_daa003.TabIndex = 219;
this.txt_daa003.Tag = "readonly";
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(928, 102);
+ this.txt_dwName.Location = new System.Drawing.Point(1156, 123);
+ this.txt_dwName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(301, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(383, 28);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 226;
this.txt_dwName.Tag = "readonly";
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 162);
+ this.txt_daa004.Location = new System.Drawing.Point(137, 197);
+ this.txt_daa004.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
- this.txt_daa004.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa004.Size = new System.Drawing.Size(382, 28);
this.txt_daa004.StyleController = this.layoutMx1;
this.txt_daa004.TabIndex = 222;
this.txt_daa004.Tag = "readonly";
//
// txt_lineNo
//
- this.txt_lineNo.Location = new System.Drawing.Point(521, 102);
+ this.txt_lineNo.Location = new System.Drawing.Point(646, 123);
+ this.txt_lineNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_lineNo.Name = "txt_lineNo";
- this.txt_lineNo.Size = new System.Drawing.Size(301, 24);
+ this.txt_lineNo.Size = new System.Drawing.Size(383, 28);
this.txt_lineNo.StyleController = this.layoutMx1;
this.txt_lineNo.TabIndex = 474;
this.txt_lineNo.Tag = "readonly";
//
// txt_dptNo
//
- this.txt_dptNo.Location = new System.Drawing.Point(521, 68);
+ this.txt_dptNo.Location = new System.Drawing.Point(651, 83);
+ this.txt_dptNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_dptNo.Name = "txt_dptNo";
- this.txt_dptNo.Size = new System.Drawing.Size(301, 24);
+ this.txt_dptNo.Size = new System.Drawing.Size(376, 28);
this.txt_dptNo.StyleController = this.layoutMx1;
this.txt_dptNo.TabIndex = 475;
this.txt_dptNo.Tag = "readonly";
//
// txt_isQiTao
//
- this.txt_isQiTao.Location = new System.Drawing.Point(1233, 132);
+ this.txt_isQiTao.Location = new System.Drawing.Point(1543, 160);
+ this.txt_isQiTao.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_isQiTao.Name = "txt_isQiTao";
this.txt_isQiTao.Properties.Caption = "澶囨枡榻愬";
- this.txt_isQiTao.Size = new System.Drawing.Size(405, 24);
+ this.txt_isQiTao.Size = new System.Drawing.Size(506, 27);
this.txt_isQiTao.StyleController = this.layoutMx1;
this.txt_isQiTao.TabIndex = 476;
this.txt_isQiTao.Tag = "readonly";
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(521, 132);
+ this.txt_daa018.Location = new System.Drawing.Point(646, 160);
+ this.txt_daa018.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa018.Name = "txt_daa018";
- this.txt_daa018.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa018.Size = new System.Drawing.Size(383, 28);
this.txt_daa018.StyleController = this.layoutMx1;
this.txt_daa018.TabIndex = 477;
this.txt_daa018.Tag = "readonly";
//
// txt_daa025
//
- this.txt_daa025.Location = new System.Drawing.Point(1335, 162);
+ this.txt_daa025.Location = new System.Drawing.Point(1666, 197);
+ this.txt_daa025.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa025.Name = "txt_daa025";
this.txt_daa025.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1350,15 +1384,16 @@
"G-杩斿伐",
"O-澶栧彂"});
this.txt_daa025.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_daa025.Size = new System.Drawing.Size(303, 24);
+ this.txt_daa025.Size = new System.Drawing.Size(383, 28);
this.txt_daa025.StyleController = this.layoutMx1;
this.txt_daa025.TabIndex = 479;
//
// txt_daa021
//
- this.txt_daa021.Location = new System.Drawing.Point(114, 72);
+ this.txt_daa021.Location = new System.Drawing.Point(137, 86);
+ this.txt_daa021.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_daa021.Name = "txt_daa021";
- this.txt_daa021.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa021.Size = new System.Drawing.Size(382, 28);
this.txt_daa021.StyleController = this.layoutMx1;
this.txt_daa021.TabIndex = 480;
this.txt_daa021.Tag = "readonly";
@@ -1366,7 +1401,8 @@
// txt_mesStartProd
//
this.txt_mesStartProd.EditValue = null;
- this.txt_mesStartProd.Location = new System.Drawing.Point(1335, 12);
+ this.txt_mesStartProd.Location = new System.Drawing.Point(1666, 14);
+ this.txt_mesStartProd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_mesStartProd.Name = "txt_mesStartProd";
this.txt_mesStartProd.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1377,14 +1413,15 @@
this.txt_mesStartProd.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm";
this.txt_mesStartProd.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.txt_mesStartProd.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm");
- this.txt_mesStartProd.Size = new System.Drawing.Size(303, 24);
+ this.txt_mesStartProd.Size = new System.Drawing.Size(383, 28);
this.txt_mesStartProd.StyleController = this.layoutMx1;
this.txt_mesStartProd.TabIndex = 481;
//
// txt_mesEndProd
//
this.txt_mesEndProd.EditValue = null;
- this.txt_mesEndProd.Location = new System.Drawing.Point(1335, 42);
+ this.txt_mesEndProd.Location = new System.Drawing.Point(1666, 49);
+ this.txt_mesEndProd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_mesEndProd.Name = "txt_mesEndProd";
this.txt_mesEndProd.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1395,7 +1432,7 @@
this.txt_mesEndProd.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm";
this.txt_mesEndProd.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.txt_mesEndProd.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm");
- this.txt_mesEndProd.Size = new System.Drawing.Size(303, 24);
+ this.txt_mesEndProd.Size = new System.Drawing.Size(383, 28);
this.txt_mesEndProd.StyleController = this.layoutMx1;
this.txt_mesEndProd.TabIndex = 482;
//
@@ -1421,7 +1458,7 @@
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem18.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem18.Text = "杞﹂棿ID";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(112, 22);
//
// layoutControlItem41
//
@@ -1432,7 +1469,7 @@
this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem41.Size = new System.Drawing.Size(407, 29);
this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
- this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem41.TextSize = new System.Drawing.Size(112, 22);
//
// Root
//
@@ -1497,7 +1534,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1650, 200);
+ this.Root.Size = new System.Drawing.Size(2063, 244);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1505,147 +1542,147 @@
this.layoutControlItem1.Control = this.txt_daa001;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(509, 35);
this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_daa008;
- this.layoutControlItem3.Location = new System.Drawing.Point(814, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(1019, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(510, 35);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_daa014;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 35);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(509, 37);
this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_daa010;
- this.layoutControlItem7.Location = new System.Drawing.Point(814, 30);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1019, 35);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem7.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_daa011;
- this.layoutControlItem11.Location = new System.Drawing.Point(814, 60);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1019, 72);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem11.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem11.Text = "宸茬敓浜ч噺";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_daa022Remark;
- this.layoutControlItem6.Location = new System.Drawing.Point(407, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(509, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem6.Size = new System.Drawing.Size(510, 35);
this.layoutControlItem6.Text = "閫氱煡澶囨枡";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(407, 30);
+ this.layoutControlItem20.Location = new System.Drawing.Point(509, 35);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem20.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_dwName;
- this.layoutControlItem15.Location = new System.Drawing.Point(814, 90);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1019, 109);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem15.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem15.Text = "鍗曚綅";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_daa016;
- this.layoutControlItem12.Location = new System.Drawing.Point(1221, 60);
+ this.layoutControlItem12.Location = new System.Drawing.Point(1529, 72);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(409, 30);
+ this.layoutControlItem12.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_daa017;
- this.layoutControlItem16.Location = new System.Drawing.Point(1221, 90);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1529, 109);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(409, 30);
+ this.layoutControlItem16.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_saleOrderNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(814, 120);
+ this.layoutControlItem9.Location = new System.Drawing.Point(1019, 146);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
//
// txt_daa015label
//
this.txt_daa015label.Control = this.txt_daa015;
- this.txt_daa015label.Location = new System.Drawing.Point(814, 150);
+ this.txt_daa015label.Location = new System.Drawing.Point(1019, 183);
this.txt_daa015label.Name = "txt_daa015label";
this.txt_daa015label.OptionsTableLayoutItem.ColumnIndex = 2;
this.txt_daa015label.OptionsTableLayoutItem.RowIndex = 5;
- this.txt_daa015label.Size = new System.Drawing.Size(407, 30);
+ this.txt_daa015label.Size = new System.Drawing.Size(510, 37);
this.txt_daa015label.Text = "绾夸綋鍙樻洿";
- this.txt_daa015label.TextSize = new System.Drawing.Size(90, 18);
+ this.txt_daa015label.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_lineName;
- this.layoutControlItem14.Location = new System.Drawing.Point(407, 60);
+ this.layoutControlItem14.Location = new System.Drawing.Point(509, 72);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem14.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem14.Text = "绾垮埆鍚嶇О";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem46
//
this.layoutControlItem46.Control = this.txt_isQiTao;
- this.layoutControlItem46.Location = new System.Drawing.Point(1221, 120);
+ this.layoutControlItem46.Location = new System.Drawing.Point(1529, 146);
this.layoutControlItem46.Name = "layoutControlItem46";
this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem46.Size = new System.Drawing.Size(409, 30);
+ this.layoutControlItem46.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem46.Text = "澶囨枡榻愭稕";
this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem46.TextVisible = false;
@@ -1653,115 +1690,116 @@
// layoutControlItem48
//
this.layoutControlItem48.Control = this.txt_daa018;
- this.layoutControlItem48.Location = new System.Drawing.Point(407, 120);
+ this.layoutControlItem48.Location = new System.Drawing.Point(509, 146);
this.layoutControlItem48.Name = "layoutControlItem48";
this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem48.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem48.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem48.Text = "宸ュ崟鐘舵��";
- this.layoutControlItem48.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem48.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem40
//
this.layoutControlItem40.Control = this.txt_lineNo;
- this.layoutControlItem40.Location = new System.Drawing.Point(407, 90);
+ this.layoutControlItem40.Location = new System.Drawing.Point(509, 109);
this.layoutControlItem40.Name = "layoutControlItem40";
this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem40.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem40.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem40.Text = "绾垮埆缂栫爜";
- this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem40.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_daa025;
- this.layoutControlItem27.Location = new System.Drawing.Point(1221, 150);
+ this.layoutControlItem27.Location = new System.Drawing.Point(1529, 183);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem27.Size = new System.Drawing.Size(409, 30);
+ this.layoutControlItem27.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_daa009;
- this.layoutControlItem28.Location = new System.Drawing.Point(407, 150);
+ this.layoutControlItem28.Location = new System.Drawing.Point(509, 183);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem28.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_daa004;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 150);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 183);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem17.Size = new System.Drawing.Size(509, 37);
this.layoutControlItem17.Text = "浜у搧瑙勬牸";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_daa003;
- this.layoutControlItem19.Location = new System.Drawing.Point(0, 120);
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 146);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem19.Size = new System.Drawing.Size(509, 37);
this.layoutControlItem19.Text = "浜у搧鍚嶇О";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_daa029;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 90);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 109);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem13.Size = new System.Drawing.Size(509, 37);
this.layoutControlItem13.Text = "浜у搧缂栫爜";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem49
//
this.layoutControlItem49.Control = this.txt_daa021;
- this.layoutControlItem49.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem49.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem49.Name = "layoutControlItem49";
this.layoutControlItem49.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem49.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem49.Size = new System.Drawing.Size(509, 37);
this.layoutControlItem49.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem49.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem49.TextSize = new System.Drawing.Size(108, 22);
//
// txt_mesStartProd123
//
this.txt_mesStartProd123.Control = this.txt_mesStartProd;
- this.txt_mesStartProd123.Location = new System.Drawing.Point(1221, 0);
+ this.txt_mesStartProd123.Location = new System.Drawing.Point(1529, 0);
this.txt_mesStartProd123.Name = "txt_mesStartProd123";
this.txt_mesStartProd123.OptionsTableLayoutItem.ColumnIndex = 3;
- this.txt_mesStartProd123.Size = new System.Drawing.Size(409, 30);
+ this.txt_mesStartProd123.Size = new System.Drawing.Size(510, 35);
this.txt_mesStartProd123.Text = "Mes棰勮寮�宸�";
- this.txt_mesStartProd123.TextSize = new System.Drawing.Size(90, 18);
+ this.txt_mesStartProd123.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_mesEndProd;
- this.layoutControlItem8.Location = new System.Drawing.Point(1221, 30);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1529, 35);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(409, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(510, 37);
this.layoutControlItem8.Text = "Mes棰勮瀹屽伐";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.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(1650, 496);
+ this.tabMx.Size = new System.Drawing.Size(2063, 607);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1779,17 +1817,20 @@
this.tabMxPage1.Appearance.Header.Options.UseForeColor = true;
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Controls.Add(this.panel1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1648, 464);
+ this.tabMxPage1.Size = new System.Drawing.Size(2061, 569);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 54);
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx1.Location = new System.Drawing.Point(0, 66);
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(1648, 410);
+ this.gcMx1.Size = new System.Drawing.Size(2061, 503);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1798,7 +1839,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.gridColumn13,
@@ -1829,6 +1870,7 @@
this.gvMx1dab022,
this.gvMx1dab023,
this.gridColumn58});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1839,333 +1881,335 @@
//
this.gvMx1Guid.Caption = "gvMx1Guid";
this.gvMx1Guid.FieldName = "guid";
- this.gvMx1Guid.MinWidth = 25;
+ this.gvMx1Guid.MinWidth = 31;
this.gvMx1Guid.Name = "gvMx1Guid";
- this.gvMx1Guid.Width = 94;
+ this.gvMx1Guid.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "搴忓彿";
this.gridColumn13.FieldName = "dab002";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 89;
+ this.gridColumn13.Width = 111;
//
// gvMx1dab001
//
this.gvMx1dab001.AppearanceCell.Options.UseFont = true;
this.gvMx1dab001.Caption = "宸ュ崟鍗曞彿";
this.gvMx1dab001.FieldName = "dab001";
- this.gvMx1dab001.MinWidth = 50;
+ this.gvMx1dab001.MinWidth = 62;
this.gvMx1dab001.Name = "gvMx1dab001";
this.gvMx1dab001.Tag = "query_a.dab001";
this.gvMx1dab001.Visible = true;
this.gvMx1dab001.VisibleIndex = 1;
- this.gvMx1dab001.Width = 89;
+ this.gvMx1dab001.Width = 111;
//
// gvMx1dab003
//
this.gvMx1dab003.AppearanceCell.Options.UseFont = true;
this.gvMx1dab003.Caption = "鏉愭枡缂栫爜";
this.gvMx1dab003.FieldName = "itemNo";
- this.gvMx1dab003.MinWidth = 50;
+ this.gvMx1dab003.MinWidth = 62;
this.gvMx1dab003.Name = "gvMx1dab003";
this.gvMx1dab003.Tag = "query_a.dab003";
this.gvMx1dab003.Visible = true;
this.gvMx1dab003.VisibleIndex = 2;
- this.gvMx1dab003.Width = 89;
+ this.gvMx1dab003.Width = 111;
//
// gvMx1dab004
//
this.gvMx1dab004.AppearanceCell.Options.UseFont = true;
this.gvMx1dab004.Caption = "鏉愭枡鍚嶇О";
this.gvMx1dab004.FieldName = "itemName";
- this.gvMx1dab004.MinWidth = 50;
+ this.gvMx1dab004.MinWidth = 62;
this.gvMx1dab004.Name = "gvMx1dab004";
this.gvMx1dab004.Tag = "query_a.dab004";
this.gvMx1dab004.Visible = true;
this.gvMx1dab004.VisibleIndex = 4;
- this.gvMx1dab004.Width = 89;
+ this.gvMx1dab004.Width = 111;
//
// gvMx1dab005
//
this.gvMx1dab005.AppearanceCell.Options.UseFont = true;
this.gvMx1dab005.Caption = "鏉愭枡瑙勬牸";
this.gvMx1dab005.FieldName = "itemModel";
- this.gvMx1dab005.MinWidth = 50;
+ this.gvMx1dab005.MinWidth = 62;
this.gvMx1dab005.Name = "gvMx1dab005";
this.gvMx1dab005.Tag = "query_a.dab005";
this.gvMx1dab005.Visible = true;
this.gvMx1dab005.VisibleIndex = 5;
- this.gvMx1dab005.Width = 89;
+ this.gvMx1dab005.Width = 111;
//
// gvMx1dab006
//
this.gvMx1dab006.AppearanceCell.Options.UseFont = true;
this.gvMx1dab006.Caption = "闇�棰嗙敤閲�";
this.gvMx1dab006.FieldName = "dab006";
- this.gvMx1dab006.MinWidth = 50;
+ this.gvMx1dab006.MinWidth = 62;
this.gvMx1dab006.Name = "gvMx1dab006";
this.gvMx1dab006.Tag = "query_a.dab006";
this.gvMx1dab006.Visible = true;
this.gvMx1dab006.VisibleIndex = 6;
- this.gvMx1dab006.Width = 89;
+ this.gvMx1dab006.Width = 111;
//
// gvMx1dab007
//
this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
this.gvMx1dab007.Caption = "宸查鐢ㄩ噺";
this.gvMx1dab007.FieldName = "ylQty";
- this.gvMx1dab007.MinWidth = 50;
+ this.gvMx1dab007.MinWidth = 62;
this.gvMx1dab007.Name = "gvMx1dab007";
this.gvMx1dab007.Tag = "query_a.dab007";
this.gvMx1dab007.Visible = true;
this.gvMx1dab007.VisibleIndex = 7;
- this.gvMx1dab007.Width = 89;
+ this.gvMx1dab007.Width = 111;
//
// gridColumn14
//
this.gridColumn14.Caption = "鍓╀綑鍙";
this.gridColumn14.FieldName = "klQty";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 8;
- this.gridColumn14.Width = 89;
+ this.gridColumn14.Width = 111;
//
// gvMx1dab014
//
this.gvMx1dab014.AppearanceCell.Options.UseFont = true;
this.gvMx1dab014.Caption = "鏄惁鏇挎枡";
this.gvMx1dab014.FieldName = "dab014Txt";
- this.gvMx1dab014.MinWidth = 50;
+ this.gvMx1dab014.MinWidth = 62;
this.gvMx1dab014.Name = "gvMx1dab014";
this.gvMx1dab014.Tag = "query_a.dab014";
this.gvMx1dab014.Visible = true;
this.gvMx1dab014.VisibleIndex = 9;
- this.gvMx1dab014.Width = 89;
+ this.gvMx1dab014.Width = 111;
//
// gridColumn15
//
this.gridColumn15.Caption = "寤鸿浠撳簱";
this.gridColumn15.FieldName = "erpCk";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 10;
- this.gridColumn15.Width = 89;
+ this.gridColumn15.Width = 111;
//
// gridColumn16
//
this.gridColumn16.Caption = "鍙戞枡鏂瑰紡";
this.gridColumn16.FieldName = "issueType";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 11;
- this.gridColumn16.Width = 89;
+ this.gridColumn16.Width = 111;
//
// gvMx1dab012
//
this.gvMx1dab012.AppearanceCell.Options.UseFont = true;
this.gvMx1dab012.Caption = "缁勬垚鐢ㄩ噺";
this.gvMx1dab012.FieldName = "dab012";
- this.gvMx1dab012.MinWidth = 50;
+ this.gvMx1dab012.MinWidth = 62;
this.gvMx1dab012.Name = "gvMx1dab012";
this.gvMx1dab012.Tag = "query_a.dab012";
this.gvMx1dab012.Visible = true;
this.gvMx1dab012.VisibleIndex = 12;
- this.gvMx1dab012.Width = 89;
+ this.gvMx1dab012.Width = 111;
//
// gvMx1dab009
//
this.gvMx1dab009.AppearanceCell.Options.UseFont = true;
this.gvMx1dab009.Caption = "鍗曚綅";
this.gvMx1dab009.FieldName = "dwName";
- this.gvMx1dab009.MinWidth = 50;
+ this.gvMx1dab009.MinWidth = 62;
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
this.gvMx1dab009.VisibleIndex = 13;
- this.gvMx1dab009.Width = 246;
+ this.gvMx1dab009.Width = 307;
//
// gvMx1scrapqty
//
this.gvMx1scrapqty.AppearanceCell.Options.UseFont = true;
this.gvMx1scrapqty.Caption = "鍥哄畾鎹熻��";
this.gvMx1scrapqty.FieldName = "scrapqty";
- this.gvMx1scrapqty.MinWidth = 50;
+ this.gvMx1scrapqty.MinWidth = 62;
this.gvMx1scrapqty.Name = "gvMx1scrapqty";
this.gvMx1scrapqty.Tag = "query_a.scrapqty";
- this.gvMx1scrapqty.Width = 94;
+ this.gvMx1scrapqty.Width = 117;
//
// gvMx1scraprate
//
this.gvMx1scraprate.AppearanceCell.Options.UseFont = true;
this.gvMx1scraprate.Caption = "鍙樺姩鎹熻�楃巼";
this.gvMx1scraprate.FieldName = "scraprate";
- this.gvMx1scraprate.MinWidth = 50;
+ this.gvMx1scraprate.MinWidth = 62;
this.gvMx1scraprate.Name = "gvMx1scraprate";
this.gvMx1scraprate.Tag = "query_a.scraprate";
- this.gvMx1scraprate.Width = 94;
+ this.gvMx1scraprate.Width = 117;
//
// gvMx1zyBl
//
this.gvMx1zyBl.AppearanceCell.Options.UseFont = true;
this.gvMx1zyBl.Caption = "浣滀笟涓嶈壇閫�鏂�";
this.gvMx1zyBl.FieldName = "zyBl";
- this.gvMx1zyBl.MinWidth = 50;
+ this.gvMx1zyBl.MinWidth = 62;
this.gvMx1zyBl.Name = "gvMx1zyBl";
this.gvMx1zyBl.Tag = "query_a.zy_bl";
this.gvMx1zyBl.Visible = true;
this.gvMx1zyBl.VisibleIndex = 18;
- this.gvMx1zyBl.Width = 72;
+ this.gvMx1zyBl.Width = 90;
//
// gvMx1llBl
//
this.gvMx1llBl.AppearanceCell.Options.UseFont = true;
this.gvMx1llBl.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
this.gvMx1llBl.FieldName = "llBl";
- this.gvMx1llBl.MinWidth = 50;
+ this.gvMx1llBl.MinWidth = 62;
this.gvMx1llBl.Name = "gvMx1llBl";
this.gvMx1llBl.Tag = "query_a.ll_bl";
this.gvMx1llBl.Visible = true;
this.gvMx1llBl.VisibleIndex = 16;
- this.gvMx1llBl.Width = 58;
+ this.gvMx1llBl.Width = 72;
//
// gvMx1lpTl
//
this.gvMx1lpTl.AppearanceCell.Options.UseFont = true;
this.gvMx1lpTl.Caption = "鑹搧閫�鏂�";
this.gvMx1lpTl.FieldName = "lpTl";
- this.gvMx1lpTl.MinWidth = 50;
+ this.gvMx1lpTl.MinWidth = 62;
this.gvMx1lpTl.Name = "gvMx1lpTl";
this.gvMx1lpTl.Tag = "query_a.lp_tl";
this.gvMx1lpTl.Visible = true;
this.gvMx1lpTl.VisibleIndex = 17;
- this.gvMx1lpTl.Width = 58;
+ this.gvMx1lpTl.Width = 72;
//
// gvMx1dab021
//
this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
this.gvMx1dab021.Caption = "琛ユ枡鏁伴噺";
this.gvMx1dab021.FieldName = "blQty";
- this.gvMx1dab021.MinWidth = 50;
+ this.gvMx1dab021.MinWidth = 62;
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
this.gvMx1dab021.Visible = true;
this.gvMx1dab021.VisibleIndex = 14;
- this.gvMx1dab021.Width = 58;
+ this.gvMx1dab021.Width = 72;
//
// gvMx1dab010
//
this.gvMx1dab010.AppearanceCell.Options.UseFont = true;
this.gvMx1dab010.Caption = "鏉愭枡绫诲瀷";
this.gvMx1dab010.FieldName = "dab010";
- this.gvMx1dab010.MinWidth = 50;
+ this.gvMx1dab010.MinWidth = 62;
this.gvMx1dab010.Name = "gvMx1dab010";
this.gvMx1dab010.Tag = "query_a.dab010";
- this.gvMx1dab010.Width = 94;
+ this.gvMx1dab010.Width = 117;
//
// gvMx1dab011
//
this.gvMx1dab011.AppearanceCell.Options.UseFont = true;
this.gvMx1dab011.Caption = "涓绘枡";
this.gvMx1dab011.FieldName = "dab011";
- this.gvMx1dab011.MinWidth = 50;
+ this.gvMx1dab011.MinWidth = 62;
this.gvMx1dab011.Name = "gvMx1dab011";
this.gvMx1dab011.Tag = "query_a.dab011";
- this.gvMx1dab011.Width = 94;
+ this.gvMx1dab011.Width = 117;
//
// gvMx1dab013
//
this.gvMx1dab013.AppearanceCell.Options.UseFont = true;
this.gvMx1dab013.Caption = "搴曟暟";
this.gvMx1dab013.FieldName = "dab013";
- this.gvMx1dab013.MinWidth = 50;
+ this.gvMx1dab013.MinWidth = 62;
this.gvMx1dab013.Name = "gvMx1dab013";
this.gvMx1dab013.Tag = "query_a.dab013";
- this.gvMx1dab013.Width = 94;
+ this.gvMx1dab013.Width = 117;
//
// gvMx1dab015
//
this.gvMx1dab015.AppearanceCell.Options.UseFont = true;
this.gvMx1dab015.Caption = "鐐逛綅";
this.gvMx1dab015.FieldName = "dab015";
- this.gvMx1dab015.MinWidth = 50;
+ this.gvMx1dab015.MinWidth = 62;
this.gvMx1dab015.Name = "gvMx1dab015";
this.gvMx1dab015.Tag = "query_a.dab015";
- this.gvMx1dab015.Width = 94;
+ this.gvMx1dab015.Width = 117;
//
// gvMx1dab019
//
this.gvMx1dab019.AppearanceCell.Options.UseFont = true;
this.gvMx1dab019.Caption = "棰嗘枡鏂瑰紡";
this.gvMx1dab019.FieldName = "dab019";
- this.gvMx1dab019.MinWidth = 50;
+ this.gvMx1dab019.MinWidth = 62;
this.gvMx1dab019.Name = "gvMx1dab019";
this.gvMx1dab019.Tag = "query_a.dab019";
- this.gvMx1dab019.Width = 94;
+ this.gvMx1dab019.Width = 117;
//
// gvMx1dab020
//
this.gvMx1dab020.AppearanceCell.Options.UseFont = true;
this.gvMx1dab020.Caption = "瀹為鐢ㄩ噺";
this.gvMx1dab020.FieldName = "dab020";
- this.gvMx1dab020.MinWidth = 50;
+ this.gvMx1dab020.MinWidth = 62;
this.gvMx1dab020.Name = "gvMx1dab020";
this.gvMx1dab020.Tag = "query_a.dab020";
- this.gvMx1dab020.Width = 94;
+ this.gvMx1dab020.Width = 117;
//
// gvMx1dab022
//
this.gvMx1dab022.AppearanceCell.Options.UseFont = true;
this.gvMx1dab022.Caption = "閫�鏂欐�绘暟";
this.gvMx1dab022.FieldName = "ztsl";
- this.gvMx1dab022.MinWidth = 50;
+ this.gvMx1dab022.MinWidth = 62;
this.gvMx1dab022.Name = "gvMx1dab022";
this.gvMx1dab022.Tag = "query_a.dab022";
- this.gvMx1dab022.Width = 94;
+ this.gvMx1dab022.Width = 117;
//
// gvMx1dab023
//
this.gvMx1dab023.AppearanceCell.Options.UseFont = true;
this.gvMx1dab023.Caption = "瓒呴鏁伴噺";
this.gvMx1dab023.FieldName = "clQty";
- this.gvMx1dab023.MinWidth = 50;
+ this.gvMx1dab023.MinWidth = 62;
this.gvMx1dab023.Name = "gvMx1dab023";
this.gvMx1dab023.Tag = "query_a.dab023";
this.gvMx1dab023.Visible = true;
this.gvMx1dab023.VisibleIndex = 15;
- this.gvMx1dab023.Width = 58;
+ this.gvMx1dab023.Width = 72;
//
// gridColumn58
//
this.gridColumn58.Caption = "棰嗘枡杩涘害";
this.gridColumn58.FieldName = "barbl";
- this.gridColumn58.MinWidth = 25;
+ this.gridColumn58.MinWidth = 31;
this.gridColumn58.Name = "gridColumn58";
this.gridColumn58.Visible = true;
this.gridColumn58.VisibleIndex = 3;
- this.gridColumn58.Width = 94;
+ this.gridColumn58.Width = 117;
//
// panel1
//
this.panel1.Controls.Add(this.btnXls);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1648, 54);
+ this.panel1.Size = new System.Drawing.Size(2061, 66);
this.panel1.TabIndex = 1;
//
// btnXls
//
this.btnXls.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
- this.btnXls.Location = new System.Drawing.Point(10, 11);
+ this.btnXls.Location = new System.Drawing.Point(12, 13);
+ this.btnXls.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnXls.Name = "btnXls";
- this.btnXls.Size = new System.Drawing.Size(130, 29);
+ this.btnXls.Size = new System.Drawing.Size(162, 35);
this.btnXls.TabIndex = 0;
this.btnXls.Text = "瀵煎嚭澶囨枡鍗曡韩";
//
@@ -2174,17 +2218,20 @@
this.xtraTabPage6.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
this.xtraTabPage6.Appearance.Header.Options.UseForeColor = true;
this.xtraTabPage6.Controls.Add(this.gcMx6);
+ this.xtraTabPage6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage6.Name = "xtraTabPage6";
- this.xtraTabPage6.Size = new System.Drawing.Size(1648, 464);
+ this.xtraTabPage6.Size = new System.Drawing.Size(2060, 565);
this.xtraTabPage6.Text = "澶囨枡鏄庣粏";
//
// gcMx6
//
this.gcMx6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx6.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx6.Location = new System.Drawing.Point(0, 0);
this.gcMx6.MainView = this.gvMx6;
+ this.gcMx6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx6.Name = "gcMx6";
- this.gcMx6.Size = new System.Drawing.Size(1648, 464);
+ this.gcMx6.Size = new System.Drawing.Size(2060, 565);
this.gcMx6.TabIndex = 1;
this.gcMx6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx6});
@@ -2193,7 +2240,7 @@
//
this.gvMx6.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx6.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx6.ColumnPanelRowHeight = 50;
+ this.gvMx6.ColumnPanelRowHeight = 61;
this.gvMx6.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn2,
this.gridColumn9,
@@ -2206,6 +2253,7 @@
this.gridColumn8,
this.gridColumn50,
this.gridColumn51});
+ this.gvMx6.DetailHeight = 428;
this.gvMx6.GridControl = this.gcMx6;
this.gvMx6.Name = "gvMx6";
this.gvMx6.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2216,137 +2264,140 @@
//
this.gridColumn2.Caption = "gvMx1Guid";
this.gridColumn2.FieldName = "guid";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gridColumn9
//
this.gridColumn9.AppearanceCell.Options.UseFont = true;
this.gridColumn9.Caption = "宸ュ崟鍗曞彿";
this.gridColumn9.FieldName = "daa001";
- this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.MinWidth = 62;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "query_a.dab001";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// gridColumn11
//
this.gridColumn11.AppearanceCell.Options.UseFont = true;
this.gridColumn11.Caption = "鏉愭枡缂栫爜";
this.gridColumn11.FieldName = "itemNo";
- this.gridColumn11.MinWidth = 50;
+ this.gridColumn11.MinWidth = 62;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "query_a.dab003";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 1;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn20
//
this.gridColumn20.AppearanceCell.Options.UseFont = true;
this.gridColumn20.Caption = "鏉愭枡鍚嶇О";
this.gridColumn20.FieldName = "itemName";
- this.gridColumn20.MinWidth = 50;
+ this.gridColumn20.MinWidth = 62;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Tag = "query_a.dab004";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 2;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gridColumn26
//
this.gridColumn26.AppearanceCell.Options.UseFont = true;
this.gridColumn26.Caption = "鏉愭枡瑙勬牸";
this.gridColumn26.FieldName = "itemModel";
- this.gridColumn26.MinWidth = 50;
+ this.gridColumn26.MinWidth = 62;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Tag = "query_a.dab005";
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 3;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.Width = 117;
//
// gridColumn28
//
this.gridColumn28.Caption = "鐗╂枡鏉＄爜";
this.gridColumn28.FieldName = "itemBarcode";
- this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 4;
- this.gridColumn28.Width = 94;
+ this.gridColumn28.Width = 117;
//
// gridColumn29
//
this.gridColumn29.Caption = "鏉＄爜鏁伴噺";
this.gridColumn29.FieldName = "quantity";
- this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.MinWidth = 31;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 5;
- this.gridColumn29.Width = 94;
+ this.gridColumn29.Width = 117;
//
// gridColumn49
//
this.gridColumn49.Caption = "澶囨枡璇︽儏";
this.gridColumn49.FieldName = "blDetail";
- this.gridColumn49.MinWidth = 25;
+ this.gridColumn49.MinWidth = 31;
this.gridColumn49.Name = "gridColumn49";
this.gridColumn49.Visible = true;
this.gridColumn49.VisibleIndex = 6;
- this.gridColumn49.Width = 94;
+ this.gridColumn49.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "鏀舵枡璇︽儏";
this.gridColumn8.FieldName = "slDetail";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 7;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 117;
//
// gridColumn50
//
this.gridColumn50.Caption = "鎶曟枡璇︽儏";
this.gridColumn50.FieldName = "tlDetail";
- this.gridColumn50.MinWidth = 25;
+ this.gridColumn50.MinWidth = 31;
this.gridColumn50.Name = "gridColumn50";
this.gridColumn50.Visible = true;
this.gridColumn50.VisibleIndex = 8;
- this.gridColumn50.Width = 94;
+ this.gridColumn50.Width = 117;
//
// gridColumn51
//
this.gridColumn51.Caption = "閫�鏂欒鎯�";
this.gridColumn51.FieldName = "tuiDetail";
- this.gridColumn51.MinWidth = 25;
+ this.gridColumn51.MinWidth = 31;
this.gridColumn51.Name = "gridColumn51";
this.gridColumn51.Visible = true;
this.gridColumn51.VisibleIndex = 9;
- this.gridColumn51.Width = 94;
+ this.gridColumn51.Width = 117;
//
// xtraTabPage7
//
this.xtraTabPage7.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
this.xtraTabPage7.Appearance.Header.Options.UseForeColor = true;
this.xtraTabPage7.Controls.Add(this.gcMx7);
+ this.xtraTabPage7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage7.Name = "xtraTabPage7";
- this.xtraTabPage7.Size = new System.Drawing.Size(1648, 464);
+ this.xtraTabPage7.Size = new System.Drawing.Size(2060, 565);
this.xtraTabPage7.Text = "宸ュ簭鏄庣粏";
//
// gcMx7
//
this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx7.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
gridLevelNode1.RelationName = "Level1";
this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
gridLevelNode1});
this.gcMx7.Location = new System.Drawing.Point(0, 0);
this.gcMx7.MainView = this.gvMx7;
+ this.gcMx7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx7.Name = "gcMx7";
- this.gcMx7.Size = new System.Drawing.Size(1648, 464);
+ this.gcMx7.Size = new System.Drawing.Size(2060, 565);
this.gcMx7.TabIndex = 1;
this.gcMx7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx7});
@@ -2355,7 +2406,7 @@
//
this.gvMx7.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx7.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx7.ColumnPanelRowHeight = 50;
+ this.gvMx7.ColumnPanelRowHeight = 61;
this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1daa002,
this.gvMx1daa010,
@@ -2363,6 +2414,7 @@
this.gridColumn63,
this.gridColumn64,
this.gridColumn65});
+ this.gvMx7.DetailHeight = 428;
this.gvMx7.GridControl = this.gcMx7;
this.gvMx7.Name = "gvMx7";
this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -2374,92 +2426,95 @@
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "搴忓彿";
this.gvMx1daa002.FieldName = "fSeq";
- this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.MinWidth = 62;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa010";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 54;
+ this.gvMx1daa002.Width = 67;
//
// gvMx1daa010
//
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
this.gvMx1daa010.Caption = "宸ュ簭";
this.gvMx1daa010.FieldName = "processNo";
- this.gvMx1daa010.MinWidth = 50;
+ this.gvMx1daa010.MinWidth = 62;
this.gvMx1daa010.Name = "gvMx1daa010";
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
this.gvMx1daa010.VisibleIndex = 1;
- this.gvMx1daa010.Width = 129;
+ this.gvMx1daa010.Width = 161;
//
// gvMx1daa004
//
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "涓婂伐搴�";
this.gvMx1daa004.FieldName = "frontProcessNo";
- this.gvMx1daa004.MinWidth = 150;
+ this.gvMx1daa004.MinWidth = 187;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa010";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 2;
- this.gvMx1daa004.Width = 150;
+ this.gvMx1daa004.Width = 187;
//
// gridColumn63
//
this.gridColumn63.Caption = "鏄惁鍙繑宸�";
this.gridColumn63.FieldName = "isBack";
- this.gridColumn63.MinWidth = 25;
+ this.gridColumn63.MinWidth = 31;
this.gridColumn63.Name = "gridColumn63";
this.gridColumn63.OptionsColumn.ReadOnly = true;
this.gridColumn63.Tag = "query_a.daa010";
this.gridColumn63.Visible = true;
this.gridColumn63.VisibleIndex = 3;
- this.gridColumn63.Width = 94;
+ this.gridColumn63.Width = 117;
//
// gridColumn64
//
this.gridColumn64.Caption = "鏄惁杩旇拷婧爜";
this.gridColumn64.FieldName = "isZsm";
- this.gridColumn64.MinWidth = 25;
+ this.gridColumn64.MinWidth = 31;
this.gridColumn64.Name = "gridColumn64";
this.gridColumn64.OptionsColumn.ReadOnly = true;
this.gridColumn64.Tag = "query_a.daa010";
this.gridColumn64.Visible = true;
this.gridColumn64.VisibleIndex = 4;
- this.gridColumn64.Width = 94;
+ this.gridColumn64.Width = 117;
//
// gridColumn65
//
this.gridColumn65.Caption = "鏄惁杩旀墭鏉跨爜";
this.gridColumn65.FieldName = "isTbm";
- this.gridColumn65.MinWidth = 25;
+ this.gridColumn65.MinWidth = 31;
this.gridColumn65.Name = "gridColumn65";
this.gridColumn65.OptionsColumn.ReadOnly = true;
this.gridColumn65.Tag = "query_a.daa010";
this.gridColumn65.Visible = true;
this.gridColumn65.VisibleIndex = 5;
- this.gridColumn65.Width = 94;
+ this.gridColumn65.Width = 117;
//
// xtraTabPage8
//
this.xtraTabPage8.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
this.xtraTabPage8.Appearance.Header.Options.UseForeColor = true;
this.xtraTabPage8.Controls.Add(this.gcMx8);
+ this.xtraTabPage8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage8.Name = "xtraTabPage8";
- this.xtraTabPage8.Size = new System.Drawing.Size(1648, 464);
+ this.xtraTabPage8.Size = new System.Drawing.Size(2060, 565);
this.xtraTabPage8.Text = "鏁版嵁閲囬泦鏄庣粏";
//
// gcMx8
//
this.gcMx8.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx8.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx8.Location = new System.Drawing.Point(0, 0);
this.gcMx8.MainView = this.gvMx8;
+ this.gcMx8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx8.Name = "gcMx8";
- this.gcMx8.Size = new System.Drawing.Size(1648, 464);
+ this.gcMx8.Size = new System.Drawing.Size(2060, 565);
this.gcMx8.TabIndex = 1;
this.gcMx8.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx8});
@@ -2477,6 +2532,7 @@
this.gridColumn60,
this.gridColumn61,
this.gridColumn62});
+ this.gvMx8.DetailHeight = 428;
this.gvMx8.GridControl = this.gcMx8;
this.gvMx8.Name = "gvMx8";
this.gvMx8.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -2487,107 +2543,109 @@
//
this.gridColumn53.Caption = "guid";
this.gridColumn53.FieldName = "guid";
- this.gridColumn53.MinWidth = 25;
+ this.gridColumn53.MinWidth = 31;
this.gridColumn53.Name = "gridColumn53";
this.gridColumn53.OptionsColumn.ReadOnly = true;
- this.gridColumn53.Width = 94;
+ this.gridColumn53.Width = 117;
//
// gvMx2status
//
this.gvMx2status.AppearanceCell.Options.UseFont = true;
this.gvMx2status.Caption = "宸ュ崟缂栧彿";
this.gvMx2status.FieldName = "gdbh";
- this.gvMx2status.MinWidth = 10;
+ this.gvMx2status.MinWidth = 12;
this.gvMx2status.Name = "gvMx2status";
this.gvMx2status.OptionsColumn.ReadOnly = true;
this.gvMx2status.Tag = "query_a.status";
this.gvMx2status.Visible = true;
this.gvMx2status.VisibleIndex = 0;
- this.gvMx2status.Width = 50;
+ this.gvMx2status.Width = 62;
//
// gvMx2pbillNo
//
this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
this.gvMx2pbillNo.Caption = "杩芥函鐮�";
this.gvMx2pbillNo.FieldName = "barCode";
+ this.gvMx2pbillNo.MinWidth = 25;
this.gvMx2pbillNo.Name = "gvMx2pbillNo";
this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
this.gvMx2pbillNo.Tag = "query_a.pbill_no";
this.gvMx2pbillNo.Visible = true;
this.gvMx2pbillNo.VisibleIndex = 1;
- this.gvMx2pbillNo.Width = 94;
+ this.gvMx2pbillNo.Width = 117;
//
// gridColumn56
//
this.gridColumn56.Caption = "鏁伴噺";
this.gridColumn56.FieldName = "quantity";
- this.gridColumn56.MinWidth = 25;
+ this.gridColumn56.MinWidth = 31;
this.gridColumn56.Name = "gridColumn56";
this.gridColumn56.OptionsColumn.ReadOnly = true;
this.gridColumn56.Visible = true;
this.gridColumn56.VisibleIndex = 2;
- this.gridColumn56.Width = 94;
+ this.gridColumn56.Width = 117;
//
// gridColumn57
//
this.gridColumn57.Caption = "宸ュ簭";
this.gridColumn57.FieldName = "processNo";
- this.gridColumn57.MinWidth = 25;
+ this.gridColumn57.MinWidth = 31;
this.gridColumn57.Name = "gridColumn57";
this.gridColumn57.OptionsColumn.ReadOnly = true;
this.gridColumn57.Visible = true;
this.gridColumn57.VisibleIndex = 3;
- this.gridColumn57.Width = 94;
+ this.gridColumn57.Width = 117;
//
// gridColumn59
//
this.gridColumn59.Caption = "缁撴灉";
this.gridColumn59.FieldName = "checkResult";
- this.gridColumn59.MinWidth = 25;
+ this.gridColumn59.MinWidth = 31;
this.gridColumn59.Name = "gridColumn59";
this.gridColumn59.OptionsColumn.ReadOnly = true;
this.gridColumn59.Visible = true;
this.gridColumn59.VisibleIndex = 4;
- this.gridColumn59.Width = 94;
+ this.gridColumn59.Width = 117;
//
// gridColumn60
//
this.gridColumn60.Caption = "涓婃姤浜�";
this.gridColumn60.FieldName = "createBy";
- this.gridColumn60.MinWidth = 25;
+ this.gridColumn60.MinWidth = 31;
this.gridColumn60.Name = "gridColumn60";
this.gridColumn60.OptionsColumn.ReadOnly = true;
this.gridColumn60.Visible = true;
this.gridColumn60.VisibleIndex = 5;
- this.gridColumn60.Width = 94;
+ this.gridColumn60.Width = 117;
//
// gridColumn61
//
this.gridColumn61.Caption = "鏈�鍚庝笂鎶ユ椂闂�";
this.gridColumn61.FieldName = "createDate";
- this.gridColumn61.MinWidth = 25;
+ this.gridColumn61.MinWidth = 31;
this.gridColumn61.Name = "gridColumn61";
this.gridColumn61.OptionsColumn.ReadOnly = true;
this.gridColumn61.Visible = true;
this.gridColumn61.VisibleIndex = 6;
- this.gridColumn61.Width = 94;
+ this.gridColumn61.Width = 117;
//
// gridColumn62
//
this.gridColumn62.Caption = "鏁版嵁鐘舵��";
this.gridColumn62.FieldName = "bRemark";
- this.gridColumn62.MinWidth = 25;
+ this.gridColumn62.MinWidth = 31;
this.gridColumn62.Name = "gridColumn62";
this.gridColumn62.OptionsColumn.ReadOnly = true;
this.gridColumn62.Visible = true;
this.gridColumn62.VisibleIndex = 7;
- this.gridColumn62.Width = 94;
+ this.gridColumn62.Width = 117;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.splitMx99);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1648, 464);
+ this.tabMxPage2.Size = new System.Drawing.Size(2060, 565);
this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
//
// splitMx99
@@ -2595,6 +2653,7 @@
this.splitMx99.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx99.Horizontal = false;
this.splitMx99.Location = new System.Drawing.Point(0, 0);
+ this.splitMx99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx99.Name = "splitMx99";
//
// splitMx99.Panel1
@@ -2607,8 +2666,8 @@
this.splitMx99.Panel2.Controls.Add(this.gcMx2);
this.splitMx99.Panel2.Text = "Panel2";
this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx99.Size = new System.Drawing.Size(1648, 464);
- this.splitMx99.SplitterPosition = 83;
+ this.splitMx99.Size = new System.Drawing.Size(2060, 565);
+ this.splitMx99.SplitterPosition = 101;
this.splitMx99.TabIndex = 2;
//
// layoutMx99
@@ -2623,10 +2682,11 @@
this.layoutMx99.Controls.Add(this.txt_zQty);
this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx99.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx99.Name = "layoutMx99";
this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(475, 530, 812, 500);
this.layoutMx99.Root = this.layoutControlGroup1;
- this.layoutMx99.Size = new System.Drawing.Size(1648, 83);
+ this.layoutMx99.Size = new System.Drawing.Size(2060, 101);
this.layoutMx99.TabIndex = 0;
this.layoutMx99.Text = "layoutControl1";
//
@@ -2634,29 +2694,32 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(654, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(944, 52);
+ this.layShuLiang.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(317, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(461, 35);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
+ this.txt_iCount_1.Location = new System.Drawing.Point(107, 2);
+ this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(121, 28);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(337, 2);
+ this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(122, 28);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2681,7 +2744,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(461, 35);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2689,24 +2752,24 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(230, 35);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(230, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(231, 35);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(90, 22);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(973, 10);
+ this.radOut.Location = new System.Drawing.Point(1407, 12);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2715,7 +2778,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(321, 32);
+ this.radOut.Size = new System.Drawing.Size(465, 38);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
@@ -2723,29 +2786,31 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1407, 50);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(465, 39);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(1049, 14);
+ this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(356, 28);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(584, 52);
+ this.txt_printRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(356, 28);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2753,32 +2818,35 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(420, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(584, 14);
+ this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(356, 28);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(99, 44);
+ this.txt_yQty.Location = new System.Drawing.Point(119, 52);
+ this.txt_yQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(356, 28);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
//
// txt_zQty
//
- this.txt_zQty.Location = new System.Drawing.Point(99, 12);
+ this.txt_zQty.Location = new System.Drawing.Point(119, 14);
+ this.txt_zQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(356, 28);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2806,7 +2874,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 323D;
+ columnDefinition11.Width = 176D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2820,7 +2888,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(2060, 101);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2828,21 +2896,21 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(465, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(465, 38);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(1395, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(465, 38);
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
@@ -2852,12 +2920,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(1395, 38);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(465, 39);
this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2867,23 +2935,23 @@
this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem22.Control = this.txt_yQty;
- this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem22.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(465, 39);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(465, 38);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(465, 39);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem24
//
@@ -2891,21 +2959,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(930, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(465, 38);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(930, 38);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(465, 39);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2915,19 +2983,21 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(465, 38);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
- this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(90, 22);
//
// 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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptTuoBanNbz});
- this.gcMx2.Size = new System.Drawing.Size(1648, 369);
+ this.gcMx2.Size = new System.Drawing.Size(2060, 449);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2937,7 +3007,7 @@
this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx2.Appearance.Row.Options.UseFont = true;
- this.gvMx2.ColumnPanelRowHeight = 50;
+ this.gvMx2.ColumnPanelRowHeight = 61;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2guid,
this.gridColumn19,
@@ -2953,6 +3023,7 @@
this.gridColumn31,
this.gridColumn32,
this.gridColumn54});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2965,155 +3036,155 @@
this.gvMx2guid.AppearanceCell.Options.UseFont = true;
this.gvMx2guid.Caption = "guid ";
this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 50;
+ this.gvMx2guid.MinWidth = 62;
this.gvMx2guid.Name = "gvMx2guid";
this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 94;
+ this.gvMx2guid.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
this.gridColumn19.FieldName = "isRk";
- this.gridColumn19.MaxWidth = 50;
- this.gridColumn19.MinWidth = 50;
+ this.gridColumn19.MaxWidth = 62;
+ this.gridColumn19.MinWidth = 62;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 0;
- this.gridColumn19.Width = 50;
+ this.gridColumn19.Width = 62;
//
// gvMx2itemBarcode
//
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 = 1;
- this.gvMx2itemBarcode.Width = 94;
+ this.gvMx2itemBarcode.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.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
this.gvMx2quantity.Tag = "query_a.QUANTITY";
this.gvMx2quantity.Visible = true;
this.gvMx2quantity.VisibleIndex = 2;
- this.gvMx2quantity.Width = 94;
+ this.gvMx2quantity.Width = 117;
//
// gvMx2unit
//
this.gvMx2unit.AppearanceCell.Options.UseFont = true;
this.gvMx2unit.Caption = "鍗曚綅 ";
this.gvMx2unit.FieldName = "dwName";
- 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 = 3;
- this.gvMx2unit.Width = 94;
+ this.gvMx2unit.Width = 117;
//
// gridColumn18
//
this.gridColumn18.Caption = "鐗╂枡缂栫爜";
this.gridColumn18.FieldName = "itemNo";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 4;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.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 = 5;
- this.gvMx2itemSname.Width = 94;
+ this.gvMx2itemSname.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "鐗╂枡瑙勬牸";
this.gridColumn17.FieldName = "itemModel";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 6;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gvMx2createBy
//
this.gvMx2createBy.AppearanceCell.Options.UseFont = true;
this.gvMx2createBy.Caption = "鍒涘缓浜� ";
this.gvMx2createBy.FieldName = "createBy";
- this.gvMx2createBy.MinWidth = 50;
+ this.gvMx2createBy.MinWidth = 62;
this.gvMx2createBy.Name = "gvMx2createBy";
this.gvMx2createBy.Tag = "query_a.CREATE_BY";
this.gvMx2createBy.Visible = true;
this.gvMx2createBy.VisibleIndex = 7;
- this.gvMx2createBy.Width = 94;
+ this.gvMx2createBy.Width = 117;
//
// gvMx2createDate
//
this.gvMx2createDate.AppearanceCell.Options.UseFont = true;
this.gvMx2createDate.Caption = "鍒涘缓鏃堕棿 ";
this.gvMx2createDate.FieldName = "createDate";
- this.gvMx2createDate.MinWidth = 50;
+ this.gvMx2createDate.MinWidth = 62;
this.gvMx2createDate.Name = "gvMx2createDate";
this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
this.gvMx2createDate.Visible = true;
this.gvMx2createDate.VisibleIndex = 8;
- this.gvMx2createDate.Width = 94;
+ this.gvMx2createDate.Width = 117;
//
// gridColumn30
//
this.gridColumn30.Caption = "鍏ュ簱浜�";
this.gridColumn30.FieldName = "rkUser";
- this.gridColumn30.MinWidth = 25;
+ this.gridColumn30.MinWidth = 31;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
this.gridColumn30.VisibleIndex = 9;
- this.gridColumn30.Width = 94;
+ this.gridColumn30.Width = 117;
//
// gridColumn31
//
this.gridColumn31.Caption = "鍏ュ簱鏃ユ湡";
this.gridColumn31.FieldName = "rkDate";
- this.gridColumn31.MinWidth = 25;
+ this.gridColumn31.MinWidth = 31;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
this.gridColumn31.VisibleIndex = 10;
- this.gridColumn31.Width = 94;
+ this.gridColumn31.Width = 117;
//
// gridColumn32
//
this.gridColumn32.Caption = "鍏ュ簱浣�";
this.gridColumn32.FieldName = "rkPositon";
- this.gridColumn32.MinWidth = 25;
+ this.gridColumn32.MinWidth = 31;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 11;
- this.gridColumn32.Width = 94;
+ this.gridColumn32.Width = 117;
//
// gridColumn54
//
this.gridColumn54.Caption = "鍙樻洿鍐呭寘瑁呮暟閲�";
this.gridColumn54.ColumnEdit = this.rptTuoBanNbz;
- this.gridColumn54.MinWidth = 25;
+ this.gridColumn54.MinWidth = 31;
this.gridColumn54.Name = "gridColumn54";
this.gridColumn54.Visible = true;
this.gridColumn54.VisibleIndex = 12;
- this.gridColumn54.Width = 94;
+ this.gridColumn54.Width = 117;
//
// rptTuoBanNbz
//
@@ -3129,8 +3200,9 @@
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.splitMx98);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1648, 464);
+ this.xtraTabPage3.Size = new System.Drawing.Size(2060, 565);
this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
//
// splitMx98
@@ -3138,6 +3210,7 @@
this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx98.Horizontal = false;
this.splitMx98.Location = new System.Drawing.Point(0, 0);
+ this.splitMx98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx98.Name = "splitMx98";
//
// splitMx98.Panel1
@@ -3150,8 +3223,8 @@
this.splitMx98.Panel2.Controls.Add(this.gcMx3);
this.splitMx98.Panel2.Text = "Panel2";
this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx98.Size = new System.Drawing.Size(1648, 464);
- this.splitMx98.SplitterPosition = 60;
+ this.splitMx98.Size = new System.Drawing.Size(2060, 565);
+ this.splitMx98.SplitterPosition = 73;
this.splitMx98.TabIndex = 2;
//
// layoutMx98
@@ -3164,10 +3237,11 @@
this.layoutMx98.Controls.Add(this.txt_zQty98);
this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx98.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx98.Name = "layoutMx98";
this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 530, 812, 500);
this.layoutMx98.Root = this.layoutControlGroup2;
- this.layoutMx98.Size = new System.Drawing.Size(1648, 60);
+ this.layoutMx98.Size = new System.Drawing.Size(2060, 73);
this.layoutMx98.TabIndex = 0;
this.layoutMx98.Text = "layoutControl1";
//
@@ -3175,53 +3249,58 @@
//
this.ucBtnPrint98.allClickKey = null;
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(1025, 10);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(1282, 12);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(613, 40);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(766, 49);
this.ucBtnPrint98.TabIndex = 8;
//
// txt_yQty98
//
- this.txt_yQty98.Location = new System.Drawing.Point(317, 12);
+ this.txt_yQty98.Location = new System.Drawing.Point(391, 14);
+ this.txt_yQty98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yQty98.Name = "txt_yQty98";
this.txt_yQty98.Properties.ReadOnly = true;
- this.txt_yQty98.Size = new System.Drawing.Size(97, 24);
+ this.txt_yQty98.Size = new System.Drawing.Size(127, 28);
this.txt_yQty98.StyleController = this.layoutMx98;
this.txt_yQty98.TabIndex = 4;
//
// txt_kQty98
//
- this.txt_kQty98.Location = new System.Drawing.Point(520, 12);
+ this.txt_kQty98.Location = new System.Drawing.Point(645, 14);
+ this.txt_kQty98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_kQty98.Name = "txt_kQty98";
this.txt_kQty98.Properties.ReadOnly = true;
- this.txt_kQty98.Size = new System.Drawing.Size(97, 24);
+ this.txt_kQty98.Size = new System.Drawing.Size(127, 28);
this.txt_kQty98.StyleController = this.layoutMx98;
this.txt_kQty98.TabIndex = 5;
//
// txt_printRemark98
//
- this.txt_printRemark98.Location = new System.Drawing.Point(723, 12);
+ this.txt_printRemark98.Location = new System.Drawing.Point(899, 14);
+ this.txt_printRemark98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_printRemark98.Name = "txt_printRemark98";
- this.txt_printRemark98.Size = new System.Drawing.Size(97, 24);
+ this.txt_printRemark98.Size = new System.Drawing.Size(127, 28);
this.txt_printRemark98.StyleController = this.layoutMx98;
this.txt_printRemark98.TabIndex = 6;
//
// txt_iCount_98
//
- this.txt_iCount_98.Location = new System.Drawing.Point(926, 12);
+ this.txt_iCount_98.Location = new System.Drawing.Point(1153, 14);
+ this.txt_iCount_98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_iCount_98.Name = "txt_iCount_98";
- this.txt_iCount_98.Size = new System.Drawing.Size(97, 24);
+ this.txt_iCount_98.Size = new System.Drawing.Size(127, 28);
this.txt_iCount_98.StyleController = this.layoutMx98;
this.txt_iCount_98.TabIndex = 7;
//
// txt_zQty98
//
- this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
+ this.txt_zQty98.Location = new System.Drawing.Point(137, 14);
+ this.txt_zQty98.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_zQty98.Name = "txt_zQty98";
this.txt_zQty98.Properties.ReadOnly = true;
- this.txt_zQty98.Size = new System.Drawing.Size(97, 24);
+ this.txt_zQty98.Size = new System.Drawing.Size(127, 28);
this.txt_zQty98.StyleController = this.layoutMx98;
this.txt_zQty98.TabIndex = 9;
//
@@ -3267,18 +3346,18 @@
rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition10});
- this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 60);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(2060, 73);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.ucBtnPrint98;
- this.layoutControlItem34.Location = new System.Drawing.Point(1015, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(1270, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
this.layoutControlItem34.OptionsTableLayoutItem.ColumnSpan = 3;
this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem34.Size = new System.Drawing.Size(613, 40);
+ this.layoutControlItem34.Size = new System.Drawing.Size(766, 49);
this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
@@ -3286,59 +3365,61 @@
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_iCount_98;
- this.layoutControlItem33.Location = new System.Drawing.Point(812, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(1016, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem33.Size = new System.Drawing.Size(203, 40);
+ this.layoutControlItem33.Size = new System.Drawing.Size(254, 49);
this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_printRemark98;
- this.layoutControlItem32.Location = new System.Drawing.Point(609, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(762, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(203, 40);
+ this.layoutControlItem32.Size = new System.Drawing.Size(254, 49);
this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.txt_kQty98;
- this.layoutControlItem31.Location = new System.Drawing.Point(406, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(508, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.Size = new System.Drawing.Size(203, 40);
+ this.layoutControlItem31.Size = new System.Drawing.Size(254, 49);
this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txt_yQty98;
- this.layoutControlItem30.Location = new System.Drawing.Point(203, 0);
+ this.layoutControlItem30.Location = new System.Drawing.Point(254, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.Size = new System.Drawing.Size(203, 40);
+ this.layoutControlItem30.Size = new System.Drawing.Size(254, 49);
this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txt_zQty98;
this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
- this.layoutControlItem37.Size = new System.Drawing.Size(203, 40);
+ this.layoutControlItem37.Size = new System.Drawing.Size(254, 49);
this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
- this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(108, 22);
//
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx3.Location = new System.Drawing.Point(0, 0);
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(1648, 392);
+ this.gcMx3.Size = new System.Drawing.Size(2060, 477);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -3348,7 +3429,7 @@
this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx3.Appearance.Row.Options.UseFont = true;
- this.gvMx3.ColumnPanelRowHeight = 50;
+ this.gvMx3.ColumnPanelRowHeight = 61;
this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn33,
this.gridColumn38,
@@ -3359,6 +3440,7 @@
this.gridColumn34,
this.gridColumn35,
this.gridColumn55});
+ this.gvMx3.DetailHeight = 428;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3371,44 +3453,44 @@
this.gridColumn33.AppearanceCell.Options.UseFont = true;
this.gridColumn33.Caption = "guid ";
this.gridColumn33.FieldName = "guid";
- this.gridColumn33.MinWidth = 50;
+ this.gridColumn33.MinWidth = 62;
this.gridColumn33.Name = "gridColumn33";
this.gridColumn33.OptionsColumn.ReadOnly = true;
this.gridColumn33.Tag = "query_a.guid";
- this.gridColumn33.Width = 94;
+ this.gridColumn33.Width = 117;
//
// gridColumn38
//
this.gridColumn38.AppearanceCell.Options.UseFont = true;
this.gridColumn38.Caption = "宸ュ崟鍙�";
this.gridColumn38.FieldName = "daa001";
- this.gridColumn38.MinWidth = 50;
+ this.gridColumn38.MinWidth = 62;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.OptionsColumn.ReadOnly = true;
this.gridColumn38.Tag = "query_a.UNIT";
this.gridColumn38.Visible = true;
this.gridColumn38.VisibleIndex = 0;
- this.gridColumn38.Width = 94;
+ this.gridColumn38.Width = 117;
//
// gridColumn36
//
this.gridColumn36.AppearanceCell.Options.UseFont = true;
this.gridColumn36.Caption = "杩芥函鐮�";
this.gridColumn36.FieldName = "barCode";
- this.gridColumn36.MinWidth = 50;
+ this.gridColumn36.MinWidth = 62;
this.gridColumn36.Name = "gridColumn36";
this.gridColumn36.OptionsColumn.ReadOnly = true;
this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
this.gridColumn36.Visible = true;
this.gridColumn36.VisibleIndex = 1;
- this.gridColumn36.Width = 94;
+ this.gridColumn36.Width = 117;
//
// gridColumn37
//
this.gridColumn37.AppearanceCell.Options.UseFont = true;
this.gridColumn37.Caption = "鏁伴噺 ";
this.gridColumn37.FieldName = "quantity";
- this.gridColumn37.MinWidth = 50;
+ this.gridColumn37.MinWidth = 62;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.OptionsColumn.ReadOnly = true;
this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
@@ -3416,69 +3498,70 @@
this.gridColumn37.Tag = "query_a.QUANTITY";
this.gridColumn37.Visible = true;
this.gridColumn37.VisibleIndex = 2;
- this.gridColumn37.Width = 94;
+ this.gridColumn37.Width = 117;
//
// gridColumn42
//
this.gridColumn42.AppearanceCell.Options.UseFont = true;
this.gridColumn42.Caption = "鍒涘缓浜� ";
this.gridColumn42.FieldName = "createBy";
- this.gridColumn42.MinWidth = 50;
+ this.gridColumn42.MinWidth = 62;
this.gridColumn42.Name = "gridColumn42";
this.gridColumn42.OptionsColumn.ReadOnly = true;
this.gridColumn42.Tag = "query_a.CREATE_BY";
this.gridColumn42.Visible = true;
this.gridColumn42.VisibleIndex = 3;
- this.gridColumn42.Width = 94;
+ this.gridColumn42.Width = 117;
//
// gridColumn43
//
this.gridColumn43.AppearanceCell.Options.UseFont = true;
this.gridColumn43.Caption = "鍒涘缓鏃堕棿 ";
this.gridColumn43.FieldName = "createDate";
- this.gridColumn43.MinWidth = 50;
+ this.gridColumn43.MinWidth = 62;
this.gridColumn43.Name = "gridColumn43";
this.gridColumn43.OptionsColumn.ReadOnly = true;
this.gridColumn43.Tag = "query_a.CREATE_DATE";
this.gridColumn43.Visible = true;
this.gridColumn43.VisibleIndex = 4;
- this.gridColumn43.Width = 94;
+ this.gridColumn43.Width = 117;
//
// gridColumn34
//
this.gridColumn34.Caption = "绾垮埆ID";
this.gridColumn34.FieldName = "lineId";
- this.gridColumn34.MinWidth = 25;
+ this.gridColumn34.MinWidth = 31;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.OptionsColumn.ReadOnly = true;
- this.gridColumn34.Width = 94;
+ this.gridColumn34.Width = 117;
//
// gridColumn35
//
this.gridColumn35.Caption = "绾垮埆鍚嶇О";
this.gridColumn35.FieldName = "xtName";
- this.gridColumn35.MinWidth = 25;
+ this.gridColumn35.MinWidth = 31;
this.gridColumn35.Name = "gridColumn35";
this.gridColumn35.OptionsColumn.ReadOnly = true;
this.gridColumn35.Visible = true;
this.gridColumn35.VisibleIndex = 5;
- this.gridColumn35.Width = 94;
+ this.gridColumn35.Width = 117;
//
// gridColumn55
//
this.gridColumn55.Caption = "鏁版嵁鐘舵��";
this.gridColumn55.FieldName = "bRemark";
- this.gridColumn55.MinWidth = 25;
+ this.gridColumn55.MinWidth = 31;
this.gridColumn55.Name = "gridColumn55";
this.gridColumn55.Visible = true;
this.gridColumn55.VisibleIndex = 6;
- this.gridColumn55.Width = 94;
+ this.gridColumn55.Width = 117;
//
// xtraTabPage4
//
this.xtraTabPage4.Controls.Add(this.splitMx100);
+ this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(1648, 464);
+ this.xtraTabPage4.Size = new System.Drawing.Size(2060, 565);
this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
//
// splitMx100
@@ -3486,6 +3569,7 @@
this.splitMx100.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx100.Horizontal = false;
this.splitMx100.Location = new System.Drawing.Point(0, 0);
+ this.splitMx100.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx100.Name = "splitMx100";
//
// splitMx100.Panel1
@@ -3498,8 +3582,8 @@
this.splitMx100.Panel2.Controls.Add(this.gcMx4);
this.splitMx100.Panel2.Text = "Panel2";
this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx100.Size = new System.Drawing.Size(1648, 464);
- this.splitMx100.SplitterPosition = 60;
+ this.splitMx100.Size = new System.Drawing.Size(2060, 565);
+ this.splitMx100.SplitterPosition = 73;
this.splitMx100.TabIndex = 3;
//
// layMx100
@@ -3513,10 +3597,11 @@
this.layMx100.Controls.Add(this.btnDesign);
this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
this.layMx100.Location = new System.Drawing.Point(0, 0);
+ this.layMx100.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layMx100.Name = "layMx100";
this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(476, 530, 812, 500);
this.layMx100.Root = this.layoutControlGroup4;
- this.layMx100.Size = new System.Drawing.Size(1648, 60);
+ this.layMx100.Size = new System.Drawing.Size(2060, 73);
this.layMx100.TabIndex = 2;
this.layMx100.Text = "dataLayoutControl1";
//
@@ -3524,64 +3609,70 @@
//
this.ucBtnPrint100.allClickKey = null;
this.ucBtnPrint100.guidKey = null;
- this.ucBtnPrint100.Location = new System.Drawing.Point(914, 10);
+ this.ucBtnPrint100.Location = new System.Drawing.Point(1144, 12);
this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint100.Name = "ucBtnPrint100";
this.ucBtnPrint100.rptParameter = null;
- this.ucBtnPrint100.Size = new System.Drawing.Size(454, 40);
+ this.ucBtnPrint100.Size = new System.Drawing.Size(567, 49);
this.ucBtnPrint100.TabIndex = 0;
//
// btnIn
//
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
- this.btnIn.Location = new System.Drawing.Point(1370, 12);
+ this.btnIn.Location = new System.Drawing.Point(1713, 14);
+ this.btnIn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnIn.Name = "btnIn";
- this.btnIn.Size = new System.Drawing.Size(116, 27);
+ this.btnIn.Size = new System.Drawing.Size(146, 32);
this.btnIn.StyleController = this.layMx100;
this.btnIn.TabIndex = 1;
this.btnIn.Text = "瀵煎叆鍚庣洊鐮�";
//
// txt_zQty100
//
- this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
+ this.txt_zQty100.Location = new System.Drawing.Point(137, 14);
+ this.txt_zQty100.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_zQty100.Name = "txt_zQty100";
this.txt_zQty100.Properties.ReadOnly = true;
- this.txt_zQty100.Size = new System.Drawing.Size(120, 24);
+ this.txt_zQty100.Size = new System.Drawing.Size(156, 28);
this.txt_zQty100.StyleController = this.layMx100;
this.txt_zQty100.TabIndex = 4;
//
// txt_yQty100
//
- this.txt_yQty100.Location = new System.Drawing.Point(340, 12);
+ this.txt_yQty100.Location = new System.Drawing.Point(420, 14);
+ this.txt_yQty100.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yQty100.Name = "txt_yQty100";
this.txt_yQty100.Properties.ReadOnly = true;
- this.txt_yQty100.Size = new System.Drawing.Size(120, 24);
+ this.txt_yQty100.Size = new System.Drawing.Size(156, 28);
this.txt_yQty100.StyleController = this.layMx100;
this.txt_yQty100.TabIndex = 5;
//
// txt_kQty100
//
- this.txt_kQty100.Location = new System.Drawing.Point(566, 12);
+ this.txt_kQty100.Location = new System.Drawing.Point(703, 14);
+ this.txt_kQty100.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_kQty100.Name = "txt_kQty100";
this.txt_kQty100.Properties.ReadOnly = true;
- this.txt_kQty100.Size = new System.Drawing.Size(120, 24);
+ this.txt_kQty100.Size = new System.Drawing.Size(156, 28);
this.txt_kQty100.StyleController = this.layMx100;
this.txt_kQty100.TabIndex = 6;
//
// txt_iCount_100
//
- this.txt_iCount_100.Location = new System.Drawing.Point(792, 12);
+ this.txt_iCount_100.Location = new System.Drawing.Point(986, 14);
+ this.txt_iCount_100.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_iCount_100.Name = "txt_iCount_100";
- this.txt_iCount_100.Size = new System.Drawing.Size(120, 24);
+ this.txt_iCount_100.Size = new System.Drawing.Size(156, 28);
this.txt_iCount_100.StyleController = this.layMx100;
this.txt_iCount_100.TabIndex = 7;
//
// btnDesign
//
this.btnDesign.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x16;
- this.btnDesign.Location = new System.Drawing.Point(1490, 12);
+ this.btnDesign.Location = new System.Drawing.Point(1863, 14);
+ this.btnDesign.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnDesign.Name = "btnDesign";
- this.btnDesign.Size = new System.Drawing.Size(146, 27);
+ this.btnDesign.Size = new System.Drawing.Size(183, 32);
this.btnDesign.StyleController = this.layMx100;
this.btnDesign.TabIndex = 8;
this.btnDesign.Text = "缁存姢瀹㈡埛妯℃澘";
@@ -3613,9 +3704,9 @@
columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition25.Width = 100D;
columnDefinition26.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition26.Width = 120D;
+ columnDefinition26.Width = 150D;
columnDefinition27.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition27.Width = 150D;
+ columnDefinition27.Width = 187D;
this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition20,
columnDefinition21,
@@ -3629,7 +3720,7 @@
rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition11});
- this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 60);
+ this.layoutControlGroup4.Size = new System.Drawing.Size(2060, 73);
this.layoutControlGroup4.TextVisible = false;
//
// layoutControlItem42
@@ -3637,38 +3728,38 @@
this.layoutControlItem42.Control = this.txt_zQty100;
this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem42.Name = "layoutControlItem42";
- this.layoutControlItem42.Size = new System.Drawing.Size(226, 40);
+ this.layoutControlItem42.Size = new System.Drawing.Size(283, 49);
this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
- this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem42.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem43
//
this.layoutControlItem43.Control = this.txt_yQty100;
- this.layoutControlItem43.Location = new System.Drawing.Point(226, 0);
+ this.layoutControlItem43.Location = new System.Drawing.Point(283, 0);
this.layoutControlItem43.Name = "layoutControlItem43";
this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem43.Size = new System.Drawing.Size(226, 40);
+ this.layoutControlItem43.Size = new System.Drawing.Size(283, 49);
this.layoutControlItem43.Text = "宸叉墦鍗版暟";
- this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem43.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem44
//
this.layoutControlItem44.Control = this.txt_kQty100;
this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
- this.layoutControlItem44.Location = new System.Drawing.Point(452, 0);
+ this.layoutControlItem44.Location = new System.Drawing.Point(566, 0);
this.layoutControlItem44.Name = "layoutControlItem44";
this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem44.Size = new System.Drawing.Size(226, 40);
+ this.layoutControlItem44.Size = new System.Drawing.Size(283, 49);
this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
- this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem44.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.btnIn;
- this.layoutControlItem2.Location = new System.Drawing.Point(1358, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(1699, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 6;
- this.layoutControlItem2.Size = new System.Drawing.Size(120, 40);
+ this.layoutControlItem2.Size = new System.Drawing.Size(150, 49);
this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem2.TextVisible = false;
@@ -3676,12 +3767,12 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.ucBtnPrint100;
- this.layoutControlItem10.Location = new System.Drawing.Point(904, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1132, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem10.Size = new System.Drawing.Size(454, 40);
+ this.layoutControlItem10.Size = new System.Drawing.Size(567, 49);
this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -3689,20 +3780,20 @@
// layoutControlItem45
//
this.layoutControlItem45.Control = this.txt_iCount_100;
- this.layoutControlItem45.Location = new System.Drawing.Point(678, 0);
+ this.layoutControlItem45.Location = new System.Drawing.Point(849, 0);
this.layoutControlItem45.Name = "layoutControlItem45";
this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem45.Size = new System.Drawing.Size(226, 40);
+ this.layoutControlItem45.Size = new System.Drawing.Size(283, 49);
this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
- this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem45.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem47
//
this.layoutControlItem47.Control = this.btnDesign;
- this.layoutControlItem47.Location = new System.Drawing.Point(1478, 0);
+ this.layoutControlItem47.Location = new System.Drawing.Point(1849, 0);
this.layoutControlItem47.Name = "layoutControlItem47";
this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 7;
- this.layoutControlItem47.Size = new System.Drawing.Size(150, 40);
+ this.layoutControlItem47.Size = new System.Drawing.Size(187, 49);
this.layoutControlItem47.Text = "瀹㈡埛妯℃澘";
this.layoutControlItem47.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem47.TextVisible = false;
@@ -3710,10 +3801,12 @@
// gcMx4
//
this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx4.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx4.Location = new System.Drawing.Point(0, 0);
this.gcMx4.MainView = this.gvMx4;
+ this.gcMx4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx4.Name = "gcMx4";
- this.gcMx4.Size = new System.Drawing.Size(1648, 392);
+ this.gcMx4.Size = new System.Drawing.Size(2060, 477);
this.gcMx4.TabIndex = 2;
this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx4});
@@ -3723,7 +3816,7 @@
this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx4.Appearance.Row.Options.UseFont = true;
- this.gvMx4.ColumnPanelRowHeight = 50;
+ this.gvMx4.ColumnPanelRowHeight = 61;
this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn39,
this.gridColumn40,
@@ -3733,6 +3826,7 @@
this.gridColumn46,
this.gridColumn47,
this.gridColumn48});
+ this.gvMx4.DetailHeight = 428;
this.gvMx4.GridControl = this.gcMx4;
this.gvMx4.Name = "gvMx4";
this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3745,44 +3839,44 @@
this.gridColumn39.AppearanceCell.Options.UseFont = true;
this.gridColumn39.Caption = "guid ";
this.gridColumn39.FieldName = "guid";
- this.gridColumn39.MinWidth = 50;
+ this.gridColumn39.MinWidth = 62;
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.OptionsColumn.ReadOnly = true;
this.gridColumn39.Tag = "query_a.guid";
- this.gridColumn39.Width = 94;
+ this.gridColumn39.Width = 117;
//
// gridColumn40
//
this.gridColumn40.AppearanceCell.Options.UseFont = true;
this.gridColumn40.Caption = "宸ュ崟鍙�";
this.gridColumn40.FieldName = "daa001";
- this.gridColumn40.MinWidth = 50;
+ this.gridColumn40.MinWidth = 62;
this.gridColumn40.Name = "gridColumn40";
this.gridColumn40.OptionsColumn.ReadOnly = true;
this.gridColumn40.Tag = "query_a.UNIT";
this.gridColumn40.Visible = true;
this.gridColumn40.VisibleIndex = 0;
- this.gridColumn40.Width = 94;
+ this.gridColumn40.Width = 117;
//
// gridColumn41
//
this.gridColumn41.AppearanceCell.Options.UseFont = true;
this.gridColumn41.Caption = "鍚庣洊鐮�";
this.gridColumn41.FieldName = "itemBarcode";
- this.gridColumn41.MinWidth = 50;
+ this.gridColumn41.MinWidth = 62;
this.gridColumn41.Name = "gridColumn41";
this.gridColumn41.OptionsColumn.ReadOnly = true;
this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
this.gridColumn41.Visible = true;
this.gridColumn41.VisibleIndex = 1;
- this.gridColumn41.Width = 94;
+ this.gridColumn41.Width = 117;
//
// gridColumn44
//
this.gridColumn44.AppearanceCell.Options.UseFont = true;
this.gridColumn44.Caption = "鏁伴噺 ";
this.gridColumn44.FieldName = "quantity";
- this.gridColumn44.MinWidth = 50;
+ this.gridColumn44.MinWidth = 62;
this.gridColumn44.Name = "gridColumn44";
this.gridColumn44.OptionsColumn.ReadOnly = true;
this.gridColumn44.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
@@ -3790,82 +3884,84 @@
this.gridColumn44.Tag = "query_a.QUANTITY";
this.gridColumn44.Visible = true;
this.gridColumn44.VisibleIndex = 2;
- this.gridColumn44.Width = 94;
+ this.gridColumn44.Width = 117;
//
// gridColumn45
//
this.gridColumn45.AppearanceCell.Options.UseFont = true;
this.gridColumn45.Caption = "鍒涘缓浜� ";
this.gridColumn45.FieldName = "createBy";
- this.gridColumn45.MinWidth = 50;
+ this.gridColumn45.MinWidth = 62;
this.gridColumn45.Name = "gridColumn45";
this.gridColumn45.OptionsColumn.ReadOnly = true;
this.gridColumn45.Tag = "query_a.CREATE_BY";
this.gridColumn45.Visible = true;
this.gridColumn45.VisibleIndex = 3;
- this.gridColumn45.Width = 94;
+ this.gridColumn45.Width = 117;
//
// gridColumn46
//
this.gridColumn46.AppearanceCell.Options.UseFont = true;
this.gridColumn46.Caption = "鍒涘缓鏃堕棿 ";
this.gridColumn46.FieldName = "createDate";
- this.gridColumn46.MinWidth = 50;
+ this.gridColumn46.MinWidth = 62;
this.gridColumn46.Name = "gridColumn46";
this.gridColumn46.OptionsColumn.ReadOnly = true;
this.gridColumn46.Tag = "query_a.CREATE_DATE";
this.gridColumn46.Visible = true;
this.gridColumn46.VisibleIndex = 4;
- this.gridColumn46.Width = 94;
+ this.gridColumn46.Width = 117;
//
// gridColumn47
//
this.gridColumn47.Caption = "宸茬粦鎵樻澘鐮�";
this.gridColumn47.FieldName = "aboutTbBarcode";
- this.gridColumn47.MinWidth = 25;
+ this.gridColumn47.MinWidth = 31;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.OptionsColumn.ReadOnly = true;
this.gridColumn47.Visible = true;
this.gridColumn47.VisibleIndex = 5;
- this.gridColumn47.Width = 94;
+ this.gridColumn47.Width = 117;
//
// gridColumn48
//
this.gridColumn48.Caption = "宸茬粦杩芥函鐮�";
this.gridColumn48.FieldName = "aboutTracBarcode";
- this.gridColumn48.MinWidth = 25;
+ this.gridColumn48.MinWidth = 31;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.OptionsColumn.ReadOnly = true;
this.gridColumn48.Visible = true;
this.gridColumn48.VisibleIndex = 6;
- this.gridColumn48.Width = 94;
+ this.gridColumn48.Width = 117;
//
// xtraTabPage5
//
this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
+ this.xtraTabPage5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage5.Name = "xtraTabPage5";
this.xtraTabPage5.PageVisible = false;
- this.xtraTabPage5.Size = new System.Drawing.Size(1648, 464);
+ this.xtraTabPage5.Size = new System.Drawing.Size(2060, 565);
this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
//
// ucBtnPrint101
//
this.ucBtnPrint101.allClickKey = null;
this.ucBtnPrint101.guidKey = null;
- this.ucBtnPrint101.Location = new System.Drawing.Point(7, 19);
+ this.ucBtnPrint101.Location = new System.Drawing.Point(9, 23);
this.ucBtnPrint101.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint101.Name = "ucBtnPrint101";
this.ucBtnPrint101.rptParameter = null;
- this.ucBtnPrint101.Size = new System.Drawing.Size(581, 32);
+ this.ucBtnPrint101.Size = new System.Drawing.Size(726, 39);
this.ucBtnPrint101.TabIndex = 0;
//
// Frm_Womdaa
//
- 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(1652, 820);
+ this.ClientSize = new System.Drawing.Size(2065, 1002);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_Womdaa";
this.Text = "鐢熶骇宸ュ崟";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 3c4e214..3c956f1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -55,7 +55,7 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -70,7 +70,7 @@
this.txt_erpSczz = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
this.txt_pba009 = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_userName = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -137,7 +137,7 @@
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -174,9 +174,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -184,10 +185,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(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,
@@ -196,8 +198,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -206,6 +209,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -218,17 +222,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 = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(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});
@@ -238,7 +244,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_fstatus,
this.gridColumn4,
@@ -246,13 +252,14 @@
this.gridColumn2,
this.gv_checkUser,
this.gv_checkDate,
- this.gv_pba005,
+ this.gv_userName,
this.gv_pba006,
this.gv_pba009,
this.gridColumn5,
this.gridColumn8});
+ 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;
@@ -263,140 +270,148 @@
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MaxWidth = 50;
- this.gv_fstatus.MinWidth = 50;
+ this.gv_fstatus.MaxWidth = 62;
+ this.gv_fstatus.MinWidth = 62;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
this.gv_fstatus.VisibleIndex = 0;
- this.gv_fstatus.Width = 50;
+ this.gv_fstatus.Width = 62;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐢熶骇缁勭粐";
this.gridColumn4.FieldName = "fSubsidiary";
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "org.fnamber";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 250;
+ this.gridColumn4.Width = 312;
//
// gridColumn1
//
this.gridColumn1.Caption = "杞﹂棿鍚嶇О";
this.gridColumn1.FieldName = "dptName";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "鎺掍骇鍗曞彿";
this.gridColumn2.FieldName = "hNo";
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 3;
- this.gridColumn2.Width = 150;
+ this.gridColumn2.Width = 187;
//
// 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.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 4;
- this.gv_checkUser.Width = 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.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 = 5;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.Width = 225;
//
- // gv_pba005
+ // gv_userName
//
- this.gv_pba005.AppearanceCell.Options.UseFont = true;
- this.gv_pba005.Caption = "鍒涘缓浜�";
- this.gv_pba005.FieldName = "pba005";
- this.gv_pba005.Name = "gv_pba005";
- this.gv_pba005.OptionsColumn.AllowEdit = false;
- this.gv_pba005.Tag = "query_a.pba005";
- this.gv_pba005.Visible = true;
- this.gv_pba005.VisibleIndex = 6;
- this.gv_pba005.Width = 94;
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "鍒涘缓浜�";
+ this.gv_userName.FieldName = "userName";
+ this.gv_userName.MinWidth = 25;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Tag = "query_a.userName";
+ this.gv_userName.Visible = true;
+ this.gv_userName.VisibleIndex = 6;
+ this.gv_userName.Width = 117;
//
// gv_pba006
//
this.gv_pba006.AppearanceCell.Options.UseFont = true;
this.gv_pba006.Caption = "鍒涘缓鏃堕棿";
this.gv_pba006.FieldName = "pba006";
+ this.gv_pba006.MinWidth = 25;
this.gv_pba006.Name = "gv_pba006";
this.gv_pba006.OptionsColumn.AllowEdit = false;
this.gv_pba006.Tag = "query_a.pba006";
this.gv_pba006.Visible = true;
this.gv_pba006.VisibleIndex = 7;
- this.gv_pba006.Width = 180;
+ this.gv_pba006.Width = 225;
//
// gv_pba009
//
this.gv_pba009.AppearanceCell.Options.UseFont = true;
this.gv_pba009.Caption = "澶囨敞";
this.gv_pba009.FieldName = "pba009";
+ this.gv_pba009.MinWidth = 25;
this.gv_pba009.Name = "gv_pba009";
this.gv_pba009.OptionsColumn.AllowEdit = false;
this.gv_pba009.Tag = "query_a.pba009";
this.gv_pba009.Visible = true;
this.gv_pba009.VisibleIndex = 8;
- this.gv_pba009.Width = 100;
+ this.gv_pba009.Width = 125;
//
// gridColumn5
//
this.gridColumn5.Caption = "涓婚敭GUID";
this.gridColumn5.FieldName = "guid";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "鍏宠仈宸ュ崟鍙�";
this.gridColumn8.FieldName = "aboutDaa";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 9;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.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);
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
@@ -404,6 +419,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -416,8 +432,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 = 109;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 133;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -428,25 +444,27 @@
this.layoutMx1.Controls.Add(this.txt_erpSczz);
this.layoutMx1.Controls.Add(this.txt_hNo);
this.layoutMx1.Controls.Add(this.txt_pba009);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_userName);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_fstatus);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(816, 394, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 109);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 133);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 99);
+ this.lbGuid.Location = new System.Drawing.Point(1050, 121);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 40);
+ this.lbGuid.Size = new System.Drawing.Size(342, 49);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -454,9 +472,10 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 74);
+ this.btnSelect.Location = new System.Drawing.Point(12, 88);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(101, 27);
+ this.btnSelect.Size = new System.Drawing.Size(127, 34);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 456;
this.btnSelect.Text = "閫夊彇鎶曟枡鍗�";
@@ -464,64 +483,71 @@
// txt_pba013
//
this.txt_pba013.IsReadly = false;
- this.txt_pba013.Location = new System.Drawing.Point(89, 43);
+ this.txt_pba013.Location = new System.Drawing.Point(102, 50);
+ this.txt_pba013.Margin = new System.Windows.Forms.Padding(5);
this.txt_pba013.Name = "txt_pba013";
- this.txt_pba013.Size = new System.Drawing.Size(195, 24);
+ this.txt_pba013.Size = new System.Drawing.Size(246, 28);
this.txt_pba013.TabIndex = 459;
//
// txt_erpSczz
//
this.txt_erpSczz.IsReadly = false;
- this.txt_erpSczz.Location = new System.Drawing.Point(89, 12);
+ this.txt_erpSczz.Location = new System.Drawing.Point(102, 12);
+ this.txt_erpSczz.Margin = new System.Windows.Forms.Padding(5);
this.txt_erpSczz.Name = "txt_erpSczz";
- this.txt_erpSczz.Size = new System.Drawing.Size(195, 24);
+ this.txt_erpSczz.Size = new System.Drawing.Size(246, 28);
this.txt_erpSczz.TabIndex = 460;
//
// txt_hNo
//
- this.txt_hNo.Location = new System.Drawing.Point(365, 12);
+ this.txt_hNo.Location = new System.Drawing.Point(442, 12);
+ this.txt_hNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_hNo.Name = "txt_hNo";
this.txt_hNo.Properties.Appearance.Options.UseFont = true;
- this.txt_hNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_hNo.Size = new System.Drawing.Size(246, 28);
this.txt_hNo.StyleController = this.layoutMx1;
this.txt_hNo.TabIndex = 458;
this.txt_hNo.Tag = "readonly";
//
// txt_pba009
//
- this.txt_pba009.Location = new System.Drawing.Point(365, 43);
+ this.txt_pba009.Location = new System.Drawing.Point(442, 50);
+ this.txt_pba009.Margin = new System.Windows.Forms.Padding(4);
this.txt_pba009.Name = "txt_pba009";
this.txt_pba009.Properties.Appearance.Options.UseFont = true;
- this.txt_pba009.Size = new System.Drawing.Size(471, 24);
+ this.txt_pba009.Size = new System.Drawing.Size(586, 28);
this.txt_pba009.StyleController = this.layoutMx1;
this.txt_pba009.TabIndex = 240;
//
- // txt_checkUser
+ // txt_userName
//
- this.txt_checkUser.Location = new System.Drawing.Point(917, 12);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 273;
- this.txt_checkUser.Tag = "readonly";
+ this.txt_userName.Location = new System.Drawing.Point(1122, 12);
+ this.txt_userName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_userName.Name = "txt_userName";
+ this.txt_userName.Properties.Appearance.Options.UseFont = true;
+ this.txt_userName.Size = new System.Drawing.Size(248, 28);
+ this.txt_userName.StyleController = this.layoutMx1;
+ this.txt_userName.TabIndex = 273;
+ this.txt_userName.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(641, 12);
+ this.txt_checkDate.Location = new System.Drawing.Point(782, 12);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(195, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(246, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 267;
this.txt_checkDate.Tag = "readonly";
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(840, 43);
+ this.txt_fstatus.Location = new System.Drawing.Point(1032, 50);
+ this.txt_fstatus.Margin = new System.Windows.Forms.Padding(4);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(274, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(338, 27);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 461;
this.txt_fstatus.Tag = "readonly";
@@ -576,7 +602,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1126, 113);
+ this.Root.Size = new System.Drawing.Size(1382, 134);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -584,58 +610,58 @@
this.layoutControlItem1.Control = this.txt_erpSczz;
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(340, 38);
this.layoutControlItem1.Text = "鐢熶骇缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_hNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(340, 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(340, 38);
this.layoutControlItem2.Text = "鎺掍骇缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_checkDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(680, 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(340, 38);
this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_pba013;
- 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(340, 38);
this.layoutControlItem4.Text = "宸ヤ綔杞﹂棿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.txt_checkUser;
- this.layoutControlItem5.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem5.Control = this.txt_userName;
+ this.layoutControlItem5.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(342, 38);
this.layoutControlItem5.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fstatus;
- this.layoutControlItem6.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1020, 38);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(342, 38);
this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
@@ -643,24 +669,24 @@
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_pba009;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(340, 38);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(680, 38);
this.layoutControlItem7.Text = "鎺掍骇澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.btnSelect;
- this.layoutControlItem8.Location = new System.Drawing.Point(0, 62);
- this.layoutControlItem8.MaxSize = new System.Drawing.Size(105, 31);
- this.layoutControlItem8.MinSize = new System.Drawing.Size(105, 31);
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 76);
+ this.layoutControlItem8.MaxSize = new System.Drawing.Size(131, 38);
+ this.layoutControlItem8.MinSize = new System.Drawing.Size(131, 38);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem8.Text = "閫夋嫨鎶曟枡鍗�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
@@ -670,9 +696,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);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 449);
+ this.tabMx.Size = new System.Drawing.Size(1408, 550);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -680,15 +707,18 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 512);
this.tabMxPage1.Text = "浠诲姟鍗曟槑缁�";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemDateEdit2,
@@ -696,7 +726,7 @@
this.rptJYBZ,
this.repositoryItemDateEdit3,
this.repositoryItemComboBox1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 417);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 512);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -705,7 +735,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.caaGuid,
@@ -729,6 +759,7 @@
this.gridColumn6,
this.gvMxDel,
this.gridColumn7});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -740,85 +771,85 @@
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.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 117;
//
// caaGuid
//
this.caaGuid.Caption = "caaGuid";
this.caaGuid.FieldName = "caaGuid";
- this.caaGuid.MinWidth = 25;
+ this.caaGuid.MinWidth = 31;
this.caaGuid.Name = "caaGuid";
this.caaGuid.OptionsColumn.ReadOnly = true;
- this.caaGuid.Width = 94;
+ this.caaGuid.Width = 117;
//
// gvMx1daa002
//
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
this.gvMx1daa002.FieldName = "daa001";
- this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.MinWidth = 62;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 50;
+ this.gvMx1daa002.Width = 62;
//
// gvMx1daa010
//
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
this.gvMx1daa010.FieldName = "daa021";
- this.gvMx1daa010.MinWidth = 50;
+ this.gvMx1daa010.MinWidth = 62;
this.gvMx1daa010.Name = "gvMx1daa010";
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
this.gvMx1daa010.VisibleIndex = 1;
- this.gvMx1daa010.Width = 50;
+ this.gvMx1daa010.Width = 62;
//
// gvMx1daa005
//
this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
this.gvMx1daa005.FieldName = "itemNo";
- this.gvMx1daa005.MinWidth = 50;
+ this.gvMx1daa005.MinWidth = 62;
this.gvMx1daa005.Name = "gvMx1daa005";
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
this.gvMx1daa005.VisibleIndex = 2;
- this.gvMx1daa005.Width = 50;
+ this.gvMx1daa005.Width = 62;
//
// gvMx1daa003
//
this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
this.gvMx1daa003.FieldName = "daa003";
- this.gvMx1daa003.MinWidth = 50;
+ this.gvMx1daa003.MinWidth = 62;
this.gvMx1daa003.Name = "gvMx1daa003";
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "query_a.daa003";
this.gvMx1daa003.Visible = true;
this.gvMx1daa003.VisibleIndex = 3;
- this.gvMx1daa003.Width = 50;
+ this.gvMx1daa003.Width = 62;
//
// gvMx1daa004
//
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
this.gvMx1daa004.FieldName = "daa004";
- this.gvMx1daa004.MinWidth = 50;
+ this.gvMx1daa004.MinWidth = 62;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 4;
- this.gvMx1daa004.Width = 50;
+ this.gvMx1daa004.Width = 62;
//
// gvMx1daa016
//
@@ -830,12 +861,12 @@
this.gvMx1daa016.Caption = "Mes棰勮寮�宸�";
this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
this.gvMx1daa016.FieldName = "mesStartProd";
- this.gvMx1daa016.MinWidth = 50;
+ this.gvMx1daa016.MinWidth = 62;
this.gvMx1daa016.Name = "gvMx1daa016";
this.gvMx1daa016.Tag = "edit";
this.gvMx1daa016.Visible = true;
this.gvMx1daa016.VisibleIndex = 6;
- this.gvMx1daa016.Width = 78;
+ this.gvMx1daa016.Width = 97;
//
// repositoryItemDateEdit2
//
@@ -861,12 +892,12 @@
this.gvMx1daa018.Caption = "Mes棰勮瀹屽伐";
this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;
this.gvMx1daa018.FieldName = "mesEndProd";
- this.gvMx1daa018.MinWidth = 50;
+ this.gvMx1daa018.MinWidth = 62;
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "edit";
this.gvMx1daa018.Visible = true;
this.gvMx1daa018.VisibleIndex = 7;
- this.gvMx1daa018.Width = 50;
+ this.gvMx1daa018.Width = 62;
//
// repositoryItemDateEdit3
//
@@ -882,56 +913,56 @@
this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
this.gvMx1daa008.Caption = "宸ュ崟鎬绘暟";
this.gvMx1daa008.FieldName = "caa012";
- this.gvMx1daa008.MaxWidth = 50;
- this.gvMx1daa008.MinWidth = 50;
+ this.gvMx1daa008.MaxWidth = 62;
+ this.gvMx1daa008.MinWidth = 62;
this.gvMx1daa008.Name = "gvMx1daa008";
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
this.gvMx1daa008.VisibleIndex = 8;
- this.gvMx1daa008.Width = 50;
+ this.gvMx1daa008.Width = 62;
//
// gvMx1daa006
//
this.gvMx1daa006.AppearanceCell.Options.UseFont = true;
this.gvMx1daa006.Caption = "鍗曚綅";
this.gvMx1daa006.FieldName = "fname";
- this.gvMx1daa006.MaxWidth = 50;
- this.gvMx1daa006.MinWidth = 50;
+ this.gvMx1daa006.MaxWidth = 62;
+ this.gvMx1daa006.MinWidth = 62;
this.gvMx1daa006.Name = "gvMx1daa006";
this.gvMx1daa006.OptionsColumn.ReadOnly = true;
this.gvMx1daa006.Tag = "query_a.daa006";
this.gvMx1daa006.Visible = true;
this.gvMx1daa006.VisibleIndex = 9;
- this.gvMx1daa006.Width = 50;
+ this.gvMx1daa006.Width = 62;
//
// gvMx1daa007
//
this.gvMx1daa007.AppearanceCell.Options.UseFont = true;
this.gvMx1daa007.Caption = "宸叉帓";
this.gvMx1daa007.FieldName = "yp";
- this.gvMx1daa007.MaxWidth = 50;
- this.gvMx1daa007.MinWidth = 50;
+ this.gvMx1daa007.MaxWidth = 62;
+ this.gvMx1daa007.MinWidth = 62;
this.gvMx1daa007.Name = "gvMx1daa007";
this.gvMx1daa007.OptionsColumn.ReadOnly = true;
this.gvMx1daa007.Tag = "query_a.daa007";
this.gvMx1daa007.Visible = true;
this.gvMx1daa007.VisibleIndex = 10;
- this.gvMx1daa007.Width = 50;
+ this.gvMx1daa007.Width = 62;
//
// gvMx1daa009
//
this.gvMx1daa009.AppearanceCell.Options.UseFont = true;
this.gvMx1daa009.Caption = "鏈帓";
this.gvMx1daa009.FieldName = "wp";
- this.gvMx1daa009.MaxWidth = 50;
- this.gvMx1daa009.MinWidth = 50;
+ this.gvMx1daa009.MaxWidth = 62;
+ this.gvMx1daa009.MinWidth = 62;
this.gvMx1daa009.Name = "gvMx1daa009";
this.gvMx1daa009.OptionsColumn.ReadOnly = true;
this.gvMx1daa009.Tag = "query_a.daa009";
this.gvMx1daa009.Visible = true;
this.gvMx1daa009.VisibleIndex = 11;
- this.gvMx1daa009.Width = 50;
+ this.gvMx1daa009.Width = 62;
//
// gvMx1daa011
//
@@ -942,13 +973,12 @@
this.gvMx1daa011.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa011.Caption = "鏈鎺掓暟閲�";
this.gvMx1daa011.FieldName = "daa008";
- this.gvMx1daa011.MaxWidth = 50;
- this.gvMx1daa011.MinWidth = 60;
+ this.gvMx1daa011.MaxWidth = 62;
+ this.gvMx1daa011.MinWidth = 75;
this.gvMx1daa011.Name = "gvMx1daa011";
this.gvMx1daa011.Tag = "";
this.gvMx1daa011.Visible = true;
this.gvMx1daa011.VisibleIndex = 12;
- this.gvMx1daa011.Width = 60;
//
// gvMx1daa012
//
@@ -960,12 +990,12 @@
this.gvMx1daa012.Caption = "绾垮埆缂栫爜";
this.gvMx1daa012.ColumnEdit = this.rptJYBZ;
this.gvMx1daa012.FieldName = "daa015LineName";
- this.gvMx1daa012.MinWidth = 150;
+ this.gvMx1daa012.MinWidth = 187;
this.gvMx1daa012.Name = "gvMx1daa012";
this.gvMx1daa012.Tag = "edit";
this.gvMx1daa012.Visible = true;
this.gvMx1daa012.VisibleIndex = 13;
- this.gvMx1daa012.Width = 153;
+ this.gvMx1daa012.Width = 191;
//
// rptJYBZ
//
@@ -986,66 +1016,66 @@
this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1reporttime.Caption = "澶囨敞";
this.gvMx1reporttime.FieldName = "daa009";
- this.gvMx1reporttime.MinWidth = 50;
+ this.gvMx1reporttime.MinWidth = 62;
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
this.gvMx1reporttime.VisibleIndex = 14;
- this.gvMx1reporttime.Width = 102;
+ this.gvMx1reporttime.Width = 127;
//
// gvMx1daa014
//
this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
this.gvMx1daa014.Caption = "鎶曟枡鍗曞崟鍙�";
this.gvMx1daa014.FieldName = "daa014";
- this.gvMx1daa014.MinWidth = 50;
+ this.gvMx1daa014.MinWidth = 62;
this.gvMx1daa014.Name = "gvMx1daa014";
this.gvMx1daa014.OptionsColumn.ReadOnly = true;
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
this.gvMx1daa014.VisibleIndex = 15;
- this.gvMx1daa014.Width = 51;
+ this.gvMx1daa014.Width = 64;
//
// gridColumn3
//
this.gridColumn3.Caption = "绾夸綋ID";
this.gridColumn3.FieldName = "daa015";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gvMx1fstatus
//
this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
this.gvMx1fstatus.FieldName = "caa015";
- this.gvMx1fstatus.MinWidth = 50;
+ this.gvMx1fstatus.MinWidth = 62;
this.gvMx1fstatus.Name = "gvMx1fstatus";
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
this.gvMx1fstatus.Visible = true;
this.gvMx1fstatus.VisibleIndex = 16;
- this.gvMx1fstatus.Width = 76;
+ this.gvMx1fstatus.Width = 95;
//
// gridColumn6
//
this.gridColumn6.Caption = "娆″簭";
this.gridColumn6.FieldName = "scheduleOrder";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 17;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 80;
+ this.gvMxDel.MinWidth = 100;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 18;
- this.gvMxDel.Width = 84;
+ this.gvMxDel.Width = 105;
//
// repositoryItemButtonEdit1
//
@@ -1067,12 +1097,12 @@
this.gridColumn7.Caption = "鐢熶骇绫诲瀷";
this.gridColumn7.ColumnEdit = this.repositoryItemComboBox1;
this.gridColumn7.FieldName = "daa025";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "edit";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 5;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// repositoryItemComboBox1
//
@@ -1093,9 +1123,10 @@
// picCheckBox
//
this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
- this.picCheckBox.Location = new System.Drawing.Point(1024, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1280, 67);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
@@ -1103,12 +1134,13 @@
//
// Frm_Wompba
//
- 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);
this.Name = "Frm_Wompba";
this.Text = "鎵归噺鎺掍骇";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1132,7 +1164,7 @@
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -1175,7 +1207,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba006;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba009;
private UserControls.Data.UcPageBar pageBar1;
@@ -1188,7 +1220,7 @@
private DevExpress.XtraEditors.TextEdit txt_hNo;
private DevExpress.XtraEditors.SimpleButton btnSelect;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
+ private DevExpress.XtraEditors.TextEdit txt_userName;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_pba009;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
--
Gitblit v1.9.3