From 48c17b1d7da4ce9a7143963fad8e6ab7c29958c8 Mon Sep 17 00:00:00 2001 From: kyy <3283105747@qq.com> Date: 星期四, 24 七月 2025 08:13:38 +0800 Subject: [PATCH] 1、到货条码打印、采购入库单新增字段入库类型 2、检验接收水平扩展 3、多选框优化 --- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 675 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 390 insertions(+), 285 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs index d6899bd..285eb82 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs @@ -48,11 +48,6 @@ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -157,6 +152,14 @@ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -173,10 +176,8 @@ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); - this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -262,10 +263,12 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -277,9 +280,10 @@ this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1346, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1178, 62); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -287,10 +291,11 @@ // xtraTabControl1 // this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); + this.xtraTabControl1.Location = new System.Drawing.Point(0, 62); + this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1346, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(1178, 468); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -299,8 +304,9 @@ // xtraTabPage1 // this.xtraTabPage1.Controls.Add(this.split1); + this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1176, 442); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -309,6 +315,7 @@ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); + this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.split1.Name = "split1"; // // split1.Panel1 @@ -321,17 +328,19 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1344, 570); + this.split1.Size = new System.Drawing.Size(1176, 442); 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(3, 2, 3, 2); this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; + this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1344, 519); + this.gcMain1.Size = new System.Drawing.Size(1176, 402); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -343,7 +352,7 @@ this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true; this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.gridView1.ColumnPanelRowHeight = 50; + this.gridView1.ColumnPanelRowHeight = 39; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn13, this.gv_urgentFlag, @@ -361,8 +370,9 @@ this.gv_fstatus, this.gridColumn11, this.gv_checkDate}); + this.gridView1.DetailHeight = 272; this.gridView1.GridControl = this.gcMain1; - this.gridView1.IndicatorWidth = 50; + this.gridView1.IndicatorWidth = 44; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; @@ -372,212 +382,213 @@ // this.gridColumn13.Caption = "鏀舵枡缁勭粐"; this.gridColumn13.FieldName = "receivingOrg"; - this.gridColumn13.MinWidth = 50; + this.gridColumn13.MinWidth = 44; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Tag = "org.fnamber"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 0; - this.gridColumn13.Width = 250; + this.gridColumn13.Width = 219; // // gv_urgentFlag // this.gv_urgentFlag.AppearanceCell.Options.UseFont = true; this.gv_urgentFlag.Caption = "鎬ユ枡"; this.gv_urgentFlag.FieldName = "urgentFlag"; - this.gv_urgentFlag.MaxWidth = 50; - this.gv_urgentFlag.MinWidth = 50; + this.gv_urgentFlag.MaxWidth = 44; + this.gv_urgentFlag.MinWidth = 44; this.gv_urgentFlag.Name = "gv_urgentFlag"; this.gv_urgentFlag.OptionsColumn.AllowEdit = false; this.gv_urgentFlag.Tag = "query_a.urgent_flag"; this.gv_urgentFlag.Visible = true; this.gv_urgentFlag.VisibleIndex = 1; - this.gv_urgentFlag.Width = 50; + this.gv_urgentFlag.Width = 44; // // gridColumn25 // this.gridColumn25.Caption = "濮斿"; this.gridColumn25.FieldName = "fType"; - this.gridColumn25.MinWidth = 25; + this.gridColumn25.MinWidth = 22; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; this.gridColumn25.VisibleIndex = 2; - this.gridColumn25.Width = 94; + this.gridColumn25.Width = 82; // // gv_status // this.gv_status.AppearanceCell.Options.UseFont = true; this.gv_status.Caption = "鍏ュ簱"; this.gv_status.FieldName = "statusChk"; - this.gv_status.MaxWidth = 50; - this.gv_status.MinWidth = 50; + this.gv_status.MaxWidth = 44; + this.gv_status.MinWidth = 44; this.gv_status.Name = "gv_status"; this.gv_status.OptionsColumn.AllowEdit = false; this.gv_status.Tag = "query_a.status"; this.gv_status.Visible = true; this.gv_status.VisibleIndex = 3; - this.gv_status.Width = 50; + this.gv_status.Width = 44; // // gv_billNo // this.gv_billNo.AppearanceCell.Options.UseFont = true; this.gv_billNo.Caption = "鍒拌揣鍗曞彿"; this.gv_billNo.FieldName = "billNo"; - this.gv_billNo.MinWidth = 50; + this.gv_billNo.MinWidth = 44; 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 = 4; - this.gv_billNo.Width = 120; + this.gv_billNo.Width = 105; // // gridColumn1 // this.gridColumn1.Caption = "鏉$爜鎵撳嵃姣旂巼"; this.gridColumn1.FieldName = "barRatio"; - this.gridColumn1.MaxWidth = 80; - this.gridColumn1.MinWidth = 80; + this.gridColumn1.MaxWidth = 70; + this.gridColumn1.MinWidth = 70; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.OptionsColumn.AllowEdit = false; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 5; - this.gridColumn1.Width = 80; + this.gridColumn1.Width = 70; // // gv_createBy // this.gv_createBy.AppearanceCell.Options.UseFont = true; this.gv_createBy.Caption = "鍒涘缓浜�"; this.gv_createBy.FieldName = "createBy"; - this.gv_createBy.MinWidth = 50; + this.gv_createBy.MinWidth = 44; 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 = 6; - this.gv_createBy.Width = 94; + this.gv_createBy.Width = 82; // // gridColumn26 // this.gridColumn26.Caption = "鍒涘缓鏃ユ湡"; this.gridColumn26.FieldName = "createDate"; - this.gridColumn26.MinWidth = 25; + this.gridColumn26.MinWidth = 22; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; this.gridColumn26.VisibleIndex = 7; - this.gridColumn26.Width = 94; + this.gridColumn26.Width = 82; // // gv_suppNo // this.gv_suppNo.AppearanceCell.Options.UseFont = true; this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�"; this.gv_suppNo.FieldName = "suppNo"; - this.gv_suppNo.MinWidth = 50; + this.gv_suppNo.MinWidth = 44; this.gv_suppNo.Name = "gv_suppNo"; this.gv_suppNo.OptionsColumn.AllowEdit = false; this.gv_suppNo.Tag = "query_a.supp_no"; this.gv_suppNo.Visible = true; this.gv_suppNo.VisibleIndex = 8; - this.gv_suppNo.Width = 94; + this.gv_suppNo.Width = 82; // // gridColumn2 // this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�"; this.gridColumn2.FieldName = "suppName"; - this.gridColumn2.MinWidth = 50; + this.gridColumn2.MinWidth = 44; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 9; - this.gridColumn2.Width = 200; + this.gridColumn2.Width = 175; // // gv_depotsCode // this.gv_depotsCode.AppearanceCell.Options.UseFont = true; this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栫爜"; this.gv_depotsCode.FieldName = "depotsCode"; - this.gv_depotsCode.MinWidth = 50; + this.gv_depotsCode.MinWidth = 44; this.gv_depotsCode.Name = "gv_depotsCode"; this.gv_depotsCode.OptionsColumn.AllowEdit = false; this.gv_depotsCode.Tag = "query_a.depots_code"; this.gv_depotsCode.Visible = true; this.gv_depotsCode.VisibleIndex = 10; - this.gv_depotsCode.Width = 94; + this.gv_depotsCode.Width = 82; // // gridColumn3 // this.gridColumn3.Caption = "鏀惰揣浠撳簱鍚嶇О"; this.gridColumn3.FieldName = "depotName"; - this.gridColumn3.MinWidth = 25; + this.gridColumn3.MinWidth = 22; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.OptionsColumn.AllowEdit = false; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 11; - this.gridColumn3.Width = 94; + this.gridColumn3.Width = 82; // // gv_remark // this.gv_remark.AppearanceCell.Options.UseFont = true; this.gv_remark.Caption = "澶囨敞"; this.gv_remark.FieldName = "remark"; - this.gv_remark.MinWidth = 50; + this.gv_remark.MinWidth = 44; this.gv_remark.Name = "gv_remark"; this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; this.gv_remark.Visible = true; this.gv_remark.VisibleIndex = 12; - this.gv_remark.Width = 94; + this.gv_remark.Width = 82; // // gv_fstatus // 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 = 44; + this.gv_fstatus.MinWidth = 44; this.gv_fstatus.Name = "gv_fstatus"; this.gv_fstatus.OptionsColumn.AllowEdit = false; this.gv_fstatus.Tag = "query_a.fstatus"; - this.gv_fstatus.Width = 50; + this.gv_fstatus.Width = 44; // // gridColumn11 // this.gridColumn11.Caption = "瀹℃牳浜�"; this.gridColumn11.FieldName = "checkUser"; - this.gridColumn11.MinWidth = 25; + this.gridColumn11.MinWidth = 22; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 13; - this.gridColumn11.Width = 94; + this.gridColumn11.Width = 82; // // gv_checkDate // this.gv_checkDate.AppearanceCell.Options.UseFont = true; this.gv_checkDate.Caption = "瀹℃牳鏃堕棿"; this.gv_checkDate.FieldName = "checkDate"; - this.gv_checkDate.MinWidth = 50; + this.gv_checkDate.MinWidth = 44; 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 = 157; // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 519); - this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.pageBar1.Location = new System.Drawing.Point(0, 402); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1344, 39); + this.pageBar1.Size = new System.Drawing.Size(1176, 30); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // // xtraTabPage2 // this.xtraTabPage2.Controls.Add(this.splitMx1); + this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(1176, 442); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -585,6 +596,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); + this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 @@ -597,8 +609,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(1344, 570); - this.splitMx1.SplitterPosition = 140; + this.splitMx1.Size = new System.Drawing.Size(1176, 442); + this.splitMx1.SplitterPosition = 109; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -620,126 +632,139 @@ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem14}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); + this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(638, 441, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1344, 140); + this.layoutMx1.Size = new System.Drawing.Size(1176, 109); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(989, 108); + this.lbGuid.Location = new System.Drawing.Point(865, 84); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(322, 28); + this.lbGuid.Size = new System.Drawing.Size(282, 22); this.lbGuid.TabIndex = 471; this.lbGuid.Text = "lbGuid"; // // txt_dptName // - this.txt_dptName.Location = new System.Drawing.Point(445, 42); + this.txt_dptName.Location = new System.Drawing.Point(380, 36); + this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_dptName.Name = "txt_dptName"; this.txt_dptName.Properties.Appearance.Options.UseFont = true; - this.txt_dptName.Size = new System.Drawing.Size(225, 24); + this.txt_dptName.Size = new System.Drawing.Size(197, 20); this.txt_dptName.StyleController = this.layoutMx1; this.txt_dptName.TabIndex = 468; // // txt_gysNo // - this.txt_gysNo.Location = new System.Drawing.Point(114, 72); + this.txt_gysNo.Location = new System.Drawing.Point(96, 60); + this.txt_gysNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_gysNo.Name = "txt_gysNo"; this.txt_gysNo.Properties.Appearance.Options.UseFont = true; - this.txt_gysNo.Size = new System.Drawing.Size(225, 24); + this.txt_gysNo.Size = new System.Drawing.Size(196, 20); this.txt_gysNo.StyleController = this.layoutMx1; this.txt_gysNo.TabIndex = 467; // // txt_depotsCode // - this.txt_depotsCode.Location = new System.Drawing.Point(445, 72); + this.txt_depotsCode.Location = new System.Drawing.Point(380, 60); + this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_depotsCode.Name = "txt_depotsCode"; this.txt_depotsCode.Properties.Appearance.Options.UseFont = true; - this.txt_depotsCode.Size = new System.Drawing.Size(225, 24); + this.txt_depotsCode.Size = new System.Drawing.Size(197, 20); this.txt_depotsCode.StyleController = this.layoutMx1; this.txt_depotsCode.TabIndex = 462; // // txt_barcodeProgress // - this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 72); + this.txt_barcodeProgress.Location = new System.Drawing.Point(665, 60); + this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_barcodeProgress.Name = "txt_barcodeProgress"; this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true; - this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24); + this.txt_barcodeProgress.Size = new System.Drawing.Size(197, 20); this.txt_barcodeProgress.StyleController = this.layoutMx1; this.txt_barcodeProgress.TabIndex = 342; // // txt_paperBillNo // - this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12); + this.txt_paperBillNo.Location = new System.Drawing.Point(380, 12); + this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_paperBillNo.Name = "txt_paperBillNo"; this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true; - this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24); + this.txt_paperBillNo.Size = new System.Drawing.Size(197, 20); this.txt_paperBillNo.StyleController = this.layoutMx1; this.txt_paperBillNo.TabIndex = 463; // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(114, 12); + this.txt_billNo.Location = new System.Drawing.Point(96, 12); + this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(225, 24); + this.txt_billNo.Size = new System.Drawing.Size(196, 20); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; // // txt_gysName // - this.txt_gysName.Location = new System.Drawing.Point(114, 42); + this.txt_gysName.Location = new System.Drawing.Point(96, 36); + this.txt_gysName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_gysName.Name = "txt_gysName"; this.txt_gysName.Properties.Appearance.Options.UseFont = true; - this.txt_gysName.Size = new System.Drawing.Size(225, 24); + this.txt_gysName.Size = new System.Drawing.Size(196, 20); this.txt_gysName.StyleController = this.layoutMx1; this.txt_gysName.TabIndex = 459; // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(776, 12); + this.txt_createBy.Location = new System.Drawing.Point(665, 12); + this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Options.UseFont = true; - this.txt_createBy.Size = new System.Drawing.Size(225, 24); + this.txt_createBy.Size = new System.Drawing.Size(197, 20); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 217; // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(114, 102); + this.txt_remark.Location = new System.Drawing.Point(96, 84); + this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(556, 24); + this.txt_remark.Size = new System.Drawing.Size(481, 20); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 235; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(776, 42); + this.txt_createDate.Location = new System.Drawing.Point(665, 36); + this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(225, 24); + this.txt_createDate.Size = new System.Drawing.Size(197, 20); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 252; // // txt_fType // - this.txt_fType.Location = new System.Drawing.Point(1005, 12); + this.txt_fType.Location = new System.Drawing.Point(866, 12); + this.txt_fType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fType.Name = "txt_fType"; this.txt_fType.Properties.Caption = "濮斿鏍囪瘑"; - this.txt_fType.Size = new System.Drawing.Size(327, 24); + this.txt_fType.Size = new System.Drawing.Size(281, 20); this.txt_fType.StyleController = this.layoutMx1; this.txt_fType.TabIndex = 469; // // txt_urgentFlag // - this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 42); + this.txt_urgentFlag.Location = new System.Drawing.Point(866, 36); + this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_urgentFlag.Name = "txt_urgentFlag"; this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑"; - this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24); + this.txt_urgentFlag.Size = new System.Drawing.Size(281, 20); this.txt_urgentFlag.StyleController = this.layoutMx1; this.txt_urgentFlag.TabIndex = 470; // @@ -800,7 +825,7 @@ rowDefinition2, rowDefinition3, rowDefinition4}); - this.Root.Size = new System.Drawing.Size(1344, 140); + this.Root.Size = new System.Drawing.Size(1159, 116); this.Root.TextVisible = false; // // layoutControlItem1 @@ -808,102 +833,102 @@ 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(331, 30); + this.layoutControlItem1.Size = new System.Drawing.Size(284, 24); this.layoutControlItem1.Text = "鍒拌揣鍗曞彿"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_gysName; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 30); + this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem2.Size = new System.Drawing.Size(284, 24); this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_gysNo; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 60); + this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem3.Size = new System.Drawing.Size(284, 24); this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_paperBillNo; - this.layoutControlItem4.Location = new System.Drawing.Point(331, 0); + this.layoutControlItem4.Location = new System.Drawing.Point(284, 0); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem4.Size = new System.Drawing.Size(285, 24); this.layoutControlItem4.Text = "閫佽揣鍗曞彿"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_dptName; - this.layoutControlItem5.Location = new System.Drawing.Point(331, 30); + this.layoutControlItem5.Location = new System.Drawing.Point(284, 24); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem5.Size = new System.Drawing.Size(285, 24); this.layoutControlItem5.Text = "浠撳簱鍚嶇О"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_depotsCode; - this.layoutControlItem6.Location = new System.Drawing.Point(331, 60); + this.layoutControlItem6.Location = new System.Drawing.Point(284, 48); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem6.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem6.Size = new System.Drawing.Size(285, 24); this.layoutControlItem6.Text = "浠撳簱缂栧彿"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_createBy; - this.layoutControlItem7.Location = new System.Drawing.Point(662, 0); + this.layoutControlItem7.Location = new System.Drawing.Point(569, 0); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem7.Size = new System.Drawing.Size(285, 24); this.layoutControlItem7.Text = "鍒涘缓浜哄憳"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_createDate; this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡"; - this.layoutControlItem8.Location = new System.Drawing.Point(662, 30); + this.layoutControlItem8.Location = new System.Drawing.Point(569, 24); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem8.Size = new System.Drawing.Size(285, 24); this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_remark; - this.layoutControlItem12.Location = new System.Drawing.Point(0, 90); + this.layoutControlItem12.Location = new System.Drawing.Point(0, 72); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(662, 30); + this.layoutControlItem12.Size = new System.Drawing.Size(569, 24); this.layoutControlItem12.Text = "鏀舵枡澶囨敞"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_fType; - this.layoutControlItem10.Location = new System.Drawing.Point(993, 0); + this.layoutControlItem10.Location = new System.Drawing.Point(854, 0); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem10.Size = new System.Drawing.Size(285, 24); this.layoutControlItem10.Text = "鎻愪氦鐘舵��"; this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; @@ -911,11 +936,11 @@ // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_urgentFlag; - this.layoutControlItem11.Location = new System.Drawing.Point(993, 30); + this.layoutControlItem11.Location = new System.Drawing.Point(854, 24); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem11.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem11.Size = new System.Drawing.Size(285, 24); this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑"; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; @@ -923,21 +948,22 @@ // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_barcodeProgress; - this.layoutControlItem13.Location = new System.Drawing.Point(662, 60); + this.layoutControlItem13.Location = new System.Drawing.Point(569, 48); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem13.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem13.Size = new System.Drawing.Size(285, 24); this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14); // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMx.Location = new System.Drawing.Point(0, 0); + this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1344, 418); + this.tabMx.Size = new System.Drawing.Size(1176, 323); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -946,8 +972,9 @@ // tabMxPage1 // this.tabMxPage1.Controls.Add(this.split99); + this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1342, 386); + this.tabMxPage1.Size = new System.Drawing.Size(1174, 297); this.tabMxPage1.Text = "鏉ユ枡鏄庣粏"; // // split99 @@ -955,6 +982,7 @@ this.split99.Dock = System.Windows.Forms.DockStyle.Fill; this.split99.Horizontal = false; this.split99.Location = new System.Drawing.Point(0, 0); + this.split99.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.split99.Name = "split99"; // // split99.Panel1 @@ -967,8 +995,8 @@ this.split99.Panel2.Controls.Add(this.gcMx1); this.split99.Panel2.Text = "Panel2"; this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split99.Size = new System.Drawing.Size(1342, 386); - this.split99.SplitterPosition = 116; + this.split99.Size = new System.Drawing.Size(1174, 297); + this.split99.SplitterPosition = 90; this.split99.TabIndex = 2; // // layout99 @@ -988,10 +1016,11 @@ this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem24}); this.layout99.Location = new System.Drawing.Point(0, 0); + this.layout99.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.layout99.Name = "layout99"; this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500); this.layout99.Root = this.layoutControlGroup1; - this.layout99.Size = new System.Drawing.Size(1342, 116); + this.layout99.Size = new System.Drawing.Size(1174, 90); this.layout99.TabIndex = 0; this.layout99.Text = "layoutControl1"; // @@ -999,21 +1028,23 @@ // this.layoutControl1.Controls.Add(this.txt_iCount_1); this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(692, 55); + this.layoutControl1.Location = new System.Drawing.Point(580, 68); + this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup2; - this.layoutControl1.Size = new System.Drawing.Size(336, 28); + this.layoutControl1.Size = new System.Drawing.Size(280, 24); this.layoutControl1.TabIndex = 477; this.layoutControl1.Text = "layoutControl1"; // // txt_iCount_1 // - this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); + this.txt_iCount_1.Location = new System.Drawing.Point(86, 2); + this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_iCount_1.Name = "txt_iCount_1"; this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; this.txt_iCount_1.Properties.ReadOnly = true; this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true; - this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); + this.txt_iCount_1.Size = new System.Drawing.Size(52, 20); this.txt_iCount_1.StyleController = this.layoutControl1; this.txt_iCount_1.TabIndex = 264; this.txt_iCount_1.Tag = "ReadOnly"; @@ -1021,10 +1052,11 @@ // // txt_yuliang_1 // - this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); + this.txt_yuliang_1.Location = new System.Drawing.Point(226, 2); + this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_yuliang_1.Name = "txt_yuliang_1"; this.txt_yuliang_1.Properties.ReadOnly = true; - this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); + this.txt_yuliang_1.Size = new System.Drawing.Size(52, 20); this.txt_yuliang_1.StyleController = this.layoutControl1; this.txt_yuliang_1.TabIndex = 265; // @@ -1049,7 +1081,7 @@ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition5}); this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28); + this.layoutControlGroup2.Size = new System.Drawing.Size(280, 24); this.layoutControlGroup2.TextVisible = false; // // layoutControlItem26 @@ -1057,25 +1089,26 @@ this.layoutControlItem26.Control = this.txt_iCount_1; this.layoutControlItem26.Location = new System.Drawing.Point(0, 0); this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem26.Size = new System.Drawing.Size(140, 24); this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem27 // this.layoutControlItem27.Control = this.txt_yuliang_1; - this.layoutControlItem27.Location = new System.Drawing.Point(168, 0); + this.layoutControlItem27.Location = new System.Drawing.Point(140, 0); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem27.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem27.Size = new System.Drawing.Size(140, 24); this.layoutControlItem27.Text = "鎵撳嵃浣欐暟"; - this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14); // // lbMxGuid // - this.lbMxGuid.Location = new System.Drawing.Point(1032, 119); + this.lbMxGuid.Location = new System.Drawing.Point(903, 93); + this.lbMxGuid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lbMxGuid.Name = "lbMxGuid"; - this.lbMxGuid.Size = new System.Drawing.Size(58, 18); + this.lbMxGuid.Size = new System.Drawing.Size(51, 14); this.lbMxGuid.StyleController = this.layout99; this.lbMxGuid.TabIndex = 229; this.lbMxGuid.Text = "lbMxGuid"; @@ -1083,17 +1116,18 @@ // // ucBtnPrint1 // + this.ucBtnPrint1.allClickKey = null; this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 21); + this.ucBtnPrint1.Location = new System.Drawing.Point(863, 38); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = "rpt_daa"; - this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32); + this.ucBtnPrint1.Size = new System.Drawing.Size(283, 28); this.ucBtnPrint1.TabIndex = 232; // // radOut // - this.radOut.Location = new System.Drawing.Point(1033, -11); + this.radOut.Location = new System.Drawing.Point(865, 10); this.radOut.Margin = new System.Windows.Forms.Padding(0); this.radOut.Name = "radOut"; this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; @@ -1101,17 +1135,19 @@ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"), new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); - this.radOut.Size = new System.Drawing.Size(227, 28); + this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0); + this.radOut.Size = new System.Drawing.Size(282, 28); this.radOut.StyleController = this.layout99; this.radOut.TabIndex = 476; // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(794, 23); + this.txt_psnQty_1.Location = new System.Drawing.Point(664, 40); + this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_psnQty_1.Name = "txt_psnQty_1"; this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true; - this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); + this.txt_psnQty_1.Size = new System.Drawing.Size(196, 20); this.txt_psnQty_1.StyleController = this.layout99; this.txt_psnQty_1.TabIndex = 263; this.txt_psnQty_1.Tag = "ReadOnly"; @@ -1119,63 +1155,69 @@ // // txtWlid // - this.txtWlid.Location = new System.Drawing.Point(114, -9); + this.txtWlid.Location = new System.Drawing.Point(96, 12); + this.txtWlid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtWlid.Name = "txtWlid"; this.txtWlid.Properties.Appearance.Options.UseFont = true; this.txtWlid.Properties.ReadOnly = true; - this.txtWlid.Size = new System.Drawing.Size(234, 24); + this.txtWlid.Size = new System.Drawing.Size(196, 20); this.txtWlid.StyleController = this.layout99; this.txtWlid.TabIndex = 214; // // txtWlmc // - this.txtWlmc.Location = new System.Drawing.Point(114, 23); + this.txtWlmc.Location = new System.Drawing.Point(96, 40); + this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtWlmc.Name = "txtWlmc"; this.txtWlmc.Properties.Appearance.Options.UseFont = true; this.txtWlmc.Properties.ReadOnly = true; - this.txtWlmc.Size = new System.Drawing.Size(234, 24); + this.txtWlmc.Size = new System.Drawing.Size(196, 20); this.txtWlmc.StyleController = this.layout99; this.txtWlmc.TabIndex = 216; // // txtWlgg // - this.txtWlgg.Location = new System.Drawing.Point(114, 55); + this.txtWlgg.Location = new System.Drawing.Point(96, 68); + this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtWlgg.Name = "txtWlgg"; this.txtWlgg.Properties.Appearance.Options.UseFont = true; this.txtWlgg.Properties.ReadOnly = true; - this.txtWlgg.Size = new System.Drawing.Size(574, 24); + this.txtWlgg.Size = new System.Drawing.Size(480, 20); this.txtWlgg.StyleController = this.layout99; this.txtWlgg.TabIndex = 218; // // txt_kQty // - this.txt_kQty.Location = new System.Drawing.Point(794, -9); + this.txt_kQty.Location = new System.Drawing.Point(664, 12); + this.txt_kQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_kQty.Properties.Appearance.Options.UseFont = true; this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; this.txt_kQty.Properties.ReadOnly = true; - this.txt_kQty.Size = new System.Drawing.Size(234, 24); + this.txt_kQty.Size = new System.Drawing.Size(196, 20); this.txt_kQty.StyleController = this.layout99; this.txt_kQty.TabIndex = 224; // // txtQuantity // - this.txtQuantity.Location = new System.Drawing.Point(454, -9); + this.txtQuantity.Location = new System.Drawing.Point(380, 12); + this.txtQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtQuantity.Name = "txtQuantity"; this.txtQuantity.Properties.Appearance.Options.UseFont = true; this.txtQuantity.Properties.ReadOnly = true; - this.txtQuantity.Size = new System.Drawing.Size(234, 24); + this.txtQuantity.Size = new System.Drawing.Size(196, 20); this.txtQuantity.StyleController = this.layout99; this.txtQuantity.TabIndex = 220; // // txt_yQty // - this.txt_yQty.Location = new System.Drawing.Point(454, 23); + this.txt_yQty.Location = new System.Drawing.Point(380, 40); + this.txt_yQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); 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(234, 24); + this.txt_yQty.Size = new System.Drawing.Size(196, 20); this.txt_yQty.StyleController = this.layout99; this.txt_yQty.TabIndex = 222; // @@ -1231,7 +1273,7 @@ rowDefinition6, rowDefinition7, rowDefinition8}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116); + this.layoutControlGroup1.Size = new System.Drawing.Size(1157, 104); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem15 @@ -1239,84 +1281,81 @@ this.layoutControlItem15.Control = this.txtWlid; this.layoutControlItem15.Location = new System.Drawing.Point(0, 0); this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem15.Size = new System.Drawing.Size(284, 28); this.layoutControlItem15.Text = "鐗╂枡缂栧彿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txtWlmc; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem16.Location = new System.Drawing.Point(0, 28); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem16.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem16.Size = new System.Drawing.Size(284, 28); this.layoutControlItem16.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txtWlgg; - this.layoutControlItem17.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem17.Location = new System.Drawing.Point(0, 56); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem17.Size = new System.Drawing.Size(680, 32); + this.layoutControlItem17.Size = new System.Drawing.Size(568, 28); this.layoutControlItem17.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txtQuantity; - this.layoutControlItem18.Location = new System.Drawing.Point(340, 0); + this.layoutControlItem18.Location = new System.Drawing.Point(284, 0); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem18.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem18.Size = new System.Drawing.Size(284, 28); this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem19 // this.layoutControlItem19.Control = this.txt_yQty; - this.layoutControlItem19.Location = new System.Drawing.Point(340, 32); + this.layoutControlItem19.Location = new System.Drawing.Point(284, 28); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem19.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem19.Size = new System.Drawing.Size(284, 28); this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem20 // this.layoutControlItem20.Control = this.txt_kQty; - this.layoutControlItem20.Location = new System.Drawing.Point(680, 0); + this.layoutControlItem20.Location = new System.Drawing.Point(568, 0); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem20.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem20.Size = new System.Drawing.Size(284, 28); this.layoutControlItem20.Text = "鍙墦鍗版�绘暟"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem21 // this.layoutControlItem21.Control = this.txt_psnQty_1; - this.layoutControlItem21.Location = new System.Drawing.Point(680, 32); + this.layoutControlItem21.Location = new System.Drawing.Point(568, 28); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem21.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem21.Size = new System.Drawing.Size(284, 28); this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14); // // layoutControlItem22 // this.layoutControlItem22.Control = this.radOut; - this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0); - this.layoutControlItem22.MaxSize = new System.Drawing.Size(230, 28); - this.layoutControlItem22.MinSize = new System.Drawing.Size(230, 28); + this.layoutControlItem22.Location = new System.Drawing.Point(852, 0); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); - this.layoutControlItem22.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem22.Size = new System.Drawing.Size(285, 28); this.layoutControlItem22.Text = "鑷姩璁$畻"; this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem22.TextVisible = false; @@ -1324,12 +1363,12 @@ // layoutControlItem23 // this.layoutControlItem23.Control = this.ucBtnPrint1; - this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32); + this.layoutControlItem23.Location = new System.Drawing.Point(852, 28); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem23.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem23.Size = new System.Drawing.Size(285, 28); this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳"; this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem23.TextVisible = false; @@ -1337,11 +1376,11 @@ // layoutControlItem25 // this.layoutControlItem25.Control = this.layoutControl1; - this.layoutControlItem25.Location = new System.Drawing.Point(680, 64); + this.layoutControlItem25.Location = new System.Drawing.Point(568, 56); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem25.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem25.Size = new System.Drawing.Size(284, 28); this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺"; this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem25.TextVisible = false; @@ -1349,10 +1388,16 @@ // gcMx1 // this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; + this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1342, 258); + this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemButtonEdit1, + this.repositoryItemButtonEdit2, + this.repositoryItemComboBox1}); + this.gcMx1.Size = new System.Drawing.Size(1174, 197); this.gcMx1.TabIndex = 1; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1378,7 +1423,12 @@ this.gridColumn15, this.gridColumn19, this.gridColumn12, - this.gridColumn27}); + this.gridColumn27, + this.gridColumn28, + this.gridColumn29, + this.gridColumn30, + this.gridColumn31}); + this.gvMx1.DetailHeight = 272; this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1391,21 +1441,21 @@ // this.gvAbtGuid.Caption = "abtGuid涓嶈兘鍒犻櫎"; this.gvAbtGuid.FieldName = "aboutGuid"; - this.gvAbtGuid.MinWidth = 50; + this.gvAbtGuid.MinWidth = 44; this.gvAbtGuid.Name = "gvAbtGuid"; this.gvAbtGuid.OptionsColumn.ReadOnly = true; - this.gvAbtGuid.Width = 94; + this.gvAbtGuid.Width = 82; // // gvMx1guid // this.gvMx1guid.AppearanceCell.Options.UseFont = true; this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎"; this.gvMx1guid.FieldName = "guid"; - this.gvMx1guid.MinWidth = 70; + this.gvMx1guid.MinWidth = 61; this.gvMx1guid.Name = "gvMx1guid"; this.gvMx1guid.OptionsColumn.ReadOnly = true; this.gvMx1guid.Tag = "query_a.guid"; - this.gvMx1guid.Width = 100; + this.gvMx1guid.Width = 87; // // gvMx1urgentFlag // @@ -1424,83 +1474,83 @@ this.gvMx1ebeln.AppearanceCell.Options.UseFont = true; this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿"; this.gvMx1ebeln.FieldName = "ebeln"; - this.gvMx1ebeln.MinWidth = 50; + this.gvMx1ebeln.MinWidth = 44; this.gvMx1ebeln.Name = "gvMx1ebeln"; this.gvMx1ebeln.OptionsColumn.ReadOnly = true; this.gvMx1ebeln.Tag = "query_a.ebeln"; this.gvMx1ebeln.Visible = true; this.gvMx1ebeln.VisibleIndex = 1; - this.gvMx1ebeln.Width = 105; + this.gvMx1ebeln.Width = 92; // // gridColumn4 // this.gridColumn4.Caption = "鐗╂枡缂栧彿"; this.gridColumn4.FieldName = "itemNo"; - this.gridColumn4.MinWidth = 50; + this.gridColumn4.MinWidth = 44; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.ReadOnly = true; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 2; - this.gridColumn4.Width = 88; + this.gridColumn4.Width = 77; // // gvMx1boardStyle // this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true; this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О"; this.gvMx1boardStyle.FieldName = "itemName"; - this.gvMx1boardStyle.MinWidth = 50; + this.gvMx1boardStyle.MinWidth = 44; this.gvMx1boardStyle.Name = "gvMx1boardStyle"; this.gvMx1boardStyle.OptionsColumn.ReadOnly = true; this.gvMx1boardStyle.Tag = "query_a.board_style"; this.gvMx1boardStyle.Visible = true; this.gvMx1boardStyle.VisibleIndex = 3; - this.gvMx1boardStyle.Width = 159; + this.gvMx1boardStyle.Width = 139; // // gridColumn6 // this.gridColumn6.Caption = "鐗╂枡瑙勬牸"; this.gridColumn6.FieldName = "itemModel"; - this.gridColumn6.MinWidth = 50; + this.gridColumn6.MinWidth = 44; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 4; - this.gridColumn6.Width = 109; + this.gridColumn6.Width = 95; // // gridColumn8 // this.gridColumn8.Caption = "鏈鏀惰揣鏁伴噺"; this.gridColumn8.FieldName = "quantity"; - this.gridColumn8.MinWidth = 50; + this.gridColumn8.MinWidth = 44; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 5; - this.gridColumn8.Width = 83; + this.gridColumn8.Width = 73; // // gvMx1okRkqty // this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true; this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�"; this.gvMx1okRkqty.FieldName = "okRkqty"; - this.gvMx1okRkqty.MinWidth = 50; + this.gvMx1okRkqty.MinWidth = 44; this.gvMx1okRkqty.Name = "gvMx1okRkqty"; this.gvMx1okRkqty.OptionsColumn.ReadOnly = true; this.gvMx1okRkqty.Tag = "query_a.ok_rkqty"; this.gvMx1okRkqty.Visible = true; this.gvMx1okRkqty.VisibleIndex = 6; - this.gvMx1okRkqty.Width = 88; + this.gvMx1okRkqty.Width = 77; // // gvMx1ebelnQty // this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true; this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�"; this.gvMx1ebelnQty.FieldName = "yQty"; - this.gvMx1ebelnQty.MinWidth = 50; + this.gvMx1ebelnQty.MinWidth = 44; this.gvMx1ebelnQty.Name = "gvMx1ebelnQty"; this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true; this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty"; this.gvMx1ebelnQty.Visible = true; this.gvMx1ebelnQty.VisibleIndex = 7; - this.gvMx1ebelnQty.Width = 88; + this.gvMx1ebelnQty.Width = 77; // // gridColumn10 // @@ -1510,87 +1560,153 @@ this.gridColumn10.AppearanceHeader.Options.UseForeColor = true; this.gridColumn10.Caption = "鍙墦鍗版�婚噺"; this.gridColumn10.FieldName = "kQty"; - this.gridColumn10.MinWidth = 50; + this.gridColumn10.MinWidth = 44; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 8; - this.gridColumn10.Width = 83; + this.gridColumn10.Width = 73; // // gridColumn5 // this.gridColumn5.Caption = "鐗╂枡鍗曚綅"; this.gridColumn5.FieldName = "wnDw"; - this.gridColumn5.MinWidth = 50; + this.gridColumn5.MinWidth = 44; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.ReadOnly = true; - this.gridColumn5.Width = 159; + this.gridColumn5.Width = 139; // // gridColumn9 // this.gridColumn9.Caption = "閲囪喘鍗曚綅"; this.gridColumn9.FieldName = "cgUnit"; - this.gridColumn9.MinWidth = 50; + this.gridColumn9.MinWidth = 44; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 9; - this.gridColumn9.Width = 83; + this.gridColumn9.Width = 73; // // gridColumn7 // this.gridColumn7.Caption = "搴撳瓨鍗曚綅"; this.gridColumn7.FieldName = "kcUnit"; - this.gridColumn7.MinWidth = 50; + this.gridColumn7.MinWidth = 44; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.ReadOnly = true; - this.gridColumn7.Width = 83; + this.gridColumn7.Width = 73; // // gridColumn15 // this.gridColumn15.Caption = "妫�楠岀姸鎬�"; this.gridColumn15.FieldName = "jyzt"; - this.gridColumn15.MinWidth = 50; + this.gridColumn15.MinWidth = 44; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 10; - this.gridColumn15.Width = 83; + this.gridColumn15.Width = 73; // // gridColumn19 // this.gridColumn19.Caption = "妫�楠岀粨鏋�"; this.gridColumn19.FieldName = "jyjg"; - this.gridColumn19.MinWidth = 50; + this.gridColumn19.MinWidth = 44; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; this.gridColumn19.VisibleIndex = 11; - this.gridColumn19.Width = 91; + this.gridColumn19.Width = 80; // // gridColumn12 // this.gridColumn12.Caption = "澶勭悊鎰忚"; this.gridColumn12.FieldName = "clyj"; - this.gridColumn12.MinWidth = 25; + this.gridColumn12.MinWidth = 22; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; this.gridColumn12.VisibleIndex = 12; - this.gridColumn12.Width = 94; + this.gridColumn12.Width = 82; + // + // gridColumn27 + // + this.gridColumn27.Caption = "榛樿姣忓紶鏉$爜鏁伴噺"; + this.gridColumn27.FieldName = "mrtmsl"; + this.gridColumn27.MinWidth = 22; + this.gridColumn27.Name = "gridColumn27"; + this.gridColumn27.Width = 82; + // + // gridColumn28 + // + this.gridColumn28.Caption = "鍏ュ簱绫诲瀷"; + this.gridColumn28.ColumnEdit = this.repositoryItemComboBox1; + this.gridColumn28.FieldName = "rkType"; + this.gridColumn28.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right; + this.gridColumn28.Name = "gridColumn28"; + this.gridColumn28.OptionsColumn.ReadOnly = true; + this.gridColumn28.Visible = true; + this.gridColumn28.VisibleIndex = 16; + this.gridColumn28.Width = 66; + // + // repositoryItemComboBox1 + // + this.repositoryItemComboBox1.AutoHeight = false; + this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; + // + // gridColumn29 + // + this.gridColumn29.Caption = "浠撳簱缂栫爜"; + this.gridColumn29.FieldName = "depotCode"; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 13; + // + // gridColumn30 + // + this.gridColumn30.Caption = "浠撳簱鍚嶇О"; + this.gridColumn30.FieldName = "depotName"; + this.gridColumn30.Name = "gridColumn30"; + this.gridColumn30.Visible = true; + this.gridColumn30.VisibleIndex = 14; + // + // gridColumn31 + // + this.gridColumn31.Caption = "浠撶鍛�"; + this.gridColumn31.FieldName = "staffName"; + this.gridColumn31.Name = "gridColumn31"; + this.gridColumn31.Visible = true; + this.gridColumn31.VisibleIndex = 15; + // + // repositoryItemButtonEdit1 + // + this.repositoryItemButtonEdit1.AutoHeight = false; + this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; + // + // repositoryItemButtonEdit2 + // + this.repositoryItemButtonEdit2.AutoHeight = false; + this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; // // tabMxPage2 // this.tabMxPage2.Controls.Add(this.gcMx2); + this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1342, 386); + this.tabMxPage2.Size = new System.Drawing.Size(1174, 297); this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏"; // // gcMx2 // this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; + this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx2.Name = "gcMx2"; - this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.rptChongDa}); - this.gcMx2.Size = new System.Drawing.Size(1342, 386); + this.gcMx2.Size = new System.Drawing.Size(1174, 297); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1600,7 +1716,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 = 39; this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx2guid, this.gridColumn16, @@ -1615,7 +1731,8 @@ this.gridColumn22, this.gridColumn23, this.gridColumn24, - this.gvBtnAlawys}); + this.gridColumn32}); + this.gvMx2.DetailHeight = 272; this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1627,97 +1744,97 @@ this.gvMx2guid.AppearanceCell.Options.UseFont = true; this.gvMx2guid.Caption = "guid "; this.gvMx2guid.FieldName = "guid"; - this.gvMx2guid.MinWidth = 50; + this.gvMx2guid.MinWidth = 44; this.gvMx2guid.Name = "gvMx2guid"; this.gvMx2guid.Tag = "query_a.guid"; - this.gvMx2guid.Width = 94; + this.gvMx2guid.Width = 82; // // gridColumn16 // this.gridColumn16.Caption = "鏄惁鍏ュ簱"; this.gridColumn16.FieldName = "isRk"; - this.gridColumn16.MaxWidth = 50; - this.gridColumn16.MinWidth = 50; + this.gridColumn16.MaxWidth = 44; + this.gridColumn16.MinWidth = 44; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; this.gridColumn16.VisibleIndex = 0; - this.gridColumn16.Width = 50; + this.gridColumn16.Width = 44; // // gvMx2itemBarcode // this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true; this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜"; this.gvMx2itemBarcode.FieldName = "itemBarcode"; - this.gvMx2itemBarcode.MinWidth = 50; + this.gvMx2itemBarcode.MinWidth = 44; this.gvMx2itemBarcode.Name = "gvMx2itemBarcode"; this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE"; this.gvMx2itemBarcode.Visible = true; this.gvMx2itemBarcode.VisibleIndex = 1; - this.gvMx2itemBarcode.Width = 300; + this.gvMx2itemBarcode.Width = 262; // // gvMx2itemNo // this.gvMx2itemNo.AppearanceCell.Options.UseFont = true; this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 "; this.gvMx2itemNo.FieldName = "itemNo"; - this.gvMx2itemNo.MinWidth = 50; + this.gvMx2itemNo.MinWidth = 44; this.gvMx2itemNo.Name = "gvMx2itemNo"; this.gvMx2itemNo.Tag = "query_a.ITEM_NO"; this.gvMx2itemNo.Visible = true; this.gvMx2itemNo.VisibleIndex = 2; - this.gvMx2itemNo.Width = 100; + this.gvMx2itemNo.Width = 87; // // gridColumn18 // this.gridColumn18.Caption = "鐗╂枡鍚嶇О"; this.gridColumn18.FieldName = "itemName"; - this.gridColumn18.MinWidth = 50; + this.gridColumn18.MinWidth = 44; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; this.gridColumn18.VisibleIndex = 3; - this.gridColumn18.Width = 150; + this.gridColumn18.Width = 131; // // gridColumn14 // this.gridColumn14.Caption = "瑙勬牸鍨嬪彿"; this.gridColumn14.FieldName = "itemModel"; - this.gridColumn14.MinWidth = 50; + this.gridColumn14.MinWidth = 44; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 4; - this.gridColumn14.Width = 150; + this.gridColumn14.Width = 131; // // gvMx2oldqty // this.gvMx2oldqty.AppearanceCell.Options.UseFont = true; this.gvMx2oldqty.Caption = "鏁伴噺"; this.gvMx2oldqty.FieldName = "quantity"; - this.gvMx2oldqty.MinWidth = 50; + this.gvMx2oldqty.MinWidth = 44; this.gvMx2oldqty.Name = "gvMx2oldqty"; this.gvMx2oldqty.Tag = "query_a.OLDQTY"; this.gvMx2oldqty.Visible = true; this.gvMx2oldqty.VisibleIndex = 5; - this.gvMx2oldqty.Width = 94; + this.gvMx2oldqty.Width = 82; // // gridColumn21 // this.gridColumn21.Caption = "鍗曚綅"; this.gridColumn21.FieldName = "dwName"; - this.gridColumn21.MinWidth = 25; + this.gridColumn21.MinWidth = 22; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; this.gridColumn21.VisibleIndex = 6; - this.gridColumn21.Width = 94; + this.gridColumn21.Width = 82; // // gridColumn20 // this.gridColumn20.Caption = "鎵撶爜浜�"; this.gridColumn20.FieldName = "createBy"; - this.gridColumn20.MinWidth = 25; + this.gridColumn20.MinWidth = 22; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; this.gridColumn20.VisibleIndex = 7; - this.gridColumn20.Width = 94; + this.gridColumn20.Width = 82; // // gridColumn17 // @@ -1727,74 +1844,54 @@ this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; this.gridColumn17.VisibleIndex = 8; - this.gridColumn17.Width = 180; + this.gridColumn17.Width = 157; // // gridColumn22 // this.gridColumn22.Caption = "鍏ュ簱浜�"; this.gridColumn22.FieldName = "rkUser"; - this.gridColumn22.MinWidth = 25; + this.gridColumn22.MinWidth = 22; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; this.gridColumn22.VisibleIndex = 9; - this.gridColumn22.Width = 94; + this.gridColumn22.Width = 82; // // gridColumn23 // this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡"; this.gridColumn23.FieldName = "rkDate"; - this.gridColumn23.MinWidth = 25; + this.gridColumn23.MinWidth = 22; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; this.gridColumn23.VisibleIndex = 10; - this.gridColumn23.Width = 94; + this.gridColumn23.Width = 82; // // gridColumn24 // this.gridColumn24.Caption = "鍏ュ簱浣�"; this.gridColumn24.FieldName = "rkPositon"; - this.gridColumn24.MinWidth = 25; + this.gridColumn24.MinWidth = 22; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; this.gridColumn24.VisibleIndex = 11; - this.gridColumn24.Width = 94; + this.gridColumn24.Width = 82; // - // gvBtnAlawys + // gridColumn32 // - this.gvBtnAlawys.Caption = "閲嶆墦"; - this.gvBtnAlawys.ColumnEdit = this.rptChongDa; - this.gvBtnAlawys.MinWidth = 25; - this.gvBtnAlawys.Name = "gvBtnAlawys"; - this.gvBtnAlawys.Visible = true; - this.gvBtnAlawys.VisibleIndex = 12; - this.gvBtnAlawys.Width = 94; - // - // rptChongDa - // - this.rptChongDa.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; - this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); - this.rptChongDa.Name = "rptChongDa"; - this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; - this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); - // - // gridColumn27 - // - this.gridColumn27.Caption = "榛樿姣忓紶鏉$爜鏁伴噺"; - this.gridColumn27.FieldName = "mrtmsl"; - this.gridColumn27.MinWidth = 25; - this.gridColumn27.Name = "gridColumn27"; - this.gridColumn27.Width = 94; + this.gridColumn32.Caption = "鍏ュ簱绫诲瀷"; + this.gridColumn32.FieldName = "cgrkType"; + this.gridColumn32.Name = "gridColumn32"; + this.gridColumn32.Visible = true; + this.gridColumn32.VisibleIndex = 12; // // Frm_ArrivalBarcode // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1346, 682); + this.ClientSize = new System.Drawing.Size(1178, 530); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "Frm_ArrivalBarcode"; this.Text = "鍒拌揣鏉$爜鎵撳嵃"; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); @@ -1882,10 +1979,12 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit(); this.ResumeLayout(false); } @@ -1981,8 +2080,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; - private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; - private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; @@ -2014,5 +2111,13 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn32; } } \ No newline at end of file -- Gitblit v1.9.3