From 764a7f61a7166bdafe5543dfda7ba764a8074260 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 29 三月 2025 13:28:46 +0800 Subject: [PATCH] 工艺 --- DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs | 196 ++++++ DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 173 ++++ DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs | 84 ++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 1303 +++++++++++++++++---------------------- DevApp/Gs.DevApp/Properties/licenses.licx | 25 DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.resx | 120 +++ 7 files changed, 1,155 insertions(+), 755 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs index 0426cfb..7ae501f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs @@ -31,13 +31,13 @@ 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.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = 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(); @@ -57,55 +57,45 @@ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); - this.txt_cgName = new DevExpress.XtraEditors.TextEdit(); this.lbGuid = new System.Windows.Forms.Label(); - this.txt_scName = new DevExpress.XtraEditors.TextEdit(); - this.txt_fforbidstatusTxt = new DevExpress.XtraEditors.TextEdit(); - this.txt_xxName = new DevExpress.XtraEditors.TextEdit(); - this.txt_dptName = new DevExpress.XtraEditors.TextEdit(); - this.txt_wlName = new DevExpress.XtraEditors.TextEdit(); - this.txt_wwName = new DevExpress.XtraEditors.TextEdit(); - this.txt_kfName = new DevExpress.XtraEditors.TextEdit(); - this.txt_fissueType = new DevExpress.XtraEditors.TextEdit(); - this.txt_ffinishreceiptoverrate = new DevExpress.XtraEditors.TextEdit(); + this.txt_fMaxWeight = new DevExpress.XtraEditors.TextEdit(); + this.txt_fMinWeight = new DevExpress.XtraEditors.TextEdit(); this.txt_itemName = new DevExpress.XtraEditors.MemoEdit(); this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit(); - this.txt_itemSname = new DevExpress.XtraEditors.TextEdit(); - this.txt_itemDescription = new DevExpress.XtraEditors.TextEdit(); this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_itemType = new DevExpress.XtraEditors.TextEdit(); - this.txt_itemVersion = new DevExpress.XtraEditors.TextEdit(); - this.txt_ppbom00019124 = new DevExpress.XtraEditors.TextEdit(); - this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit(); - this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit(); - this.txt_highlimit = new DevExpress.XtraEditors.TextEdit(); - this.txt_lowlimit = new DevExpress.XtraEditors.TextEdit(); - this.txt_prdPack = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_fSumPeople = new DevExpress.XtraEditors.TextEdit(); + this.txt_fCapacity = new DevExpress.XtraEditors.TextEdit(); + this.txt_fNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_fLayer = new DevExpress.XtraEditors.TextEdit(); + this.txt_remark = new DevExpress.XtraEditors.TextEdit(); + this.txt_fVersion = new DevExpress.XtraEditors.TextEdit(); + this.txt_fJingDu = new DevExpress.XtraEditors.ComboBoxEdit(); + this.txt_fBegDate = new DevExpress.XtraEditors.DateEdit(); + this.txt_fEndDate = new DevExpress.XtraEditors.DateEdit(); + this.txt_fStatus = new DevExpress.XtraEditors.CheckEdit(); + this.txt_orgName = new DevExpress.XtraEditors.TextEdit(); + this.txt_fType = new DevExpress.XtraEditors.ComboBoxEdit(); + this.btnSelect = new DevExpress.XtraEditors.SimpleButton(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -116,12 +106,11 @@ this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); - this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); - this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -143,66 +132,52 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_cgName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_scName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatusTxt.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_xxName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_wlName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_wwName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kfName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fMaxWeight.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fMinWeight.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemSname.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemType.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemVersion.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_ppbom00019124.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_highlimit.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_lowlimit.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_prdPack.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fSumPeople.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fCapacity.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fLayer.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fVersion.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fJingDu.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fStatus.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_orgName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); this.SuspendLayout(); // @@ -226,11 +201,11 @@ // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 532); + this.pageBar1.Location = new System.Drawing.Point(0, 594); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(400, 38); + this.pageBar1.Size = new System.Drawing.Size(504, 38); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // @@ -240,7 +215,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1160, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(1160, 664); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -249,7 +224,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1158, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1158, 632); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -268,8 +243,8 @@ // this.split1.Panel2.Controls.Add(this.splitMx1); this.split1.Panel2.Text = "Panel2"; - this.split1.Size = new System.Drawing.Size(1158, 570); - this.split1.SplitterPosition = 400; + this.split1.Size = new System.Drawing.Size(1158, 632); + this.split1.SplitterPosition = 504; this.split1.TabIndex = 0; // // gcMain1 @@ -279,7 +254,7 @@ this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(400, 532); + this.gcMain1.Size = new System.Drawing.Size(504, 594); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -390,349 +365,280 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; - this.splitMx1.Size = new System.Drawing.Size(746, 570); - this.splitMx1.SplitterPosition = 214; + this.splitMx1.Size = new System.Drawing.Size(642, 632); + this.splitMx1.SplitterPosition = 244; this.splitMx1.TabIndex = 1; // // layoutMx1 // - this.layoutMx1.Controls.Add(this.txt_cgName); this.layoutMx1.Controls.Add(this.lbGuid); - this.layoutMx1.Controls.Add(this.txt_scName); - this.layoutMx1.Controls.Add(this.txt_fforbidstatusTxt); - this.layoutMx1.Controls.Add(this.txt_xxName); - this.layoutMx1.Controls.Add(this.txt_dptName); - this.layoutMx1.Controls.Add(this.txt_wlName); - this.layoutMx1.Controls.Add(this.txt_wwName); - this.layoutMx1.Controls.Add(this.txt_kfName); - this.layoutMx1.Controls.Add(this.txt_fissueType); - this.layoutMx1.Controls.Add(this.txt_ffinishreceiptoverrate); + this.layoutMx1.Controls.Add(this.txt_fMaxWeight); + this.layoutMx1.Controls.Add(this.txt_fMinWeight); this.layoutMx1.Controls.Add(this.txt_itemName); this.layoutMx1.Controls.Add(this.txt_itemModel); - this.layoutMx1.Controls.Add(this.txt_itemSname); - this.layoutMx1.Controls.Add(this.txt_itemDescription); this.layoutMx1.Controls.Add(this.txt_itemNo); - this.layoutMx1.Controls.Add(this.txt_itemType); - this.layoutMx1.Controls.Add(this.txt_itemVersion); - this.layoutMx1.Controls.Add(this.txt_ppbom00019124); - this.layoutMx1.Controls.Add(this.txt_materialProperti); - this.layoutMx1.Controls.Add(this.txt_productionWorkshop); - this.layoutMx1.Controls.Add(this.txt_highlimit); - this.layoutMx1.Controls.Add(this.txt_lowlimit); - this.layoutMx1.Controls.Add(this.txt_prdPack); + this.layoutMx1.Controls.Add(this.txt_fSumPeople); + this.layoutMx1.Controls.Add(this.txt_fCapacity); + this.layoutMx1.Controls.Add(this.txt_fNo); + this.layoutMx1.Controls.Add(this.txt_fLayer); + this.layoutMx1.Controls.Add(this.txt_remark); + this.layoutMx1.Controls.Add(this.txt_fVersion); + this.layoutMx1.Controls.Add(this.txt_fJingDu); + this.layoutMx1.Controls.Add(this.txt_fBegDate); + this.layoutMx1.Controls.Add(this.txt_fEndDate); + this.layoutMx1.Controls.Add(this.txt_fStatus); + this.layoutMx1.Controls.Add(this.txt_orgName); + this.layoutMx1.Controls.Add(this.txt_fType); + this.layoutMx1.Controls.Add(this.btnSelect); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem24}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(746, 214); + this.layoutMx1.Size = new System.Drawing.Size(642, 244); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // - // txt_cgName - // - this.txt_cgName.Location = new System.Drawing.Point(642, 172); - this.txt_cgName.Name = "txt_cgName"; - this.txt_cgName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_cgName.Properties.Appearance.Options.UseFont = true; - this.txt_cgName.Size = new System.Drawing.Size(92, 28); - this.txt_cgName.StyleController = this.layoutMx1; - this.txt_cgName.TabIndex = 407; - this.txt_cgName.Tag = "isStatus"; - // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(580, 177); + this.lbGuid.Location = new System.Drawing.Point(426, 204); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(280, 30); + this.lbGuid.Size = new System.Drawing.Size(204, 28); this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; // - // txt_scName + // txt_fMaxWeight // - this.txt_scName.Location = new System.Drawing.Point(642, 140); - this.txt_scName.Name = "txt_scName"; - this.txt_scName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_scName.Properties.Appearance.Options.UseFont = true; - this.txt_scName.Size = new System.Drawing.Size(92, 28); - this.txt_scName.StyleController = this.layoutMx1; - this.txt_scName.TabIndex = 408; - this.txt_scName.Tag = "isStatus"; + this.txt_fMaxWeight.Location = new System.Drawing.Point(498, 76); + this.txt_fMaxWeight.Name = "txt_fMaxWeight"; + this.txt_fMaxWeight.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true; + this.txt_fMaxWeight.Size = new System.Drawing.Size(132, 28); + this.txt_fMaxWeight.StyleController = this.layoutMx1; + this.txt_fMaxWeight.TabIndex = 378; + this.txt_fMaxWeight.Tag = "fissueType"; // - // txt_fforbidstatusTxt + // txt_fMinWeight // - this.txt_fforbidstatusTxt.Location = new System.Drawing.Point(280, 172); - this.txt_fforbidstatusTxt.Name = "txt_fforbidstatusTxt"; - this.txt_fforbidstatusTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_fforbidstatusTxt.Properties.Appearance.Options.UseFont = true; - this.txt_fforbidstatusTxt.Size = new System.Drawing.Size(90, 28); - this.txt_fforbidstatusTxt.StyleController = this.layoutMx1; - this.txt_fforbidstatusTxt.TabIndex = 343; - this.txt_fforbidstatusTxt.Tag = "isStatus"; - // - // txt_xxName - // - this.txt_xxName.Location = new System.Drawing.Point(642, 108); - this.txt_xxName.Name = "txt_xxName"; - this.txt_xxName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_xxName.Properties.Appearance.Options.UseFont = true; - this.txt_xxName.Size = new System.Drawing.Size(92, 28); - this.txt_xxName.StyleController = this.layoutMx1; - this.txt_xxName.TabIndex = 409; - this.txt_xxName.Tag = "isStatus"; - // - // txt_dptName - // - this.txt_dptName.Location = new System.Drawing.Point(99, 172); - this.txt_dptName.Name = "txt_dptName"; - this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_dptName.Properties.Appearance.Options.UseFont = true; - this.txt_dptName.Size = new System.Drawing.Size(90, 28); - this.txt_dptName.StyleController = this.layoutMx1; - this.txt_dptName.TabIndex = 406; - this.txt_dptName.Tag = "isStatus"; - // - // txt_wlName - // - this.txt_wlName.Location = new System.Drawing.Point(642, 76); - this.txt_wlName.Name = "txt_wlName"; - this.txt_wlName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_wlName.Properties.Appearance.Options.UseFont = true; - this.txt_wlName.Size = new System.Drawing.Size(92, 28); - this.txt_wlName.StyleController = this.layoutMx1; - this.txt_wlName.TabIndex = 410; - this.txt_wlName.Tag = "isStatus"; - // - // txt_wwName - // - this.txt_wwName.Location = new System.Drawing.Point(642, 44); - this.txt_wwName.Name = "txt_wwName"; - this.txt_wwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_wwName.Properties.Appearance.Options.UseFont = true; - this.txt_wwName.Size = new System.Drawing.Size(92, 28); - this.txt_wwName.StyleController = this.layoutMx1; - this.txt_wwName.TabIndex = 411; - this.txt_wwName.Tag = "isStatus"; - // - // txt_kfName - // - this.txt_kfName.Location = new System.Drawing.Point(642, 12); - this.txt_kfName.Name = "txt_kfName"; - this.txt_kfName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_kfName.Properties.Appearance.Options.UseFont = true; - this.txt_kfName.Size = new System.Drawing.Size(92, 28); - this.txt_kfName.StyleController = this.layoutMx1; - this.txt_kfName.TabIndex = 412; - this.txt_kfName.Tag = "isStatus"; - // - // txt_fissueType - // - this.txt_fissueType.Location = new System.Drawing.Point(280, 140); - this.txt_fissueType.Name = "txt_fissueType"; - this.txt_fissueType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_fissueType.Properties.Appearance.Options.UseFont = true; - this.txt_fissueType.Size = new System.Drawing.Size(90, 28); - this.txt_fissueType.StyleController = this.layoutMx1; - this.txt_fissueType.TabIndex = 378; - this.txt_fissueType.Tag = "fissueType"; - // - // txt_ffinishreceiptoverrate - // - this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(461, 140); - this.txt_ffinishreceiptoverrate.Name = "txt_ffinishreceiptoverrate"; - this.txt_ffinishreceiptoverrate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_ffinishreceiptoverrate.Properties.Appearance.Options.UseFont = true; - this.txt_ffinishreceiptoverrate.Size = new System.Drawing.Size(90, 28); - this.txt_ffinishreceiptoverrate.StyleController = this.layoutMx1; - this.txt_ffinishreceiptoverrate.TabIndex = 370; - this.txt_ffinishreceiptoverrate.Tag = "finishRate"; + this.txt_fMinWeight.Location = new System.Drawing.Point(498, 108); + this.txt_fMinWeight.Name = "txt_fMinWeight"; + this.txt_fMinWeight.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true; + this.txt_fMinWeight.Size = new System.Drawing.Size(132, 28); + this.txt_fMinWeight.StyleController = this.layoutMx1; + this.txt_fMinWeight.TabIndex = 370; + this.txt_fMinWeight.Tag = "finishRate"; // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(99, 12); + this.txt_itemName.Location = new System.Drawing.Point(84, 76); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemName.Properties.Appearance.Options.UseFont = true; - this.txt_itemName.Size = new System.Drawing.Size(90, 28); + this.txt_itemName.Size = new System.Drawing.Size(131, 28); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 216; this.txt_itemName.Tag = "itemName"; // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(99, 44); + this.txt_itemModel.Location = new System.Drawing.Point(84, 108); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemModel.Properties.Appearance.Options.UseFont = true; - this.txt_itemModel.Size = new System.Drawing.Size(90, 28); + this.txt_itemModel.Size = new System.Drawing.Size(131, 28); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 219; this.txt_itemModel.Tag = "itemModel"; // - // txt_itemSname - // - this.txt_itemSname.Location = new System.Drawing.Point(99, 76); - this.txt_itemSname.Name = "txt_itemSname"; - this.txt_itemSname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_itemSname.Properties.Appearance.Options.UseFont = true; - this.txt_itemSname.Size = new System.Drawing.Size(90, 28); - this.txt_itemSname.StyleController = this.layoutMx1; - this.txt_itemSname.TabIndex = 217; - this.txt_itemSname.Tag = "itemSname"; - // - // txt_itemDescription - // - this.txt_itemDescription.Location = new System.Drawing.Point(99, 108); - this.txt_itemDescription.Name = "txt_itemDescription"; - this.txt_itemDescription.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_itemDescription.Properties.Appearance.Options.UseFont = true; - this.txt_itemDescription.Size = new System.Drawing.Size(90, 28); - this.txt_itemDescription.StyleController = this.layoutMx1; - this.txt_itemDescription.TabIndex = 222; - this.txt_itemDescription.Tag = "itemDescription"; - // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(280, 12); + this.txt_itemNo.Location = new System.Drawing.Point(84, 44); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemNo.Properties.Appearance.Options.UseFont = true; - this.txt_itemNo.Size = new System.Drawing.Size(90, 28); + this.txt_itemNo.Size = new System.Drawing.Size(131, 28); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 213; this.txt_itemNo.Tag = "itemNo"; // - // txt_itemType + // txt_fSumPeople // - this.txt_itemType.Location = new System.Drawing.Point(280, 44); - this.txt_itemType.Name = "txt_itemType"; - this.txt_itemType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_itemType.Properties.Appearance.Options.UseFont = true; - this.txt_itemType.Size = new System.Drawing.Size(90, 28); - this.txt_itemType.StyleController = this.layoutMx1; - this.txt_itemType.TabIndex = 228; - this.txt_itemType.Tag = "itemType"; + this.txt_fSumPeople.Location = new System.Drawing.Point(291, 76); + this.txt_fSumPeople.Name = "txt_fSumPeople"; + this.txt_fSumPeople.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fSumPeople.Properties.Appearance.Options.UseFont = true; + this.txt_fSumPeople.Size = new System.Drawing.Size(131, 28); + this.txt_fSumPeople.StyleController = this.layoutMx1; + this.txt_fSumPeople.TabIndex = 231; + this.txt_fSumPeople.Tag = "itemVersion"; // - // txt_itemVersion + // txt_fCapacity // - this.txt_itemVersion.Location = new System.Drawing.Point(280, 76); - this.txt_itemVersion.Name = "txt_itemVersion"; - this.txt_itemVersion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_itemVersion.Properties.Appearance.Options.UseFont = true; - this.txt_itemVersion.Size = new System.Drawing.Size(90, 28); - this.txt_itemVersion.StyleController = this.layoutMx1; - this.txt_itemVersion.TabIndex = 231; - this.txt_itemVersion.Tag = "itemVersion"; + this.txt_fCapacity.Location = new System.Drawing.Point(291, 108); + this.txt_fCapacity.Name = "txt_fCapacity"; + this.txt_fCapacity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fCapacity.Properties.Appearance.Options.UseFont = true; + this.txt_fCapacity.Size = new System.Drawing.Size(131, 28); + this.txt_fCapacity.StyleController = this.layoutMx1; + this.txt_fCapacity.TabIndex = 319; + this.txt_fCapacity.Tag = "bomNo"; // - // txt_ppbom00019124 + // txt_fNo // - this.txt_ppbom00019124.Location = new System.Drawing.Point(280, 108); - this.txt_ppbom00019124.Name = "txt_ppbom00019124"; - this.txt_ppbom00019124.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_ppbom00019124.Properties.Appearance.Options.UseFont = true; - this.txt_ppbom00019124.Size = new System.Drawing.Size(90, 28); - this.txt_ppbom00019124.StyleController = this.layoutMx1; - this.txt_ppbom00019124.TabIndex = 319; - this.txt_ppbom00019124.Tag = "bomNo"; + this.txt_fNo.Location = new System.Drawing.Point(291, 140); + this.txt_fNo.Name = "txt_fNo"; + this.txt_fNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fNo.Properties.Appearance.Options.UseFont = true; + this.txt_fNo.Size = new System.Drawing.Size(131, 28); + this.txt_fNo.StyleController = this.layoutMx1; + this.txt_fNo.TabIndex = 336; + this.txt_fNo.Tag = "produceWorkNo"; // - // txt_materialProperti + // txt_fLayer // - this.txt_materialProperti.Location = new System.Drawing.Point(461, 12); - this.txt_materialProperti.Name = "txt_materialProperti"; - this.txt_materialProperti.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_materialProperti.Properties.Appearance.Options.UseFont = true; - this.txt_materialProperti.Size = new System.Drawing.Size(90, 28); - this.txt_materialProperti.StyleController = this.layoutMx1; - this.txt_materialProperti.TabIndex = 360; - this.txt_materialProperti.Tag = "materialProperties"; + this.txt_fLayer.Location = new System.Drawing.Point(498, 140); + this.txt_fLayer.Name = "txt_fLayer"; + this.txt_fLayer.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fLayer.Properties.Appearance.Options.UseFont = true; + this.txt_fLayer.Size = new System.Drawing.Size(132, 28); + this.txt_fLayer.StyleController = this.layoutMx1; + this.txt_fLayer.TabIndex = 262; + this.txt_fLayer.Tag = "highLimt"; // - // txt_productionWorkshop + // txt_remark // - this.txt_productionWorkshop.Location = new System.Drawing.Point(461, 44); - this.txt_productionWorkshop.Name = "txt_productionWorkshop"; - this.txt_productionWorkshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true; - this.txt_productionWorkshop.Size = new System.Drawing.Size(90, 28); - this.txt_productionWorkshop.StyleController = this.layoutMx1; - this.txt_productionWorkshop.TabIndex = 336; - this.txt_productionWorkshop.Tag = "produceWorkNo"; + this.txt_remark.Location = new System.Drawing.Point(291, 172); + this.txt_remark.Name = "txt_remark"; + this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_remark.Properties.Appearance.Options.UseFont = true; + this.txt_remark.Size = new System.Drawing.Size(339, 28); + this.txt_remark.StyleController = this.layoutMx1; + this.txt_remark.TabIndex = 258; + this.txt_remark.Tag = "lowLimt"; // - // txt_highlimit + // txt_fVersion // - this.txt_highlimit.Location = new System.Drawing.Point(461, 76); - this.txt_highlimit.Name = "txt_highlimit"; - this.txt_highlimit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_highlimit.Properties.Appearance.Options.UseFont = true; - this.txt_highlimit.Size = new System.Drawing.Size(90, 28); - this.txt_highlimit.StyleController = this.layoutMx1; - this.txt_highlimit.TabIndex = 262; - this.txt_highlimit.Tag = "highLimt"; + this.txt_fVersion.Location = new System.Drawing.Point(84, 140); + this.txt_fVersion.Name = "txt_fVersion"; + this.txt_fVersion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fVersion.Properties.Appearance.Options.UseFont = true; + this.txt_fVersion.Size = new System.Drawing.Size(131, 28); + this.txt_fVersion.StyleController = this.layoutMx1; + this.txt_fVersion.TabIndex = 267; + this.txt_fVersion.Tag = "prdPack"; // - // txt_lowlimit + // txt_fJingDu // - this.txt_lowlimit.Location = new System.Drawing.Point(461, 108); - this.txt_lowlimit.Name = "txt_lowlimit"; - this.txt_lowlimit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_lowlimit.Properties.Appearance.Options.UseFont = true; - this.txt_lowlimit.Size = new System.Drawing.Size(90, 28); - this.txt_lowlimit.StyleController = this.layoutMx1; - this.txt_lowlimit.TabIndex = 258; - this.txt_lowlimit.Tag = "lowLimt"; + this.txt_fJingDu.EditValue = "PSC娴�"; + this.txt_fJingDu.Location = new System.Drawing.Point(291, 44); + this.txt_fJingDu.Name = "txt_fJingDu"; + this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_fJingDu.Properties.Items.AddRange(new object[] { + "PSC娴�", + "LOT娴�"}); + this.txt_fJingDu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + this.txt_fJingDu.Size = new System.Drawing.Size(131, 24); + this.txt_fJingDu.StyleController = this.layoutMx1; + this.txt_fJingDu.TabIndex = 413; // - // txt_prdPack + // txt_fBegDate // - this.txt_prdPack.Location = new System.Drawing.Point(99, 140); - this.txt_prdPack.Name = "txt_prdPack"; - this.txt_prdPack.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_prdPack.Properties.Appearance.Options.UseFont = true; - this.txt_prdPack.Size = new System.Drawing.Size(90, 28); - this.txt_prdPack.StyleController = this.layoutMx1; - this.txt_prdPack.TabIndex = 267; - this.txt_prdPack.Tag = "prdPack"; + this.txt_fBegDate.EditValue = null; + this.txt_fBegDate.Location = new System.Drawing.Point(498, 12); + this.txt_fBegDate.Name = "txt_fBegDate"; + this.txt_fBegDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_fBegDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_fBegDate.Size = new System.Drawing.Size(132, 24); + this.txt_fBegDate.StyleController = this.layoutMx1; + this.txt_fBegDate.TabIndex = 414; // - // layoutControlItem24 + // txt_fEndDate // - this.layoutControlItem24.Control = this.lbGuid; - this.layoutControlItem24.Location = new System.Drawing.Point(568, 165); - this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem24.Size = new System.Drawing.Size(284, 34); - this.layoutControlItem24.Text = "lbGuid"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem24.TextVisible = false; + this.txt_fEndDate.EditValue = null; + this.txt_fEndDate.Location = new System.Drawing.Point(498, 44); + this.txt_fEndDate.Name = "txt_fEndDate"; + this.txt_fEndDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_fEndDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_fEndDate.Size = new System.Drawing.Size(132, 24); + this.txt_fEndDate.StyleController = this.layoutMx1; + this.txt_fEndDate.TabIndex = 415; + // + // txt_fStatus + // + this.txt_fStatus.Location = new System.Drawing.Point(12, 172); + this.txt_fStatus.Name = "txt_fStatus"; + this.txt_fStatus.Properties.Caption = "鍚敤鐘舵��"; + this.txt_fStatus.Size = new System.Drawing.Size(203, 24); + this.txt_fStatus.StyleController = this.layoutMx1; + this.txt_fStatus.TabIndex = 416; + // + // txt_orgName + // + this.txt_orgName.Location = new System.Drawing.Point(84, 12); + this.txt_orgName.Name = "txt_orgName"; + this.txt_orgName.Size = new System.Drawing.Size(131, 24); + this.txt_orgName.StyleController = this.layoutMx1; + this.txt_orgName.TabIndex = 417; + // + // txt_fType + // + this.txt_fType.EditValue = "-璇烽�夋嫨-"; + this.txt_fType.Location = new System.Drawing.Point(291, 12); + this.txt_fType.Name = "txt_fType"; + this.txt_fType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_fType.Properties.Items.AddRange(new object[] { + "-璇烽�夋嫨-", + "F-閲忎骇", + "S-璇曚綔"}); + this.txt_fType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + this.txt_fType.Size = new System.Drawing.Size(131, 24); + this.txt_fType.StyleController = this.layoutMx1; + this.txt_fType.TabIndex = 418; + // + // btnSelect + // + this.btnSelect.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question; + this.btnSelect.Appearance.Options.UseBackColor = true; + this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16; + this.btnSelect.Location = new System.Drawing.Point(12, 204); + this.btnSelect.Name = "btnSelect"; + this.btnSelect.Size = new System.Drawing.Size(96, 27); + this.btnSelect.StyleController = this.layoutMx1; + this.btnSelect.TabIndex = 419; + this.btnSelect.Text = "閫夋嫨宸ュ簭"; // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1, - this.layoutControlItem2, - this.layoutControlItem3, this.layoutControlItem4, - this.layoutControlItem5, - this.layoutControlItem6, - this.layoutControlItem7, - this.layoutControlItem8, this.layoutControlItem9, - this.layoutControlItem10, - this.layoutControlItem11, - this.layoutControlItem12, - this.layoutControlItem13, - this.layoutControlItem14, - this.layoutControlItem15, - this.layoutControlItem16, - this.layoutControlItem17, this.layoutControlItem18, this.layoutControlItem19, - this.layoutControlItem20, - this.layoutControlItem21, - this.layoutControlItem22, - this.layoutControlItem23}); + this.layoutControlItem8, + this.layoutControlItem7, + this.layoutControlItem3, + this.layoutControlItem10, + this.layoutControlItem2, + this.layoutControlItem1, + this.layoutControlItem5, + this.layoutControlItem14, + this.layoutControlItem17, + this.layoutControlItem6, + this.layoutControlItem13, + this.layoutControlItem11, + this.layoutControlItem12, + this.layoutControlItem15, + this.layoutControlItem24}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -741,13 +647,10 @@ columnDefinition2.Width = 100D; columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition3.Width = 100D; - columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1, columnDefinition2, - columnDefinition3, - columnDefinition4}); + columnDefinition3}); rowDefinition1.Height = 100D; rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition2.Height = 100D; @@ -760,258 +663,225 @@ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, rowDefinition5, - rowDefinition6}); - this.Root.Size = new System.Drawing.Size(746, 214); + rowDefinition6, + rowDefinition7}); + this.Root.Size = new System.Drawing.Size(642, 244); this.Root.TextVisible = false; // - // layoutControlItem1 + // layoutControlItem4 // - this.layoutControlItem1.Control = this.txt_itemName; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem1.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem4.Control = this.txt_fBegDate; + this.layoutControlItem4.Location = new System.Drawing.Point(414, 0); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem4.Size = new System.Drawing.Size(208, 32); + this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txt_fEndDate; + this.layoutControlItem9.Location = new System.Drawing.Point(414, 32); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem9.Size = new System.Drawing.Size(208, 32); + this.layoutControlItem9.Text = "澶辨晥鏃ユ湡"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_fMaxWeight; + this.layoutControlItem18.Location = new System.Drawing.Point(414, 64); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem18.Size = new System.Drawing.Size(208, 32); + this.layoutControlItem18.Text = "閲嶉噺涓婇檺"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.txt_fMinWeight; + this.layoutControlItem19.Location = new System.Drawing.Point(414, 96); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem19.Size = new System.Drawing.Size(208, 32); + this.layoutControlItem19.Text = "閲嶉噺涓嬮檺"; + this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txt_fCapacity; + this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘(PCS?H)"; + this.layoutControlItem8.Location = new System.Drawing.Point(207, 96); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem8.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem8.Text = "鏍囧噯浜ц兘"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_fSumPeople; + this.layoutControlItem7.Location = new System.Drawing.Point(207, 64); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem7.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem7.Text = "鎬诲畾鍛�"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_fJingDu; + this.layoutControlItem3.Location = new System.Drawing.Point(207, 32); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem3.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem3.Text = "绠$悊绮惧害"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_fNo; + this.layoutControlItem10.Location = new System.Drawing.Point(207, 128); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem10.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem10.Text = "娴佺▼缂栧彿"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_itemModel; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem2.Location = new System.Drawing.Point(0, 96); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(181, 32); + this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem2.Size = new System.Drawing.Size(207, 32); this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem3 + // layoutControlItem1 // - this.layoutControlItem3.Control = this.txt_itemSname; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem3.Text = "鐗╂枡绠�绉�"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_itemDescription; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 96); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem4.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem4.Text = "鐗╂枡鎻忚堪"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem1.Control = this.txt_itemName; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem1.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem1.Text = "鐗╂枡鍚嶇О"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_itemNo; - this.layoutControlItem5.Location = new System.Drawing.Point(181, 0); + this.layoutControlItem5.Location = new System.Drawing.Point(0, 32); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(181, 32); + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem5.Size = new System.Drawing.Size(207, 32); this.layoutControlItem5.Text = "鐗╂枡缂栫爜"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_itemType; - this.layoutControlItem6.Location = new System.Drawing.Point(181, 32); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem6.Text = "鐗╂枡绫诲瀷"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_itemVersion; - this.layoutControlItem7.Location = new System.Drawing.Point(181, 64); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem7.Text = "浜у搧鐗堟湰"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.txt_ppbom00019124; - this.layoutControlItem8.Location = new System.Drawing.Point(181, 96); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem8.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem8.Text = "鍒嗙被缂栧彿"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_materialProperti; - this.layoutControlItem9.Location = new System.Drawing.Point(362, 0); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem9.Text = "鐗╂枡灞炴��"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_productionWorkshop; - this.layoutControlItem10.Location = new System.Drawing.Point(362, 32); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem10.Text = "鐢熶骇杞﹂棿"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_highlimit; - this.layoutControlItem11.Location = new System.Drawing.Point(362, 64); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem11.Text = "鏈�澶у簱瀛�"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_lowlimit; - this.layoutControlItem12.Location = new System.Drawing.Point(362, 96); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem12.Text = "鏈�浣庡簱瀛�"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_kfName; - this.layoutControlItem13.Location = new System.Drawing.Point(543, 0); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(183, 32); - this.layoutControlItem13.Text = "搴撴埧鍗曚綅"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // - this.layoutControlItem14.Control = this.txt_wwName; - this.layoutControlItem14.Location = new System.Drawing.Point(543, 32); + this.layoutControlItem14.Control = this.txt_orgName; + this.layoutControlItem14.Location = new System.Drawing.Point(0, 0); this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(183, 32); - this.layoutControlItem14.Text = "濮斿鍗曚綅"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_wlName; - this.layoutControlItem15.Location = new System.Drawing.Point(543, 64); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem15.Size = new System.Drawing.Size(183, 32); - this.layoutControlItem15.Text = "鐗╂枡鍗曚綅"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.txt_xxName; - this.layoutControlItem16.Location = new System.Drawing.Point(543, 96); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(183, 32); - this.layoutControlItem16.Text = "閿�鍞崟浣�"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem14.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem14.Text = "浣跨敤缁勭粐"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem17 // - this.layoutControlItem17.Control = this.txt_prdPack; + this.layoutControlItem17.Control = this.txt_fVersion; this.layoutControlItem17.Location = new System.Drawing.Point(0, 128); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem17.Text = "鏈�灏忓寘瑁呮暟"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem17.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem17.Text = "鐗堟湰鍙�"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem18 + // layoutControlItem6 // - this.layoutControlItem18.Control = this.txt_fissueType; - this.layoutControlItem18.Location = new System.Drawing.Point(181, 128); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem18.Text = "鍙戞枡鏂瑰紡"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem6.Control = this.txt_fType; + this.layoutControlItem6.Location = new System.Drawing.Point(207, 0); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem6.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem6.Text = "鐢熶骇绫诲瀷"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem19 + // layoutControlItem13 // - this.layoutControlItem19.Control = this.txt_ffinishreceiptoverrate; - this.layoutControlItem19.Location = new System.Drawing.Point(362, 128); - this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem19.Size = new System.Drawing.Size(181, 32); - this.layoutControlItem19.Text = "瓒呮敹姣斾緥"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem13.Control = this.txt_fStatus; + this.layoutControlItem13.Location = new System.Drawing.Point(0, 160); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem13.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem13.Text = "绂佺敤鐘舵��"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem13.TextVisible = false; // - // layoutControlItem20 + // layoutControlItem11 // - this.layoutControlItem20.Control = this.txt_dptName; - this.layoutControlItem20.Location = new System.Drawing.Point(0, 160); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem20.Size = new System.Drawing.Size(181, 34); - this.layoutControlItem20.Text = "榛樿浠撳簱"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem11.Control = this.txt_fLayer; + this.layoutControlItem11.Location = new System.Drawing.Point(414, 128); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem11.Size = new System.Drawing.Size(208, 32); + this.layoutControlItem11.Text = "娴佺▼绾у埆"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem21 + // layoutControlItem12 // - this.layoutControlItem21.Control = this.txt_scName; - this.layoutControlItem21.Location = new System.Drawing.Point(543, 128); - this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem21.Size = new System.Drawing.Size(183, 32); - this.layoutControlItem21.Text = "鐢熶骇鍗曚綅"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem12.Control = this.txt_remark; + this.layoutControlItem12.Location = new System.Drawing.Point(207, 160); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem12.Size = new System.Drawing.Size(415, 32); + this.layoutControlItem12.Text = "娴佺▼鎻忚堪"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem22 + // layoutControlItem15 // - this.layoutControlItem22.Control = this.txt_cgName; - this.layoutControlItem22.Location = new System.Drawing.Point(543, 160); - this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem22.Size = new System.Drawing.Size(183, 34); - this.layoutControlItem22.Text = "閲囪喘鍗曚綅"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem15.Control = this.btnSelect; + this.layoutControlItem15.Location = new System.Drawing.Point(0, 192); + this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31); + this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem15.Size = new System.Drawing.Size(207, 32); + this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem15.Text = "閫夋嫨宸ュ簭"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem15.TextVisible = false; // - // layoutControlItem23 + // layoutControlItem24 // - this.layoutControlItem23.Control = this.txt_fforbidstatusTxt; - this.layoutControlItem23.Location = new System.Drawing.Point(181, 160); - this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem23.Size = new System.Drawing.Size(181, 34); - this.layoutControlItem23.Text = "绂佺敤鐘舵��"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem24.Control = this.lbGuid; + this.layoutControlItem24.Location = new System.Drawing.Point(414, 192); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem24.Size = new System.Drawing.Size(208, 32); + this.layoutControlItem24.Text = "lbGuid"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem24.TextVisible = false; // // tabMx // @@ -1019,7 +889,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(746, 344); + this.tabMx.Size = new System.Drawing.Size(642, 376); this.tabMx.TabIndex = 4; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1028,7 +898,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(744, 312); + this.tabMxPage1.Size = new System.Drawing.Size(640, 344); this.tabMxPage1.Text = "宸ュ簭淇℃伅"; // // gcMx1 @@ -1038,12 +908,10 @@ this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.repositoryItemDateEdit1, - this.repositoryItemDateEdit2, this.repositoryItemButtonEdit1, - this.rptJYBZ, - this.repositoryItemDateEdit3}); - this.gcMx1.Size = new System.Drawing.Size(744, 312); + this.repositoryItemComboBox1, + this.repositoryItemComboBox2}); + this.gcMx1.Size = new System.Drawing.Size(640, 344); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1060,6 +928,7 @@ this.gvMx1daa010, this.gvMx1daa005, this.gvMx1daa003, + this.gridColumn1, this.gvMx1daa004, this.gvMx1reporttime, this.gvMxDel}); @@ -1083,8 +952,8 @@ // // caaGuid // - this.caaGuid.Caption = "caaGuid"; - this.caaGuid.FieldName = "caaGuid"; + this.caaGuid.Caption = "pGuid"; + this.caaGuid.FieldName = "pGuid"; this.caaGuid.MinWidth = 25; this.caaGuid.Name = "caaGuid"; this.caaGuid.OptionsColumn.ReadOnly = true; @@ -1095,7 +964,7 @@ this.gvMx1daa002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa002.AppearanceCell.Options.UseFont = true; this.gvMx1daa002.Caption = "搴忓彿"; - this.gvMx1daa002.FieldName = "daa001"; + this.gvMx1daa002.FieldName = "fSeq"; this.gvMx1daa002.MinWidth = 50; this.gvMx1daa002.Name = "gvMx1daa002"; this.gvMx1daa002.OptionsColumn.ReadOnly = true; @@ -1109,7 +978,7 @@ this.gvMx1daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa010.AppearanceCell.Options.UseFont = true; this.gvMx1daa010.Caption = "宸ュ簭缂栧彿"; - this.gvMx1daa010.FieldName = "daa021"; + this.gvMx1daa010.FieldName = "processNo"; this.gvMx1daa010.MinWidth = 50; this.gvMx1daa010.Name = "gvMx1daa010"; this.gvMx1daa010.OptionsColumn.ReadOnly = true; @@ -1123,7 +992,7 @@ this.gvMx1daa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa005.AppearanceCell.Options.UseFont = true; this.gvMx1daa005.Caption = "宸ュ簭鍚嶇О"; - this.gvMx1daa005.FieldName = "itemNo"; + this.gvMx1daa005.FieldName = "processName"; this.gvMx1daa005.MinWidth = 50; this.gvMx1daa005.Name = "gvMx1daa005"; this.gvMx1daa005.OptionsColumn.ReadOnly = true; @@ -1137,81 +1006,82 @@ this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa003.AppearanceCell.Options.UseFont = true; this.gvMx1daa003.Caption = "鐢熶骇杩涘害缁熻鐐�"; - this.gvMx1daa003.FieldName = "daa003"; + this.gvMx1daa003.ColumnEdit = this.repositoryItemComboBox1; + this.gvMx1daa003.FieldName = "statStatus"; this.gvMx1daa003.MinWidth = 50; this.gvMx1daa003.Name = "gvMx1daa003"; this.gvMx1daa003.OptionsColumn.ReadOnly = true; - this.gvMx1daa003.Tag = "query_a.daa003"; + this.gvMx1daa003.Tag = "edit"; this.gvMx1daa003.Visible = true; this.gvMx1daa003.VisibleIndex = 3; this.gvMx1daa003.Width = 50; + // + // 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.Items.AddRange(new object[] { + "Y-鏄�", + "N-鍚�"}); + this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; + this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + // + // gridColumn1 + // + this.gridColumn1.Caption = "鏁版嵁閲囬泦鐐�"; + this.gridColumn1.ColumnEdit = this.repositoryItemComboBox2; + this.gridColumn1.FieldName = "collectionName"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.OptionsColumn.ReadOnly = true; + this.gridColumn1.Tag = "edit"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 4; + this.gridColumn1.Width = 94; + // + // repositoryItemComboBox2 + // + this.repositoryItemComboBox2.AutoHeight = false; + this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemComboBox2.Items.AddRange(new object[] { + "绌�", + "I-鎶曞叆", + "C-閲囬泦", + "F-瀹屽伐", + "E-涓嶈壇", + "J-妫�楠�"}); + this.repositoryItemComboBox2.Name = "repositoryItemComboBox2"; + this.repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; // // gvMx1daa004 // this.gvMx1daa004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1daa004.AppearanceCell.Options.UseFont = true; this.gvMx1daa004.Caption = "涓婂伐搴忕紪鍙�"; - this.gvMx1daa004.FieldName = "daa004"; + this.gvMx1daa004.FieldName = "frontProcessNo"; this.gvMx1daa004.MinWidth = 50; this.gvMx1daa004.Name = "gvMx1daa004"; this.gvMx1daa004.OptionsColumn.ReadOnly = true; - this.gvMx1daa004.Tag = "query_a.daa004"; + this.gvMx1daa004.Tag = "edit"; this.gvMx1daa004.Visible = true; - this.gvMx1daa004.VisibleIndex = 4; + this.gvMx1daa004.VisibleIndex = 5; this.gvMx1daa004.Width = 50; - // - // repositoryItemDateEdit2 - // - this.repositoryItemDateEdit2.AutoHeight = false; - this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2"; - // - // repositoryItemDateEdit3 - // - this.repositoryItemDateEdit3.AutoHeight = false; - this.repositoryItemDateEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit3.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3"; - // - // rptJYBZ - // - this.rptJYBZ.AutoHeight = false; - this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.rptJYBZ.Name = "rptJYBZ"; - this.rptJYBZ.NullText = "-璇烽�夋嫨-"; - this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; // // gvMx1reporttime // this.gvMx1reporttime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gvMx1reporttime.AppearanceCell.Options.UseFont = true; - this.gvMx1reporttime.AppearanceCell.Options.UseForeColor = true; - this.gvMx1reporttime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true; this.gvMx1reporttime.Caption = "澶囨敞"; - this.gvMx1reporttime.FieldName = "daa009"; + this.gvMx1reporttime.FieldName = "remark"; this.gvMx1reporttime.MinWidth = 50; this.gvMx1reporttime.Name = "gvMx1reporttime"; + this.gvMx1reporttime.OptionsColumn.ReadOnly = true; this.gvMx1reporttime.Tag = "edit"; this.gvMx1reporttime.Visible = true; - this.gvMx1reporttime.VisibleIndex = 5; + this.gvMx1reporttime.VisibleIndex = 6; this.gvMx1reporttime.Width = 102; - // - // repositoryItemDateEdit1 - // - this.repositoryItemDateEdit1.AutoHeight = false; - this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1"; // // gvMxDel // @@ -1220,7 +1090,7 @@ this.gvMxDel.MinWidth = 80; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 6; + this.gvMxDel.VisibleIndex = 7; this.gvMxDel.Width = 84; // // repositoryItemButtonEdit1 @@ -1237,11 +1107,11 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1160, 682); + this.ClientSize = new System.Drawing.Size(1160, 744); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_WorkTechnique"; - this.Text = "鐗╂枡淇℃伅"; + this.Text = "浜у搧宸ヨ壓娴佺▼璁剧疆"; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); @@ -1261,66 +1131,52 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txt_cgName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_scName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatusTxt.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_xxName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_wlName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_wwName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kfName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fMaxWeight.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fMinWeight.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemSname.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemType.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemVersion.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_ppbom00019124.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_highlimit.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_lowlimit.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_prdPack.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fSumPeople.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fCapacity.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fLayer.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fVersion.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fJingDu.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fStatus.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_orgName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); this.ResumeLayout(false); @@ -1340,55 +1196,19 @@ private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraEditors.SplitContainerControl splitMx1; private DevExpress.XtraLayout.LayoutControl layoutMx1; - private DevExpress.XtraEditors.TextEdit txt_cgName; private System.Windows.Forms.Label lbGuid; - private DevExpress.XtraEditors.TextEdit txt_scName; - private DevExpress.XtraEditors.TextEdit txt_fforbidstatusTxt; - private DevExpress.XtraEditors.TextEdit txt_xxName; - private DevExpress.XtraEditors.TextEdit txt_dptName; - private DevExpress.XtraEditors.TextEdit txt_wlName; - private DevExpress.XtraEditors.TextEdit txt_wwName; - private DevExpress.XtraEditors.TextEdit txt_kfName; - private DevExpress.XtraEditors.TextEdit txt_fissueType; - private DevExpress.XtraEditors.TextEdit txt_ffinishreceiptoverrate; + private DevExpress.XtraEditors.TextEdit txt_fMaxWeight; + private DevExpress.XtraEditors.TextEdit txt_fMinWeight; private DevExpress.XtraEditors.MemoEdit txt_itemName; private DevExpress.XtraEditors.MemoEdit txt_itemModel; - private DevExpress.XtraEditors.TextEdit txt_itemSname; - private DevExpress.XtraEditors.TextEdit txt_itemDescription; private DevExpress.XtraEditors.TextEdit txt_itemNo; - private DevExpress.XtraEditors.TextEdit txt_itemType; - private DevExpress.XtraEditors.TextEdit txt_itemVersion; - private DevExpress.XtraEditors.TextEdit txt_ppbom00019124; - private DevExpress.XtraEditors.TextEdit txt_materialProperti; - private DevExpress.XtraEditors.TextEdit txt_productionWorkshop; - private DevExpress.XtraEditors.TextEdit txt_highlimit; - private DevExpress.XtraEditors.TextEdit txt_lowlimit; - private DevExpress.XtraEditors.TextEdit txt_prdPack; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; + private DevExpress.XtraEditors.TextEdit txt_fSumPeople; + private DevExpress.XtraEditors.TextEdit txt_fCapacity; + private DevExpress.XtraEditors.TextEdit txt_fNo; + private DevExpress.XtraEditors.TextEdit txt_fLayer; + private DevExpress.XtraEditors.TextEdit txt_remark; + private DevExpress.XtraEditors.TextEdit txt_fVersion; private DevExpress.XtraLayout.LayoutControlGroup Root; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; private DevExpress.XtraGrid.GridControl gcMx1; @@ -1400,12 +1220,37 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa005; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004; - private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2; - private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3; - private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ; private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime; - private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private DevExpress.XtraEditors.ComboBoxEdit txt_fJingDu; + private DevExpress.XtraEditors.DateEdit txt_fBegDate; + private DevExpress.XtraEditors.DateEdit txt_fEndDate; + private DevExpress.XtraEditors.CheckEdit txt_fStatus; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; + private DevExpress.XtraEditors.TextEdit txt_orgName; + private DevExpress.XtraEditors.ComboBoxEdit txt_fType; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraEditors.SimpleButton btnSelect; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs index a3adbfe..0c55abc 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs @@ -1,7 +1,10 @@ -锘縰sing Gs.DevApp.Entity; +锘縰sing DevExpress.Utils.MVVM.Services; +using DevExpress.XtraPrinting.Native; +using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Data; @@ -16,26 +19,65 @@ private readonly string _webServiceName = "MesItemsManager/"; public Frm_WorkTechnique() { - InitializeComponent(); + gridView1.FocusedRowHandle = -1; + gridView1.FocusedRowChanged += (s, e) => + { + if (e.FocusedRowHandle >= 0) + { + DataRow row = gridView1.GetDataRow(e.FocusedRowHandle); + string _guid = row["guid"].ToString(); + getModel(_guid); + } + }; this.pageBar1.setBar(false); + this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; + this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; this.toolBarMenu1.getXmlConfig(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) => { - // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); - // MessageBox.Show(value); + }); - //Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => - //{ - // getModel(value); - //}, (value) => - //{ - // getPageList(this.pageBar1.CurrentPage); - //}); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; + //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏 + btnSelect.Click += (s, e) => + { + var frm = new SelectProcess(); + //璧嬪�肩粰鏄庣粏琛� + frm.UpdateParent += (ss, ee) => + { + try + { + var lst = ee.DynamicList; + DataTable _Table = (DataTable)gcMx1.DataSource; + foreach (dynamic dym in lst) + { + DataRow _row = _Table.NewRow(); + _row["guid"] = ""; + _row["pGuid"] = ""; + _row["processNo"] = dym.processNo; + _row["processName"] = dym.processName; + _Table.Rows.Add(_row); + } + gcMx1.BindingContext = new BindingContext(); + gcMx1.DataSource = _Table; + gcMx1.ForceInitialize(); + gvMx1.CloseEditor(); + gvMx1.PostEditor(); + gvMx1.UpdateCurrentRow(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + } + }; + frm.ShowDialog(); + }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) @@ -109,6 +151,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "", "", _sbSqlWhere.ToString()); @@ -146,7 +189,89 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + /// <summary> + /// 鍙栨秷浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) + { + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx1); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); + } + /// <summary> + /// 淇濆瓨浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) + { + toolBarMenu1.isSetBtn = false; + var _obj = new + { + guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 + fType = txt_fType.Text.Trim(), + fBegDate = txt_fBegDate.Text.Trim(), + fEndDate = txt_fEndDate.Text.Trim(), + fJingDu = txt_fJingDu.Text.Trim(), + fCapacity = txt_fCapacity.Text.Trim(), + fMaxWeight = txt_fMaxWeight.Text.Trim(), + fMinWeight = txt_fMinWeight.Text.Trim(), + fSumPeople = txt_fSumPeople.Text.Trim(), + remark = txt_remark.Text.Trim(), + list = new List<dynamic>(), + }; + gvMx1.CloseEditor(); + gvMx1.PostEditor(); + gvMx1.UpdateCurrentRow(); + for (var i = 0; i < gvMx1.DataRowCount; i++) + { + var row = gvMx1.GetDataRow(i); + if (row != null) + { + _obj.list.Add(new + { + fSeq = row["fSeq"].ToString(),//搴忓彿 + processNo = row["processNo"].ToString(),//宸ュ簭缂栧彿 + statStatus = (row["statStatus"].ToString()),//鐢熶骇杩涘害缁熻鐐� + collectionName = row["collectionName"].ToString(),//閲囬泦鐐� + remark = row["remark"].ToString(),//澶囨敞 + frontProcessNo = row["frontProcessNo"].ToString(),//涓婂伐搴忓彿 + }); + } + } + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + toolBarMenu1.isSetBtn = true; + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx1); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); + toolBarMenu1.currentAction = ""; + } + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + /// <summary> + /// 淇敼浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) + { + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx1); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); + } private void getModel(string strGuid) { bool isEdit = false; @@ -164,14 +289,34 @@ try { var strJson = UtilityHelper.HttpPost("", - _webServiceName + "GetModel", + "WorkTechnique/GetModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { - var dy = _rtn.rtnData; + dynamic dy = _rtn.rtnData; lbGuid.Text = strGuid; - UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit); + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx1); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); + JObject _job = JObject.Parse(strJson); + JArray array = new JArray(); + foreach (var a in _job["rtnData"]["list"]) + { + array.Add(a); + } + DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); + if (dt.Rows.Count > 0) + { + gcMx1.BindingContext = new BindingContext(); + gcMx1.DataSource = dt; + gcMx1.ForceInitialize(); + gvMx1.BestFitColumns(); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } } else { diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs new file mode 100644 index 0000000..f2a5692 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs @@ -0,0 +1,196 @@ +锘縩amespace Gs.DevApp.DevFrm.Work +{ + partial class SelectProcess + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.gcMain = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); + this.btnIn = new DevExpress.XtraEditors.SimpleButton(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); + this.panelControl1.SuspendLayout(); + this.SuspendLayout(); + // + // gcMain + // + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F); + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.MainView = this.gridView1; + this.gcMain.Name = "gcMain"; + this.gcMain.Size = new System.Drawing.Size(535, 542); + this.gcMain.TabIndex = 6; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.ColumnPanelRowHeight = 50; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gv_guid, + this.gridColumn1, + this.gv_supplierItemCode, + this.gv_supplierItemName, + this.gridColumn5}); + this.gridView1.GridControl = this.gcMain; + this.gridView1.IndicatorWidth = 50; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsSelection.MultiSelect = true; + this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gv_guid + // + this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_guid.AppearanceCell.Options.UseFont = true; + this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎"; + this.gv_guid.FieldName = "guid"; + this.gv_guid.MinWidth = 10; + this.gv_guid.Name = "gv_guid"; + this.gv_guid.OptionsColumn.AllowEdit = false; + this.gv_guid.OptionsColumn.ReadOnly = true; + this.gv_guid.Tag = "query_a.guid"; + this.gv_guid.Width = 94; + // + // gridColumn1 + // + this.gridColumn1.Caption = "宸ュ簭缂栧彿"; + this.gridColumn1.FieldName = "hNo"; + this.gridColumn1.MinWidth = 10; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.OptionsColumn.ReadOnly = true; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 1; + this.gridColumn1.Width = 94; + // + // gv_supplierItemCode + // + this.gv_supplierItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true; + this.gv_supplierItemCode.Caption = "宸ュ簭鍚嶇О"; + this.gv_supplierItemCode.FieldName = "name"; + this.gv_supplierItemCode.MinWidth = 10; + this.gv_supplierItemCode.Name = "gv_supplierItemCode"; + this.gv_supplierItemCode.OptionsColumn.AllowEdit = false; + this.gv_supplierItemCode.OptionsColumn.ReadOnly = true; + this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE"; + this.gv_supplierItemCode.Visible = true; + this.gv_supplierItemCode.VisibleIndex = 2; + this.gv_supplierItemCode.Width = 100; + // + // gv_supplierItemName + // + this.gv_supplierItemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_supplierItemName.AppearanceCell.Options.UseFont = true; + this.gv_supplierItemName.Caption = "宸ュ簭澶囨敞"; + this.gv_supplierItemName.FieldName = "remark"; + this.gv_supplierItemName.MinWidth = 10; + this.gv_supplierItemName.Name = "gv_supplierItemName"; + this.gv_supplierItemName.OptionsColumn.AllowEdit = false; + this.gv_supplierItemName.OptionsColumn.ReadOnly = true; + this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME"; + this.gv_supplierItemName.Visible = true; + this.gv_supplierItemName.VisibleIndex = 3; + this.gv_supplierItemName.Width = 120; + // + // gridColumn5 + // + this.gridColumn5.Caption = "鏄惁杩斿伐鐐�"; + this.gridColumn5.FieldName = "isBack"; + this.gridColumn5.MinWidth = 10; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.OptionsColumn.ReadOnly = true; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 4; + this.gridColumn5.Width = 250; + // + // panelControl1 + // + this.panelControl1.Controls.Add(this.btnIn); + this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panelControl1.Location = new System.Drawing.Point(0, 542); + this.panelControl1.Name = "panelControl1"; + this.panelControl1.Size = new System.Drawing.Size(535, 43); + this.panelControl1.TabIndex = 9; + // + // btnIn + // + this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; + this.btnIn.Appearance.Options.UseBackColor = true; + this.btnIn.Dock = System.Windows.Forms.DockStyle.Right; + this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161; + this.btnIn.Location = new System.Drawing.Point(439, 2); + this.btnIn.Name = "btnIn"; + this.btnIn.Size = new System.Drawing.Size(94, 39); + this.btnIn.TabIndex = 4; + this.btnIn.Text = "纭畾瀵煎叆"; + // + // SelectProcess + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(535, 585); + this.Controls.Add(this.gcMain); + this.Controls.Add(this.panelControl1); + this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; + this.Name = "SelectProcess"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "閫夋嫨宸ュ簭"; + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); + this.panelControl1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gv_guid; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode; + private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraEditors.PanelControl panelControl1; + private DevExpress.XtraEditors.SimpleButton btnIn; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs new file mode 100644 index 0000000..7618429 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs @@ -0,0 +1,84 @@ +锘縰sing Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Data; +using System.Windows.Forms; + +namespace Gs.DevApp.DevFrm.Work +{ + public partial class SelectProcess : DevExpress.XtraEditors.XtraForm + { + private readonly string _webServiceName = "WorkPro/"; + public SelectProcess() + { + InitializeComponent(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) => + { + + }); + getPageList(1); + btnIn.Click += (s, e) => + { + var list = new List<dynamic>(); + int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿 + DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮 + foreach (int idx in rows) + { + list.Add(new + { + fSeq = "001", + processNo = dt.Rows[idx]["hNo"].ToString(), + processName = dt.Rows[idx]["name"].ToString(), + }); + } + UpdateParent?.Invoke(this, + new UpdateParentEventArgs { DynamicList = list }); + Close(); + }; + } + + /// <summary> + /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢 + /// </summary> + public event EventHandler<UpdateParentEventArgs> UpdateParent; + + /// <summary> + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + var _sbSqlWhere = ""; + var pgq = new PageQueryModel(curPage, 999999, "a.hNo", "asc", "", _sbSqlWhere.ToString()); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + } + else + UtilityHelper.SetDefaultTable(gcMain, gridView1); + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.resx b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 2fd5a97..1f3b32e 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -731,6 +731,12 @@ <Compile Include="DevFrm\Work\Frm_WorkTechnique.Designer.cs"> <DependentUpon>Frm_WorkTechnique.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Work\SelectProcess.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Work\SelectProcess.Designer.cs"> + <DependentUpon>SelectProcess.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\WW\Frm_WwBlDj.cs"> <SubType>Form</SubType> </Compile> @@ -1379,6 +1385,9 @@ <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechnique.resx"> <DependentUpon>Frm_WorkTechnique.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Work\SelectProcess.resx"> + <DependentUpon>SelectProcess.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\WW\Frm_WwBlDj.resx"> <DependentUpon>Frm_WwBlDj.cs</DependentUpon> </EmbeddedResource> diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx index 834ccd9..bcf5540 100644 --- a/DevApp/Gs.DevApp/Properties/licenses.licx +++ b/DevApp/Gs.DevApp/Properties/licenses.licx @@ -1,16 +1,17 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -- Gitblit v1.9.3