From 7c1bfcd20a0da13c66659dea4f105805fc25465d Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 23 五月 2025 16:15:10 +0800 Subject: [PATCH] 工艺复制 --- DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs | 12 DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10 DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs | 45 DevApp/Gs.DevApp/Resources/copy_16x16.png | 0 DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs | 35 DevApp/Gs.DevApp/Gs.DevApp.csproj | 10 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs | 1 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs | 854 ++++++++++++++++++++++++++ DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 21 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 15 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs | 261 ++++++++ DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 2 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 58 + DevApp/Gs.DevApp/Properties/Resources.resx | 355 +++++----- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs | 77 +- DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs | 2 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.resx | 120 +++ 17 files changed, 1,618 insertions(+), 260 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs index 620f640..7efe937 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs @@ -130,6 +130,7 @@ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -276,7 +277,8 @@ this.gv_returnType, this.gv_depotId, this.gv_suppId, - this.gv_remark}); + this.gv_remark, + this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -1244,6 +1246,16 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // gridColumn7 + // + this.gridColumn7.Caption = "涓婚敭GUID"; + this.gridColumn7.FieldName = "guid"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 14; + this.gridColumn7.Width = 94; + // // Frm_MesCgthSq // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1400,5 +1412,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs index 75236f6..f22cc43 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs @@ -30,14 +30,14 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -136,6 +136,7 @@ this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -288,7 +289,8 @@ this.gv_reason, this.gv_fmrmode, this.gridColumn7, - this.gridColumn18}); + this.gridColumn18, + this.gridColumn19}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -740,32 +742,32 @@ this.layoutControlItem15}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition1.Width = 100D; - columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition2.Width = 100D; - columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition3.Width = 100D; - columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition4.Width = 100D; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition1, - columnDefinition2, - columnDefinition3, - columnDefinition4}); - rowDefinition1.Height = 100D; - rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition2.Height = 100D; - rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition3.Height = 100D; - rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition4.Height = 100D; - rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5, + columnDefinition6, + columnDefinition7, + columnDefinition8}); + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition8.Height = 100D; + rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3, - rowDefinition4}); + rowDefinition5, + rowDefinition6, + rowDefinition7, + rowDefinition8}); this.Root.Size = new System.Drawing.Size(1126, 137); this.Root.TextVisible = false; // @@ -1346,6 +1348,14 @@ this.layoutControlItem4.Size = new System.Drawing.Size(138, 73); this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20); // + // gridColumn19 + // + this.gridColumn19.Caption = "涓婚敭GUID"; + this.gridColumn19.FieldName = "guid"; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Width = 94; + // // Frm_MesCgthSqDj // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1517,5 +1527,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs index 237b7be..741dbc8 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs @@ -86,7 +86,7 @@ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒"); return; } - JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType); + Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim(), strType); frm.ShowDialog(); }; } diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs index c293210..f3f1c30 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs @@ -41,7 +41,7 @@ getPageList(1); btnIn.Click += (s, e) => { - var list = new List<dynamic>(); + var list = new List<dynamic>(); gridView1.PostEditor(); gridView1.UpdateCurrentRow(); DataTable dt = this.gcMain.DataSource as DataTable; diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs index 008cfeb..96d1e89 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs @@ -166,6 +166,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -178,7 +179,8 @@ // // split1.Panel2 // - this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -381,7 +383,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); - this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -391,6 +393,7 @@ // splitMx1.Panel2 // this.splitMx1.Panel2.Text = "Panel2"; + this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); this.splitMx1.SplitterPosition = 125; this.splitMx1.TabIndex = 0; @@ -616,17 +619,18 @@ this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem6.Size = new System.Drawing.Size(276, 35); - this.layoutControlItem6.Text = "寤虹珛鑰�"; + this.layoutControlItem6.Text = "寤虹珛浜哄憳"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_lastUpdateBy; + this.layoutControlItem7.CustomizationFormText = "鏇存柊浜哄憳"; this.layoutControlItem7.Location = new System.Drawing.Point(828, 0); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.Size = new System.Drawing.Size(278, 35); - this.layoutControlItem7.Text = "鏇存柊鑰�"; + this.layoutControlItem7.Text = "鏇存柊浜哄憳"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs index 4f49471..58e734d 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs @@ -320,6 +320,5 @@ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } - } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs index 3a45a19..1505a50 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs @@ -80,6 +80,7 @@ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit(); this.txt_checkDate = new DevExpress.XtraEditors.TextEdit(); this.txt_isCheck = new DevExpress.XtraEditors.CheckEdit(); + this.btnCopy = new DevExpress.XtraEditors.SimpleButton(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -102,12 +103,14 @@ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = 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(); @@ -119,7 +122,6 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); - this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -182,6 +184,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -402,6 +405,7 @@ this.layoutMx1.Controls.Add(this.txt_checkBy); this.layoutMx1.Controls.Add(this.txt_checkDate); this.layoutMx1.Controls.Add(this.txt_isCheck); + this.layoutMx1.Controls.Add(this.btnCopy); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem16, @@ -409,7 +413,7 @@ this.layoutControlItem2}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(39, 252, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(-31, 392, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(708, 189); this.layoutMx1.TabIndex = 0; @@ -636,6 +640,18 @@ this.txt_isCheck.TabIndex = 425; this.txt_isCheck.Tag = "readonly"; // + // btnCopy + // + this.btnCopy.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; + this.btnCopy.Appearance.Options.UseBackColor = true; + this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copy_16x16; + this.btnCopy.Location = new System.Drawing.Point(150, 136); + this.btnCopy.Name = "btnCopy"; + this.btnCopy.Size = new System.Drawing.Size(134, 27); + this.btnCopy.StyleController = this.layoutMx1; + this.btnCopy.TabIndex = 426; + this.btnCopy.Text = "澶嶅埗鍒板叾瀹冧骇鍝�"; + // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_guid; @@ -692,7 +708,8 @@ this.layoutControlItem9, this.layoutControlItem4, this.layoutControlItem12, - this.layoutControlItem15}); + this.layoutControlItem15, + this.layoutControlItem10}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -932,6 +949,18 @@ this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem15.TextVisible = false; // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.btnCopy; + this.layoutControlItem10.Location = new System.Drawing.Point(138, 124); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem10.Size = new System.Drawing.Size(138, 31); + this.layoutControlItem10.Text = "澶嶅埗"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem10.TextVisible = false; + // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1019,6 +1048,16 @@ this.gvMx1daa010.Visible = true; this.gvMx1daa010.VisibleIndex = 1; this.gvMx1daa010.Width = 129; + // + // gridColumn5 + // + this.gridColumn5.Caption = "宸ュ簭鍚嶇О"; + this.gridColumn5.FieldName = "processName"; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 2; + this.gridColumn5.Width = 94; // // gvMx1daa003 // @@ -1165,16 +1204,6 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // - // gridColumn5 - // - this.gridColumn5.Caption = "宸ュ簭鍚嶇О"; - this.gridColumn5.FieldName = "processName"; - this.gridColumn5.MinWidth = 25; - this.gridColumn5.Name = "gridColumn5"; - this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 2; - this.gridColumn5.Width = 94; - // // Frm_WorkTechnique // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1247,6 +1276,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1336,5 +1366,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraEditors.SimpleButton btnCopy; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; } } \ 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 fe9c91c..ee7acdd 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs @@ -1,4 +1,5 @@ 锘� +using Gs.DevApp.DevFrm.QC; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -82,6 +83,22 @@ frm.ShowDialog(); }; _getListJyxm(); + //澶嶅埗 + btnCopy.Click += (s, e) => + { + if ((lbGuid.Text.Trim().Length < 10)) + { + Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛淇濆瓨褰撳墠淇℃伅锛�"); + return; + } + if ((txt_isCheck.Checked == false)) + { + Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒"); + return; + } + Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim(), ""); + frm.ShowDialog(); + }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) @@ -156,7 +173,7 @@ private void getPageList(int curPage) { gcMain1.DataSource = null; - gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + 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()); var json = JsonConvert.SerializeObject(pgq); @@ -321,7 +338,7 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); toolBarMenu1.currentAction = ""; - //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); + //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } } catch (Exception ex) diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs new file mode 100644 index 0000000..a3c4555 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs @@ -0,0 +1,854 @@ +锘縩amespace Gs.DevApp.DevFrm.QC +{ + partial class Frm_WorkTechniqueShow + { + /// <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() + { + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + this.wizardControl1 = new DevExpress.XtraWizard.WizardControl(); + this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage(); + this.gcMx1 = new DevExpress.XtraGrid.GridControl(); + this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptJYGJ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.sampleSizeName = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptJYSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.wizardPage1 = new DevExpress.XtraWizard.WizardPage(); + this.splitLeft = new DevExpress.XtraEditors.SplitContainerControl(); + this.gcMain = new DevExpress.XtraGrid.GridControl(); + this.gvMain = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn(); + this.panBom = new DevExpress.XtraEditors.PanelControl(); + this.pageBar1 = new UserControls.Data.UcPageBar(); + this.splitRight = new DevExpress.XtraEditors.SplitContainerControl(); + this.btnIn = new DevExpress.XtraEditors.SimpleButton(); + this.gcMainCopy = new DevExpress.XtraGrid.GridControl(); + this.gvMainCopy = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptBtnDel = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.completionWizardPage1 = new DevExpress.XtraWizard.CompletionWizardPage(); + ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).BeginInit(); + this.wizardControl1.SuspendLayout(); + this.welcomeWizardPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + this.wizardPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).BeginInit(); + this.splitLeft.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel2)).BeginInit(); + this.splitLeft.Panel2.SuspendLayout(); + this.splitLeft.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.panBom)).BeginInit(); + this.panBom.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitRight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel1)).BeginInit(); + this.splitRight.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel2)).BeginInit(); + this.splitRight.Panel2.SuspendLayout(); + this.splitRight.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).BeginInit(); + this.SuspendLayout(); + // + // wizardControl1 + // + this.wizardControl1.CancelText = "鍙栨秷"; + this.wizardControl1.Controls.Add(this.welcomeWizardPage1); + this.wizardControl1.Controls.Add(this.wizardPage1); + this.wizardControl1.Controls.Add(this.completionWizardPage1); + this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardControl1.FinishText = "&淇濆瓨"; + this.wizardControl1.ImageOptions.ImageWidth = 100; + this.wizardControl1.Margin = new System.Windows.Forms.Padding(4); + this.wizardControl1.MinimumSize = new System.Drawing.Size(133, 138); + this.wizardControl1.Name = "wizardControl1"; + this.wizardControl1.NextText = "&涓嬩竴姝� >"; + this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] { + this.welcomeWizardPage1, + this.wizardPage1, + this.completionWizardPage1}); + this.wizardControl1.PreviousText = "< &涓婁竴姝�"; + this.wizardControl1.Size = new System.Drawing.Size(1038, 718); + this.wizardControl1.Text = ""; + // + // welcomeWizardPage1 + // + this.welcomeWizardPage1.Controls.Add(this.gcMx1); + this.welcomeWizardPage1.IntroductionText = "璇ュ悜瀵硷紝灏嗘妸褰撳墠鐗╂枡鐨勬楠岄」鐩紝澶嶅埗涓�涓垨澶氫釜鐗╂枡锛屽鍒惰繃绋嬩腑锛岃嫢閲嶅閫夋嫨浜嗙墿鏂欙紝灏嗚嚜鍔ㄨ繃婊わ紝鍙細澶嶅埗涓�娆★紒"; + this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4); + this.welcomeWizardPage1.Name = "welcomeWizardPage1"; + this.welcomeWizardPage1.ProceedText = "鐐瑰嚮 Next 缁х画杩涜"; + this.welcomeWizardPage1.Size = new System.Drawing.Size(898, 553); + this.welcomeWizardPage1.Text = "褰撳墠妫�楠岄」鐩俊鎭�"; + // + // gcMx1 + // + this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx1.Location = new System.Drawing.Point(0, 0); + this.gcMx1.MainView = this.gvMx1; + this.gcMx1.Name = "gcMx1"; + this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.rptJYXM, + this.rptJYGJ, + this.rptJYBZ, + this.rptJSSP, + this.rptJYSP, + this.repositoryItemButtonEdit1, + this.repositoryItemComboBox1}); + this.gcMx1.Size = new System.Drawing.Size(898, 553); + this.gcMx1.TabIndex = 1; + this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx1}); + // + // gvMx1 + // + this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gvMx1guid, + this.gvMx1pid, + this.gvMx1fcheckItem, + this.gvMx1forder, + this.gridColumn5, + this.gvMx1memo, + this.gvMx1fcheckTool, + this.gvMx1sampleSizeNo, + this.sampleSizeName, + this.gvMx1fcheckLevel, + this.gvMx1facLevel, + this.gvMx1fupAllow, + this.gvMx1fstand, + this.gvMx1fdownAllow, + this.gridColumn19}); + this.gvMx1.GridControl = this.gcMx1; + this.gvMx1.Name = "gvMx1"; + this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gvMx1.OptionsFind.ShowSearchNavButtons = false; + this.gvMx1.OptionsView.ShowGroupPanel = false; + // + // gvMx1guid + // + this.gvMx1guid.AppearanceCell.Options.UseFont = true; + this.gvMx1guid.Caption = "guid"; + this.gvMx1guid.FieldName = "guid"; + this.gvMx1guid.Name = "gvMx1guid"; + this.gvMx1guid.Tag = "query_a.guid"; + this.gvMx1guid.Width = 94; + // + // gvMx1pid + // + this.gvMx1pid.AppearanceCell.Options.UseFont = true; + this.gvMx1pid.Caption = "pid"; + this.gvMx1pid.FieldName = "pid"; + this.gvMx1pid.Name = "gvMx1pid"; + this.gvMx1pid.Tag = "query_a.pid"; + this.gvMx1pid.Width = 94; + // + // gvMx1fcheckItem + // + this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true; + this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�"; + this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM; + this.gvMx1fcheckItem.FieldName = "fcheckItem"; + this.gvMx1fcheckItem.Name = "gvMx1fcheckItem"; + this.gvMx1fcheckItem.Tag = "edit"; + this.gvMx1fcheckItem.Visible = true; + this.gvMx1fcheckItem.VisibleIndex = 0; + this.gvMx1fcheckItem.Width = 150; + // + // rptJYXM + // + this.rptJYXM.AutoHeight = false; + this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.rptJYXM.Name = "rptJYXM"; + // + // gvMx1forder + // + this.gvMx1forder.AppearanceCell.Options.UseFont = true; + this.gvMx1forder.Caption = "椤哄簭"; + this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1; + this.gvMx1forder.FieldName = "forder"; + this.gvMx1forder.Name = "gvMx1forder"; + this.gvMx1forder.Tag = "yz_quantity_0_edit"; + this.gvMx1forder.Visible = true; + this.gvMx1forder.VisibleIndex = 1; + this.gvMx1forder.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[] { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "14", + "15"}); + this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; + // + // gridColumn5 + // + this.gridColumn5.Caption = "瑙勬牸瑕佹眰"; + this.gridColumn5.FieldName = "fspecRequ"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Tag = "edit"; + this.gridColumn5.Width = 150; + // + // gvMx1memo + // + this.gvMx1memo.AppearanceCell.Options.UseFont = true; + this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�"; + this.gvMx1memo.FieldName = "memo"; + this.gvMx1memo.Name = "gvMx1memo"; + this.gvMx1memo.Tag = "edit"; + this.gvMx1memo.Width = 150; + // + // gvMx1fcheckTool + // + this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true; + this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�"; + this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ; + this.gvMx1fcheckTool.FieldName = "fcheckTool"; + this.gvMx1fcheckTool.Name = "gvMx1fcheckTool"; + this.gvMx1fcheckTool.Tag = "edit"; + this.gvMx1fcheckTool.Visible = true; + this.gvMx1fcheckTool.VisibleIndex = 2; + this.gvMx1fcheckTool.Width = 150; + // + // rptJYGJ + // + this.rptJYGJ.AutoHeight = false; + this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.rptJYGJ.Name = "rptJYGJ"; + this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + // + // gvMx1sampleSizeNo + // + this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true; + this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�"; + this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ; + this.gvMx1sampleSizeNo.FieldName = "sampleSizeName"; + this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo"; + this.gvMx1sampleSizeNo.Tag = "edit"; + this.gvMx1sampleSizeNo.Visible = true; + this.gvMx1sampleSizeNo.VisibleIndex = 3; + this.gvMx1sampleSizeNo.Width = 150; + // + // 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.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + // + // sampleSizeName + // + this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�"; + this.sampleSizeName.FieldName = "sampleSizeNo"; + this.sampleSizeName.Name = "sampleSizeName"; + this.sampleSizeName.OptionsColumn.ReadOnly = true; + this.sampleSizeName.Tag = "edit"; + this.sampleSizeName.Width = 150; + // + // gvMx1fcheckLevel + // + this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true; + this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�"; + this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP; + this.gvMx1fcheckLevel.FieldName = "fcheckLevel"; + this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel"; + this.gvMx1fcheckLevel.Tag = "edit"; + this.gvMx1fcheckLevel.Visible = true; + this.gvMx1fcheckLevel.VisibleIndex = 4; + this.gvMx1fcheckLevel.Width = 200; + // + // rptJYSP + // + this.rptJYSP.AutoHeight = false; + this.rptJYSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.rptJYSP.Name = "rptJYSP"; + this.rptJYSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + // + // gvMx1facLevel + // + this.gvMx1facLevel.AppearanceCell.Options.UseFont = true; + this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩"; + this.gvMx1facLevel.ColumnEdit = this.rptJSSP; + this.gvMx1facLevel.FieldName = "facLevel"; + this.gvMx1facLevel.Name = "gvMx1facLevel"; + this.gvMx1facLevel.Tag = "edit"; + this.gvMx1facLevel.Visible = true; + this.gvMx1facLevel.VisibleIndex = 5; + this.gvMx1facLevel.Width = 150; + // + // rptJSSP + // + this.rptJSSP.AutoHeight = false; + this.rptJSSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.rptJSSP.Name = "rptJSSP"; + this.rptJSSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + // + // gvMx1fupAllow + // + this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true; + this.gvMx1fupAllow.Caption = "涓婇檺"; + this.gvMx1fupAllow.FieldName = "fupAllow"; + this.gvMx1fupAllow.Name = "gvMx1fupAllow"; + this.gvMx1fupAllow.Tag = "yz_quantity_0_edit"; + this.gvMx1fupAllow.Visible = true; + this.gvMx1fupAllow.VisibleIndex = 6; + this.gvMx1fupAllow.Width = 60; + // + // gvMx1fstand + // + this.gvMx1fstand.AppearanceCell.Options.UseFont = true; + this.gvMx1fstand.Caption = "鏍囧噯鍊�"; + this.gvMx1fstand.FieldName = "fstand"; + this.gvMx1fstand.Name = "gvMx1fstand"; + this.gvMx1fstand.Tag = "yz_quantity_0_edit"; + this.gvMx1fstand.Visible = true; + this.gvMx1fstand.VisibleIndex = 7; + this.gvMx1fstand.Width = 60; + // + // gvMx1fdownAllow + // + this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true; + this.gvMx1fdownAllow.Caption = "涓嬮檺"; + this.gvMx1fdownAllow.FieldName = "fdownAllow"; + this.gvMx1fdownAllow.Name = "gvMx1fdownAllow"; + this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit"; + this.gvMx1fdownAllow.Visible = true; + this.gvMx1fdownAllow.VisibleIndex = 8; + this.gvMx1fdownAllow.Width = 60; + // + // gridColumn19 + // + this.gridColumn19.Caption = "鏍峰搧鍩烘暟"; + this.gridColumn19.FieldName = "ypsl"; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Tag = "edit"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 9; + this.gridColumn19.Width = 94; + // + // repositoryItemButtonEdit1 + // + this.repositoryItemButtonEdit1.AutoHeight = false; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; + this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + // + // wizardPage1 + // + this.wizardPage1.Controls.Add(this.splitLeft); + this.wizardPage1.DescriptionText = "浣犲彲浠ラ�夋嫨涓�涓垨澶氫釜"; + this.wizardPage1.Margin = new System.Windows.Forms.Padding(4); + this.wizardPage1.Name = "wizardPage1"; + this.wizardPage1.Size = new System.Drawing.Size(998, 540); + this.wizardPage1.Text = "閫夋嫨鐗╂枡"; + // + // splitLeft + // + this.splitLeft.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitLeft.Location = new System.Drawing.Point(0, 0); + this.splitLeft.Name = "splitLeft"; + // + // splitLeft.Panel1 + // + this.splitLeft.Panel1.Controls.Add(this.gcMain); + this.splitLeft.Panel1.Controls.Add(this.panBom); + this.splitLeft.Panel1.Text = "Panel1"; + // + // splitLeft.Panel2 + // + this.splitLeft.Panel2.Controls.Add(this.splitRight); + this.splitLeft.Panel2.Text = "Panel2"; + this.splitLeft.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.splitLeft.Size = new System.Drawing.Size(998, 540); + this.splitLeft.SplitterPosition = 519; + this.splitLeft.TabIndex = 1; + // + // gcMain + // + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.MainView = this.gvMain; + this.gcMain.Name = "gcMain"; + this.gcMain.Size = new System.Drawing.Size(519, 496); + this.gcMain.TabIndex = 7; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMain}); + // + // gvMain + // + this.gvMain.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gvMain.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gvMain.Appearance.Row.Options.UseFont = true; + this.gvMain.ColumnPanelRowHeight = 50; + this.gvMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.colChkInt, + this.gv_guid, + this.gridColumn1, + this.gv2, + this.gv_salesOrderId, + this.gv_orderLineId, + this.gv_itemId}); + this.gvMain.GridControl = this.gcMain; + this.gvMain.IndicatorWidth = 50; + this.gvMain.Name = "gvMain"; + this.gvMain.OptionsFind.ShowSearchNavButtons = false; + this.gvMain.OptionsView.ShowAutoFilterRow = true; + this.gvMain.OptionsView.ShowGroupPanel = false; + // + // colChkInt + // + this.colChkInt.Caption = "."; + this.colChkInt.FieldName = "chkInt"; + this.colChkInt.MinWidth = 25; + this.colChkInt.Name = "colChkInt"; + this.colChkInt.Visible = true; + this.colChkInt.VisibleIndex = 0; + this.colChkInt.Width = 94; + // + // gv_guid + // + this.gv_guid.AppearanceCell.Options.UseFont = true; + this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎"; + this.gv_guid.FieldName = "guid"; + this.gv_guid.MinWidth = 50; + this.gv_guid.Name = "gv_guid"; + this.gv_guid.OptionsColumn.AllowEdit = false; + this.gv_guid.Tag = "a.guid"; + this.gv_guid.Width = 94; + // + // gridColumn1 + // + this.gridColumn1.Caption = "浣跨敤缁勭粐"; + this.gridColumn1.FieldName = "fSubsidiary"; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Tag = "org.FNumber"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 4; + this.gridColumn1.Width = 50; + // + // gv2 + // + this.gv2.AppearanceCell.Options.UseFont = true; + this.gv2.Caption = "鐗╂枡ID"; + this.gv2.FieldName = "id"; + this.gv2.Name = "gv2"; + this.gv2.OptionsColumn.AllowEdit = false; + this.gv2.Tag = "a.id"; + this.gv2.Visible = true; + this.gv2.VisibleIndex = 1; + this.gv2.Width = 50; + // + // gv_salesOrderId + // + this.gv_salesOrderId.AppearanceCell.Options.UseFont = true; + this.gv_salesOrderId.Caption = "鐗╂枡缂栫爜"; + this.gv_salesOrderId.FieldName = "itemNo"; + this.gv_salesOrderId.Name = "gv_salesOrderId"; + this.gv_salesOrderId.OptionsColumn.AllowEdit = false; + this.gv_salesOrderId.Tag = "a.item_no"; + this.gv_salesOrderId.Visible = true; + this.gv_salesOrderId.VisibleIndex = 2; + this.gv_salesOrderId.Width = 50; + // + // gv_orderLineId + // + this.gv_orderLineId.AppearanceCell.Options.UseFont = true; + this.gv_orderLineId.Caption = "鐗╂枡鍚嶇О"; + this.gv_orderLineId.FieldName = "itemName"; + this.gv_orderLineId.Name = "gv_orderLineId"; + this.gv_orderLineId.OptionsColumn.AllowEdit = false; + this.gv_orderLineId.Tag = "a.item_name"; + this.gv_orderLineId.Visible = true; + this.gv_orderLineId.VisibleIndex = 3; + this.gv_orderLineId.Width = 50; + // + // gv_itemId + // + this.gv_itemId.AppearanceCell.Options.UseFont = true; + this.gv_itemId.Caption = "鐗╂枡瑙勬牸"; + this.gv_itemId.FieldName = "itemModel"; + this.gv_itemId.Name = "gv_itemId"; + this.gv_itemId.OptionsColumn.AllowEdit = false; + this.gv_itemId.Tag = "a.item_model"; + this.gv_itemId.Width = 50; + // + // panBom + // + this.panBom.Controls.Add(this.pageBar1); + this.panBom.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panBom.Location = new System.Drawing.Point(0, 496); + this.panBom.Name = "panBom"; + this.panBom.Size = new System.Drawing.Size(519, 44); + this.panBom.TabIndex = 6; + // + // pageBar1 + // + this.pageBar1.CurrentPage = 1; + this.pageBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pageBar1.Location = new System.Drawing.Point(2, 2); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); + this.pageBar1.Name = "pageBar1"; + this.pageBar1.RecordCount = 0; + this.pageBar1.Size = new System.Drawing.Size(515, 40); + this.pageBar1.TabIndex = 3; + this.pageBar1.TotalPages = 0; + // + // splitRight + // + this.splitRight.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitRight.Location = new System.Drawing.Point(0, 0); + this.splitRight.Name = "splitRight"; + // + // splitRight.Panel1 + // + this.splitRight.Panel1.Controls.Add(this.btnIn); + this.splitRight.Panel1.Text = "Panel1"; + // + // splitRight.Panel2 + // + this.splitRight.Panel2.Controls.Add(this.gcMainCopy); + this.splitRight.Panel2.Text = "Panel2"; + this.splitRight.Size = new System.Drawing.Size(467, 540); + this.splitRight.SplitterPosition = 45; + this.splitRight.TabIndex = 3; + // + // btnIn + // + this.btnIn.Appearance.ForeColor = System.Drawing.Color.Blue; + this.btnIn.Appearance.Options.UseForeColor = true; + this.btnIn.Location = new System.Drawing.Point(4, 199); + this.btnIn.Name = "btnIn"; + this.btnIn.Size = new System.Drawing.Size(39, 29); + this.btnIn.TabIndex = 0; + this.btnIn.Text = ">>"; + // + // gcMainCopy + // + this.gcMainCopy.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMainCopy.Location = new System.Drawing.Point(0, 0); + this.gcMainCopy.MainView = this.gvMainCopy; + this.gcMainCopy.Name = "gcMainCopy"; + this.gcMainCopy.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.rptBtnDel}); + this.gcMainCopy.Size = new System.Drawing.Size(410, 540); + this.gcMainCopy.TabIndex = 2; + this.gcMainCopy.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMainCopy}); + // + // gvMainCopy + // + this.gvMainCopy.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn11, + this.gridColumn12, + this.gridColumn13, + this.gridColumn14, + this.gridColumn15, + this.gridColumn6, + this.gridColumn9}); + this.gvMainCopy.GridControl = this.gcMainCopy; + this.gvMainCopy.Name = "gvMainCopy"; + this.gvMainCopy.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; + this.gvMainCopy.OptionsFind.ShowSearchNavButtons = false; + this.gvMainCopy.OptionsView.ShowGroupPanel = false; + // + // gridColumn11 + // + this.gridColumn11.AppearanceCell.Options.UseFont = true; + this.gridColumn11.Caption = "浣跨敤缁勭粐"; + this.gridColumn11.FieldName = "fSubsidiary"; + this.gridColumn11.MinWidth = 10; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.OptionsColumn.ReadOnly = true; + this.gridColumn11.Tag = "query_a.FCHECK_ITEM"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 0; + this.gridColumn11.Width = 150; + // + // gridColumn12 + // + this.gridColumn12.Caption = "鐗╂枡ID"; + this.gridColumn12.FieldName = "id"; + this.gridColumn12.MinWidth = 10; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.OptionsColumn.ReadOnly = true; + this.gridColumn12.Tag = "query_a.item_id"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 1; + this.gridColumn12.Width = 150; + // + // gridColumn13 + // + this.gridColumn13.AppearanceCell.Options.UseFont = true; + this.gridColumn13.Caption = "鐗╂枡缂栧彿"; + this.gridColumn13.FieldName = "itemNo"; + this.gridColumn13.MinWidth = 10; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.OptionsColumn.ReadOnly = true; + this.gridColumn13.Tag = "query_a.item_no"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 2; + this.gridColumn13.Width = 150; + // + // gridColumn14 + // + this.gridColumn14.AppearanceCell.Options.UseFont = true; + this.gridColumn14.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn14.FieldName = "itemName"; + this.gridColumn14.MinWidth = 10; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.OptionsColumn.ReadOnly = true; + this.gridColumn14.Tag = "query_a.item_name"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 3; + this.gridColumn14.Width = 150; + // + // gridColumn15 + // + this.gridColumn15.AppearanceCell.Options.UseFont = true; + this.gridColumn15.Caption = "瑙勬牸鍨嬪彿"; + this.gridColumn15.FieldName = "itemModel"; + this.gridColumn15.MinWidth = 10; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.OptionsColumn.ReadOnly = true; + this.gridColumn15.Tag = "query_a.item_model"; + this.gridColumn15.Width = 150; + // + // gridColumn6 + // + this.gridColumn6.Caption = "绉诲嚭"; + this.gridColumn6.ColumnEdit = this.rptBtnDel; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 4; + this.gridColumn6.Width = 94; + // + // rptBtnDel + // + this.rptBtnDel.AutoHeight = false; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.rptBtnDel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.rptBtnDel.Name = "rptBtnDel"; + this.rptBtnDel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptBtnDel.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnDel_ButtonClick); + // + // gridColumn9 + // + this.gridColumn9.Caption = "gridColumn9"; + this.gridColumn9.FieldName = "guid"; + this.gridColumn9.MinWidth = 25; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Width = 94; + // + // completionWizardPage1 + // + this.completionWizardPage1.FinishText = "鏈�鍚庝竴姝ワ紝鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�"; + this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4); + this.completionWizardPage1.Name = "completionWizardPage1"; + this.completionWizardPage1.ProceedText = "鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�"; + this.completionWizardPage1.Size = new System.Drawing.Size(898, 553); + this.completionWizardPage1.Text = "淇濆瓨淇℃伅"; + // + // JyxmShow + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1038, 718); + this.Controls.Add(this.wizardControl1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Margin = new System.Windows.Forms.Padding(4); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "JyxmShow"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "妫�楠岄」鐩鍒�"; + ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit(); + this.wizardControl1.ResumeLayout(false); + this.welcomeWizardPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + this.wizardPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).EndInit(); + this.splitLeft.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel2)).EndInit(); + this.splitLeft.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).EndInit(); + this.splitLeft.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.panBom)).EndInit(); + this.panBom.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel1)).EndInit(); + this.splitRight.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel2)).EndInit(); + this.splitRight.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitRight)).EndInit(); + this.splitRight.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraWizard.WizardControl wizardControl1; + private DevExpress.XtraWizard.WelcomeWizardPage welcomeWizardPage1; + private DevExpress.XtraWizard.WizardPage wizardPage1; + private DevExpress.XtraWizard.CompletionWizardPage completionWizardPage1; + private DevExpress.XtraEditors.SplitContainerControl splitLeft; + private DevExpress.XtraGrid.GridControl gcMainCopy; + private DevExpress.XtraGrid.Views.Grid.GridView gvMainCopy; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBtnDel; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraEditors.SplitContainerControl splitRight; + private DevExpress.XtraEditors.SimpleButton btnIn; + private DevExpress.XtraEditors.PanelControl panBom; + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gvMain; + private DevExpress.XtraGrid.Columns.GridColumn gv_guid; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gv2; + private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId; + private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId; + private DevExpress.XtraGrid.Columns.GridColumn gv_itemId; + private UserControls.Data.UcPageBar pageBar1; + private DevExpress.XtraGrid.Columns.GridColumn colChkInt; + private DevExpress.XtraGrid.GridControl gcMx1; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ; + private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs new file mode 100644 index 0000000..18a21eb --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs @@ -0,0 +1,261 @@ +锘縰sing DevExpress.XtraGrid.Views.Grid; +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.DevFrm.QC +{ + public partial class Frm_WorkTechniqueShow : DevExpress.XtraEditors.XtraForm + { + private List<FilterEntity> _filterList = new List<FilterEntity>(); + private readonly string _webServiceName = "MesQmCheckitemManager/"; + private string sourceGuid = "";//婧恎uid + /// <summary> + /// + /// </summary> + /// <param name="_sourceGuid"></param> + /// <param name="_strType"></param> + public Frm_WorkTechniqueShow(string _sourceGuid, string _strType) + { + InitializeComponent(); + sourceGuid = _sourceGuid; + this.gvMain.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); }; + this.gvMain.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gvMain); }; + this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.colChkInt.OptionsFilter.AllowAutoFilter = false; + this.colChkInt.OptionsFilter.AllowFilter = false; + this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False; + this.pageBar1.setBar(false); + getPageList(1); + getModel(_sourceGuid); + pageBar1.PagerEvent += PageBar1_PagerEvent; + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMainCopy); + UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy); + btnIn.Click += (s, e) => + { + gvMain.PostEditor(); + gvMain.UpdateCurrentRow(); + var list = new List<string>(); + DataTable _oldTable = (DataTable)gcMainCopy.DataSource; + DataTable dt = this.gcMain.DataSource as DataTable; + { + foreach (DataRow dr in dt.Rows) + { + string checkBox = dr["chkInt"].ToString(); + if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox)) + { + _oldTable.ImportRow(dr); + } + } + } + if (_oldTable.Rows.Count <= 0) + { + MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); + return; + } + gcMainCopy.BindingContext = new BindingContext(); + gcMainCopy.DataSource = _oldTable; + gcMainCopy.ForceInitialize(); + gvMainCopy.BestFitColumns(); + }; + this.wizardControl1.FinishClick += (s, e) => + { + int _rows = gvMainCopy.RowCount; + if (_rows <= 0) + { + MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); + e.Cancel = true; + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵")) + { + e.Cancel = true; + return; + } + System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder(); + for (var i = 0; i < gvMainCopy.DataRowCount; i++) + { + var row = gvMainCopy.GetDataRow(i); + if (_sbGuids.Length > 0) + _sbGuids.Append(","); + Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString()); + _sbGuids.Append(_guid.ToString()); + } + var _obj = new + { + sourceGuid = UtilityHelper.ToGuid(sourceGuid), + itemGuids = _sbGuids.ToString(), + }; + try + { + var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + }; + this.wizardControl1.NextClick += (s, e) => + { + string pageText = e.Page.Text; + if (pageText == "閫夋嫨鐗╂枡") + { + int _rows = gvMainCopy.RowCount; + if (_rows <= 0) + { + MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); + e.Handled = true; + return; + } + } + }; + } + + #region 婧愮墿鏂欐暟鎹粦瀹� + + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gvMain.Columns, gvMain); + Task.Delay(100); + getPageList(1); + } + + /// <summary> + /// 鍒嗛〉浜嬩欢 + /// </summary> + /// <param name="curPage"></param> + /// <param name="pageSize"></param> + private void PageBar1_PagerEvent(int curPage, int pageSize) + { + getPageList(curPage); + } + + /// <summary> + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + gcMain.DataSource = null; + var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + //_sbSqlWhere += " and q.guid is null"; + var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString()); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + gvMain.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + gvMain.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMain); + } + else + UtilityHelper.SetDefaultTable(gcMain, gvMain); + gvMain.ColumnFilterChanged += GridView1_ColumnFilterChanged; + pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + #endregion + + private void getModel(string strGuid) + { + var _obj = new + { + guid = strGuid //涓诲缓 + }; + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "GetModel", + JsonConvert.SerializeObject(_obj)); + var _rtn = + UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + var dy = _rtn.rtnData; + var gvList = new List<GridView>(); + gvList.Add(gvMx1); + var _job = JObject.Parse(strJson); + var array = new JArray(); + foreach (var a in _job["rtnData"]["list"]) array.Add(a); + var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); + if (dt.Rows.Count > 0) + { + gcMx1.BindingContext = new BindingContext(); + gcMx1.DataSource = dt; + gcMx1.ForceInitialize(); + gvMx1.BestFitColumns(); + } + else + { + UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy); + } + else + { + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + + /// <summary> + /// 鍒犻櫎澶嶅埗椤� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void rptBtnDel_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + gvMainCopy.CloseEditor(); + gvMainCopy.UpdateCurrentRow(); + var rowhandle = gvMainCopy.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + var dr = gvMainCopy.GetDataRow(rowhandle); + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) + return; + gvMainCopy.DeleteRow(rowhandle); + return; + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.resx b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.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/DevFrm/Work/SelectProcess.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs index 74b14c1..d9a7f99 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs @@ -30,10 +30,11 @@ { this.gcMain = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn(); 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.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); @@ -45,7 +46,6 @@ // gcMain // this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain.Location = new System.Drawing.Point(0, 0); this.gcMain.MainView = this.gridView1; this.gcMain.Name = "gcMain"; @@ -58,10 +58,10 @@ // this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.ColumnPanelRowHeight = 50; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.colChkInt, this.gv_guid, this.gridColumn1, this.gv_supplierItemCode, @@ -70,14 +70,21 @@ 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; // + // colChkInt + // + this.colChkInt.Caption = "."; + this.colChkInt.FieldName = "chkInt"; + this.colChkInt.MinWidth = 25; + this.colChkInt.Name = "colChkInt"; + this.colChkInt.Visible = true; + this.colChkInt.VisibleIndex = 0; + this.colChkInt.Width = 94; + // // gv_guid // - this.gv_guid.AppearanceCell.Options.UseFont = true; this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎"; this.gv_guid.FieldName = "guid"; @@ -88,20 +95,8 @@ this.gv_guid.Tag = "query_a.guid"; this.gv_guid.Width = 94; // - // gridColumn1 - // - this.gridColumn1.Caption = "宸ュ簭浠g爜"; - this.gridColumn1.FieldName = "processNo"; - 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.Options.UseFont = true; this.gv_supplierItemCode.Caption = "宸ュ簭鍚嶇О"; this.gv_supplierItemCode.FieldName = "processName"; @@ -116,7 +111,6 @@ // // gv_supplierItemName // - this.gv_supplierItemName.AppearanceCell.Options.UseFont = true; this.gv_supplierItemName.Caption = "宸ュ簭澶囨敞"; this.gv_supplierItemName.FieldName = "remark"; @@ -128,6 +122,16 @@ this.gv_supplierItemName.Visible = true; this.gv_supplierItemName.VisibleIndex = 3; this.gv_supplierItemName.Width = 120; + // + // gridColumn1 + // + this.gridColumn1.Caption = "宸ュ簭浠g爜"; + this.gridColumn1.FieldName = "processNo"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 1; + this.gridColumn1.Width = 94; // // panelControl1 // @@ -173,10 +177,11 @@ 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.XtraEditors.PanelControl panelControl1; private DevExpress.XtraEditors.SimpleButton btnIn; + private DevExpress.XtraGrid.Columns.GridColumn colChkInt; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs index f0de730..7ee1d8a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs @@ -14,25 +14,44 @@ public SelectProcess() { InitializeComponent(); + this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); }; + this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); }; + this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.colChkInt.OptionsFilter.AllowAutoFilter = false; + this.colChkInt.OptionsFilter.AllowFilter = false; + this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False; + this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left; + this.colChkInt.VisibleIndex = 0; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false); 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) + gridView1.PostEditor(); + gridView1.UpdateCurrentRow(); + DataTable dt = this.gcMain.DataSource as DataTable; { - list.Add(new + int idx = 0; + foreach (DataRow dr in dt.Rows) { - fSeq = ($"{(idx + 1) * 10:D4}"), - processNo = dt.Rows[idx]["processNo"].ToString(), - processName = dt.Rows[idx]["processName"].ToString(), - }); + string checkBox = dr["chkInt"].ToString(); + if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox)) + { + string fSeq = ($"{(idx + 1) * 10:D4}"); + list.Add(new + { + fSeq = fSeq, + processNo = dr["processNo"].ToString(), + processName = dr["processName"].ToString(), + }); + idx++; + } + } } UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list }); Close(); + }; } diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index b538bc7..ce9344b 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -819,6 +819,12 @@ <Compile Include="DevFrm\Work\Frm_WorkTechnique.Designer.cs"> <DependentUpon>Frm_WorkTechnique.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs"> + <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon> + </Compile> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> @@ -1514,6 +1520,9 @@ <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechnique.resx"> <DependentUpon>Frm_WorkTechnique.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx"> + <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectCk.resx"> <DependentUpon>SelectCk.cs</DependentUpon> </EmbeddedResource> @@ -1971,6 +1980,7 @@ <None Include="Resources\article_16x16.png" /> <None Include="Resources\media_16x16.png" /> <None Include="Resources\chartselectdata_16x16.png" /> + <None Include="Resources\copy_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs index ad1579d..1eacf3e 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs +++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs @@ -813,6 +813,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap copy_16x16 { + get { + object obj = ResourceManager.GetObject("copy_16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap copymodeldifferences_32x32 { get { object obj = ResourceManager.GetObject("copymodeldifferences_32x32", resourceCulture); diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx index 0076574..770dd39 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.resx +++ b/DevApp/Gs.DevApp/Properties/Resources.resx @@ -121,21 +121,16 @@ <data name="iconsetarrows3_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\iconsetarrows3_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap, + <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> - </data> - <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="zoom100_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\zoom100_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -151,8 +146,10 @@ <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -160,8 +157,16 @@ <data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -225,6 +230,14 @@ <data name="error123" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\error123.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="boreport2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\boreport2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -242,14 +255,19 @@ <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> + <data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bouser_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bouser_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -263,8 +281,13 @@ <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap, + <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -279,8 +302,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, @@ -295,33 +318,23 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, + <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -338,11 +351,6 @@ <data name="editname_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\editname_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\find_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -350,25 +358,24 @@ <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, @@ -393,8 +400,10 @@ <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> + <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -473,13 +482,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\lookup&reference_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap, @@ -532,6 +536,11 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\user_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, @@ -556,16 +565,26 @@ <data name="boperson_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\boperson_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -573,8 +592,8 @@ <data name="user_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\user_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="refresh_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\refresh_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -609,9 +628,6 @@ <data name="user_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\user_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -640,6 +656,9 @@ <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="fontsizeincrease_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fontsizeincrease_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -660,8 +679,13 @@ <data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="boreport2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\boreport2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="subreport_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\subreport_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -671,9 +695,6 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -682,11 +703,10 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\last_16x16.png;System.Drawing.Bitmap, @@ -720,9 +740,6 @@ <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> - <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -740,22 +757,19 @@ <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\task_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -807,8 +821,10 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="fontsizeincrease_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fontsizeincrease_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -829,6 +845,9 @@ <data name="snapmodifytablecellstyle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\snapmodifytablecellstyle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -836,9 +855,6 @@ <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -875,21 +891,14 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bodetails_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -903,23 +912,32 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap, @@ -929,16 +947,11 @@ <data name="boreport2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\boreport2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> - </data> <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap, @@ -953,34 +966,22 @@ <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap, + <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1007,10 +1008,8 @@ <data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="checkbuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbuttons_16x16.png;System.Drawing.Bitmap, @@ -1020,33 +1019,33 @@ <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="lookup&reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bodetails_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, + <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\lookup&reference_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1056,18 +1055,24 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, + <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="lookup&reference_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1078,11 +1083,6 @@ <data name="trackingchanges_previous_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_previous_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="checkbox2_32x324" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_32x324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -1092,28 +1092,31 @@ <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="chartselectdata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\chartselectdata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\find_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="copy_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\copy_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Resources/copy_16x16.png b/DevApp/Gs.DevApp/Resources/copy_16x16.png new file mode 100644 index 0000000..81ab5b1 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/copy_16x16.png Binary files differ -- Gitblit v1.9.3