DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@ </assemblyBinding> </runtime> <appSettings> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="WebApiUrl" value="http://localhost:5263/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> <add key="LogPath" value="logs" /> <add key="ProductName" value="G-MES V2.0" /> <add key="PageSize" value="50" /> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -31,13 +31,13 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -54,6 +54,9 @@ this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fseller = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -82,8 +85,6 @@ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -209,7 +210,8 @@ this.gv_fseller, this.gridColumn1, this.gridColumn2, this.gridColumn3}); this.gridColumn3, this.gridColumn4}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -340,8 +342,36 @@ this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Tag = "query_a.lastupdate_date"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 10; this.gridColumn1.VisibleIndex = 11; this.gridColumn1.Width = 180; // // gridColumn2 // this.gridColumn2.Caption = "主键Guid"; this.gridColumn2.FieldName = "guid"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Width = 94; // // gridColumn3 // this.gridColumn3.Caption = "客户ID"; this.gridColumn3.FieldName = "id"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 9; this.gridColumn3.Width = 94; // // gridColumn4 // this.gridColumn4.Caption = "单据状态"; this.gridColumn4.FieldName = "dataType"; this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 10; this.gridColumn4.Width = 94; // // pageBar1 // @@ -534,29 +564,29 @@ this.layoutControlItem10}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition5.Width = 100D; columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition6.Width = 100D; columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition7.Width = 100D; columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition8.Width = 100D; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition1.Width = 100D; columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition2.Width = 100D; columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition3.Width = 100D; columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition5, columnDefinition6, columnDefinition7, columnDefinition8}); rowDefinition4.Height = 100D; rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition1, columnDefinition2, columnDefinition3, columnDefinition4}); rowDefinition1.Height = 100D; rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition2.Height = 100D; rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition3.Height = 100D; rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition4, rowDefinition5, rowDefinition6}); rowDefinition1, rowDefinition2, rowDefinition3}); this.Root.Size = new System.Drawing.Size(1219, 120); this.Root.TextVisible = false; // @@ -663,24 +693,6 @@ this.layoutControlItem10.Text = "同步时间"; this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18); // // gridColumn2 // this.gridColumn2.Caption = "主键Guid"; this.gridColumn2.FieldName = "guid"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Width = 94; // // gridColumn3 // this.gridColumn3.Caption = "客户ID"; this.gridColumn3.FieldName = "id"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 9; this.gridColumn3.Width = 94; // // Frm_Customer // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -780,5 +792,6 @@ private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; } } DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -62,12 +62,14 @@ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_isFkc = new DevExpress.XtraEditors.TextEdit(); this.txt_isNg = new DevExpress.XtraEditors.TextEdit(); this.txt_depotCode = new DevExpress.XtraEditors.TextEdit(); this.txt_zuid = new DevExpress.XtraEditors.TextEdit(); this.txt_depotName = new DevExpress.XtraEditors.TextEdit(); @@ -83,6 +85,7 @@ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -96,8 +99,6 @@ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_isNg = new DevExpress.XtraEditors.TextEdit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -118,6 +119,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit(); @@ -133,14 +135,13 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -232,7 +233,8 @@ this.gridColumn7, this.gridColumn3, this.gridColumn8, this.gridColumn9}); this.gridColumn9, this.gridColumn10}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -281,7 +283,7 @@ // gv_depottype // this.gv_depottype.AppearanceCell.Options.UseFont = true; this.gv_depottype.Caption = "仓库类型"; this.gv_depottype.Caption = "仓库属性"; this.gv_depottype.FieldName = "depottype"; this.gv_depottype.MinWidth = 50; this.gv_depottype.Name = "gv_depottype"; @@ -313,8 +315,6 @@ this.gv_zuid.Name = "gv_zuid"; this.gv_zuid.OptionsColumn.AllowEdit = false; this.gv_zuid.Tag = "query_a.zuid"; this.gv_zuid.Visible = true; this.gv_zuid.VisibleIndex = 5; this.gv_zuid.Width = 71; // // gv_isFkc @@ -328,7 +328,7 @@ this.gv_isFkc.OptionsColumn.AllowEdit = false; this.gv_isFkc.Tag = "query_a.is_fkc"; this.gv_isFkc.Visible = true; this.gv_isFkc.VisibleIndex = 6; this.gv_isFkc.VisibleIndex = 5; this.gv_isFkc.Width = 60; // // gridColumn2 @@ -340,7 +340,7 @@ this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Tag = "query_a.zuid"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 7; this.gridColumn2.VisibleIndex = 6; this.gridColumn2.Width = 50; // // gridColumn6 @@ -351,7 +351,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "query_a.SUPPLIER_ID"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 8; this.gridColumn6.VisibleIndex = 7; this.gridColumn6.Width = 70; // // gridColumn5 @@ -362,7 +362,7 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Tag = "query_a.Client_Id"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 9; this.gridColumn5.VisibleIndex = 8; this.gridColumn5.Width = 60; // // gridColumn4 @@ -373,7 +373,7 @@ this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Tag = "query_a.department"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 10; this.gridColumn4.VisibleIndex = 9; this.gridColumn4.Width = 60; // // gridColumn7 @@ -384,7 +384,7 @@ this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Tag = "query_a.Phone"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 11; this.gridColumn7.VisibleIndex = 10; this.gridColumn7.Width = 60; // // gridColumn3 @@ -413,8 +413,18 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 12; this.gridColumn9.VisibleIndex = 11; this.gridColumn9.Width = 94; // // gridColumn10 // this.gridColumn10.Caption = "数据状态"; this.gridColumn10.FieldName = "documentStatus"; this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 12; this.gridColumn10.Width = 94; // // pageBar1 // @@ -496,6 +506,16 @@ this.txt_isFkc.StyleController = this.layoutMx1; this.txt_isFkc.TabIndex = 291; this.txt_isFkc.Tag = "readonly"; // // txt_isNg // this.txt_isNg.Location = new System.Drawing.Point(1032, 43); this.txt_isNg.Name = "txt_isNg"; this.txt_isNg.Properties.Appearance.Options.UseFont = true; this.txt_isNg.Size = new System.Drawing.Size(220, 24); this.txt_isNg.StyleController = this.layoutMx1; this.txt_isNg.TabIndex = 267; this.txt_isNg.Tag = "readonly"; // // txt_depotCode // @@ -678,6 +698,17 @@ this.layoutControlItem7.Text = "允许负库存"; this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_isNg; this.layoutControlItem8.Location = new System.Drawing.Point(933, 31); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(311, 31); this.layoutControlItem8.Text = "禁用状态"; this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -821,27 +852,6 @@ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_isNg; this.layoutControlItem8.Location = new System.Drawing.Point(933, 31); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(311, 31); this.layoutControlItem8.Text = "禁用状态"; this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); // // txt_isNg // this.txt_isNg.Location = new System.Drawing.Point(1032, 43); this.txt_isNg.Name = "txt_isNg"; this.txt_isNg.Properties.Appearance.Options.UseFont = true; this.txt_isNg.Size = new System.Drawing.Size(220, 24); this.txt_isNg.StyleController = this.layoutMx1; this.txt_isNg.TabIndex = 267; this.txt_isNg.Tag = "readonly"; // // Frm_MesDepot // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -871,6 +881,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit(); @@ -886,14 +897,13 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit(); this.ResumeLayout(false); } @@ -955,5 +965,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; private DevExpress.XtraEditors.TextEdit txt_isNg; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; } } DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -30,14 +30,14 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -56,6 +56,7 @@ this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -80,7 +81,6 @@ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -337,8 +337,6 @@ this.gv_lineType.Name = "gv_lineType"; this.gv_lineType.OptionsColumn.AllowEdit = false; this.gv_lineType.Tag = "query_a.line_type"; this.gv_lineType.Visible = true; this.gv_lineType.VisibleIndex = 9; this.gv_lineType.Width = 80; // // gv_isZxbg @@ -359,8 +357,16 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 10; this.gridColumn2.VisibleIndex = 9; this.gridColumn2.Width = 94; // // gridColumn3 // this.gridColumn3.Caption = "主键Guid"; this.gridColumn3.FieldName = "guid"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Width = 94; // // pageBar1 // @@ -538,32 +544,32 @@ this.layoutControlItem8}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition5.Width = 100D; columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition6.Width = 100D; columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition7.Width = 100D; columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition8.Width = 100D; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition1.Width = 100D; columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition2.Width = 100D; columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition3.Width = 100D; columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition5, columnDefinition6, columnDefinition7, columnDefinition8}); rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition7.Height = 100D; rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition1, columnDefinition2, columnDefinition3, columnDefinition4}); rowDefinition1.Height = 100D; rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition2.Height = 100D; rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition3.Height = 100D; rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition4.Height = 100D; rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition5, rowDefinition6, rowDefinition7, rowDefinition8}); rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4}); this.Root.Size = new System.Drawing.Size(1126, 147); this.Root.TextVisible = false; // @@ -649,14 +655,6 @@ this.layoutControlItem8.Text = "整线报工"; this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; // // gridColumn3 // this.gridColumn3.Caption = "主键Guid"; this.gridColumn3.FieldName = "guid"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Width = 94; // // Frm_MesWorkshopLine // DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
@@ -41,11 +41,12 @@ this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.tl8 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.tl9 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemEdt = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemRoot = new System.Windows.Forms.ToolStripMenuItem(); this.treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -55,7 +56,7 @@ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit(); this.split1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.cms1.SuspendLayout(); this.SuspendLayout(); // // toolBarMenu1 @@ -122,7 +123,8 @@ this.tlcMenuName, this.tlcActions, this.tl8, this.tl9}); this.tl9, this.treeListColumn1}); this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default; this.tlMenu.Dock = System.Windows.Forms.DockStyle.Fill; this.tlMenu.Location = new System.Drawing.Point(0, 0); @@ -187,7 +189,7 @@ this.tl8.FieldName = "lastupdateBy"; this.tl8.Name = "tl8"; this.tl8.Visible = true; this.tl8.VisibleIndex = 4; this.tl8.VisibleIndex = 5; // // tl9 // @@ -195,18 +197,18 @@ this.tl9.FieldName = "lastupdateDate"; this.tl9.Name = "tl9"; this.tl9.Visible = true; this.tl9.VisibleIndex = 5; this.tl9.VisibleIndex = 6; // // contextMenuStrip1 // cms1 // this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cms1.ImageScalingSize = new System.Drawing.Size(20, 20); this.cms1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItemAdd, this.toolStripMenuItemEdt, this.toolStripMenuItemDel, this.toolStripMenuItemRoot}); this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Size = new System.Drawing.Size(143, 108); this.cms1.Name = "contextMenuStrip1"; this.cms1.Size = new System.Drawing.Size(143, 108); // // toolStripMenuItemAdd // @@ -234,7 +236,15 @@ this.toolStripMenuItemRoot.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16; this.toolStripMenuItemRoot.Name = "toolStripMenuItemRoot"; this.toolStripMenuItemRoot.Size = new System.Drawing.Size(142, 26); this.toolStripMenuItemRoot.Text = "增加项目"; this.toolStripMenuItemRoot.Text = "增加主项"; // // treeListColumn1 // this.treeListColumn1.Caption = "可用标识"; this.treeListColumn1.FieldName = "type1"; this.treeListColumn1.Name = "treeListColumn1"; this.treeListColumn1.Visible = true; this.treeListColumn1.VisibleIndex = 4; // // Frm_MesDefectCode // @@ -254,7 +264,7 @@ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit(); this.split1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit(); this.contextMenuStrip1.ResumeLayout(false); this.cms1.ResumeLayout(false); this.ResumeLayout(false); } @@ -268,12 +278,13 @@ private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuCaption; private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuName; private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ContextMenuStrip cms1; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemAdd; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemEdt; private DevExpress.XtraTreeList.Columns.TreeListColumn tl8; private DevExpress.XtraTreeList.Columns.TreeListColumn tl9; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemRoot; private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1; } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -18,7 +18,6 @@ public Frm_MesDefectCode() { InitializeComponent(); tlMenu.ContextMenuStrip = contextMenuStrip1; toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; this.toolBarMenu1.getXmlConfig(); @@ -111,21 +110,32 @@ frm.ShowDialog(); }; } /// <summary> /// 右键弹出菜单,如果是行，增加子项目，否则增加主项 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void TlMenu_MouseDown(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Right) { tlMenu.ContextMenuStrip = null; TreeListHitInfo hInfo = tlMenu.CalcHitInfo(new Point(e.X, e.Y)); TreeListNode node = hInfo.Node; tlMenu.FocusedNode = node; if (node != null) if (hInfo.HitInfoType == HitInfoType.Cell || hInfo.HitInfoType ==HitInfoType.Row|| hInfo.HitInfoType==HitInfoType.RowIndent || hInfo.HitInfoType == HitInfoType.RowIndicator ) { toolStripMenuItemAdd.Visible = true; toolStripMenuItemEdt.Visible = true; toolStripMenuItemDel.Visible = true; toolStripMenuItemRoot.Visible = false; tlMenu.ContextMenuStrip = contextMenuStrip1; if (node != null) { toolStripMenuItemAdd.Visible = true; toolStripMenuItemEdt.Visible = true; toolStripMenuItemDel.Visible = true; toolStripMenuItemRoot.Visible = false; cms1.Show(tlMenu, e.Location); } } else { @@ -133,7 +143,7 @@ toolStripMenuItemEdt.Visible = false; toolStripMenuItemDel.Visible = false; toolStripMenuItemRoot.Visible = true; tlMenu.ContextMenuStrip = contextMenuStrip1; cms1.Show(tlMenu, e.Location); } } } @@ -185,6 +195,5 @@ MsgHelper.Warning("提示：" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx
@@ -117,7 +117,7 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="cms1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> </root> DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.Designer.cs
@@ -34,26 +34,31 @@ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_defectCode = new DevExpress.XtraEditors.TextEdit(); this.txt_sType = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_defectName = new DevExpress.XtraEditors.MemoEdit(); this.txt_type1 = new DevExpress.XtraEditors.CheckEdit(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.panel1 = new System.Windows.Forms.Panel(); this.btnEsc = new DevExpress.XtraEditors.SimpleButton(); this.btnQuery = new DevExpress.XtraEditors.SimpleButton(); this.btnSave = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_sType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); this.panel1.SuspendLayout(); this.SuspendLayout(); // @@ -62,42 +67,52 @@ this.layoutMx1.Controls.Add(this.txt_defectCode); this.layoutMx1.Controls.Add(this.txt_sType); this.layoutMx1.Controls.Add(this.txt_defectName); this.layoutMx1.Controls.Add(this.txt_type1); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(814, 0, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(491, 144); this.layoutMx1.Size = new System.Drawing.Size(668, 269); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_defectCode // this.txt_defectCode.Location = new System.Drawing.Point(84, 12); this.txt_defectCode.Location = new System.Drawing.Point(54, 12); this.txt_defectCode.Name = "txt_defectCode"; this.txt_defectCode.Size = new System.Drawing.Size(159, 24); this.txt_defectCode.Size = new System.Drawing.Size(278, 24); this.txt_defectCode.StyleController = this.layoutMx1; this.txt_defectCode.TabIndex = 4; // // txt_sType // this.txt_sType.EditValue = "-请选择-"; this.txt_sType.Location = new System.Drawing.Point(319, 12); this.txt_sType.Location = new System.Drawing.Point(378, 12); this.txt_sType.Name = "txt_sType"; this.txt_sType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_sType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_sType.Size = new System.Drawing.Size(160, 24); this.txt_sType.Size = new System.Drawing.Size(278, 24); this.txt_sType.StyleController = this.layoutMx1; this.txt_sType.TabIndex = 5; // // txt_defectName // this.txt_defectName.Location = new System.Drawing.Point(84, 43); this.txt_defectName.Location = new System.Drawing.Point(54, 61); this.txt_defectName.Name = "txt_defectName"; this.txt_defectName.Size = new System.Drawing.Size(395, 89); this.txt_defectName.Size = new System.Drawing.Size(602, 146); this.txt_defectName.StyleController = this.layoutMx1; this.txt_defectName.TabIndex = 6; // // txt_type1 // this.txt_type1.Location = new System.Drawing.Point(12, 211); this.txt_type1.Name = "txt_type1"; this.txt_type1.Properties.Caption = "可用标识"; this.txt_type1.Size = new System.Drawing.Size(320, 24); this.txt_type1.StyleController = this.layoutMx1; this.txt_type1.TabIndex = 7; // // Root // @@ -106,7 +121,8 @@ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, this.layoutControlItem2, this.layoutControlItem3}); this.layoutControlItem3, this.layoutControlItem4}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -124,12 +140,15 @@ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition4.Height = 100D; rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4}); this.Root.Size = new System.Drawing.Size(491, 144); rowDefinition4, rowDefinition5}); this.Root.Size = new System.Drawing.Size(668, 269); this.Root.TextVisible = false; // // layoutControlItem1 @@ -137,40 +156,50 @@ this.layoutControlItem1.Control = this.txt_defectCode; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(235, 31); this.layoutControlItem1.Text = "字典编号"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); this.layoutControlItem1.Size = new System.Drawing.Size(324, 49); this.layoutControlItem1.Text = "编号"; this.layoutControlItem1.TextSize = new System.Drawing.Size(30, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_sType; this.layoutControlItem2.Location = new System.Drawing.Point(235, 0); this.layoutControlItem2.Location = new System.Drawing.Point(324, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(236, 31); this.layoutControlItem2.Text = "字典类型"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); this.layoutControlItem2.Size = new System.Drawing.Size(324, 49); this.layoutControlItem2.Text = "类型"; this.layoutControlItem2.TextSize = new System.Drawing.Size(30, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_defectName; this.layoutControlItem3.Location = new System.Drawing.Point(0, 31); this.layoutControlItem3.Location = new System.Drawing.Point(0, 49); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 3; this.layoutControlItem3.Size = new System.Drawing.Size(471, 93); this.layoutControlItem3.Text = "字典名称"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); this.layoutControlItem3.Size = new System.Drawing.Size(648, 150); this.layoutControlItem3.Text = "值"; this.layoutControlItem3.TextSize = new System.Drawing.Size(30, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_type1; this.layoutControlItem4.Location = new System.Drawing.Point(0, 199); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem4.Size = new System.Drawing.Size(324, 50); this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem4.TextVisible = false; // // panel1 // this.panel1.Controls.Add(this.btnEsc); this.panel1.Controls.Add(this.btnQuery); this.panel1.Controls.Add(this.btnSave); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel1.Location = new System.Drawing.Point(0, 144); this.panel1.Location = new System.Drawing.Point(0, 269); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(491, 44); this.panel1.Size = new System.Drawing.Size(668, 44); this.panel1.TabIndex = 2; // // btnEsc @@ -178,32 +207,32 @@ this.btnEsc.Appearance.Options.UseFont = true; this.btnEsc.Dock = System.Windows.Forms.DockStyle.Right; this.btnEsc.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; this.btnEsc.Location = new System.Drawing.Point(303, 0); this.btnEsc.Location = new System.Drawing.Point(480, 0); this.btnEsc.Name = "btnEsc"; this.btnEsc.Size = new System.Drawing.Size(94, 44); this.btnEsc.TabIndex = 1; this.btnEsc.Text = "取消保存"; this.btnEsc.Click += new System.EventHandler(this.btnEsc_Click); // // btnQuery // btnSave // this.btnQuery.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; this.btnQuery.Appearance.Options.UseBackColor = true; this.btnQuery.Appearance.Options.UseFont = true; this.btnQuery.Dock = System.Windows.Forms.DockStyle.Right; this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16; this.btnQuery.Location = new System.Drawing.Point(397, 0); this.btnQuery.Name = "btnQuery"; this.btnQuery.Size = new System.Drawing.Size(94, 44); this.btnQuery.TabIndex = 0; this.btnQuery.Text = "确定保存"; this.btnQuery.Click += new System.EventHandler(this.btnQuery_Click); this.btnSave.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; this.btnSave.Appearance.Options.UseBackColor = true; this.btnSave.Appearance.Options.UseFont = true; this.btnSave.Dock = System.Windows.Forms.DockStyle.Right; this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16; this.btnSave.Location = new System.Drawing.Point(574, 0); this.btnSave.Name = "btnSave"; this.btnSave.Size = new System.Drawing.Size(94, 44); this.btnSave.TabIndex = 0; this.btnSave.Text = "确定保存"; this.btnSave.Click += new System.EventHandler(this.btnQuery_Click); // // Frm_MesDefectCodeShow // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(491, 188); this.ClientSize = new System.Drawing.Size(668, 313); this.Controls.Add(this.layoutMx1); this.Controls.Add(this.panel1); this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; @@ -217,10 +246,12 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_sType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); this.panel1.ResumeLayout(false); this.ResumeLayout(false); @@ -232,12 +263,14 @@ private DevExpress.XtraLayout.LayoutControlGroup Root; private System.Windows.Forms.Panel panel1; private DevExpress.XtraEditors.SimpleButton btnEsc; private DevExpress.XtraEditors.SimpleButton btnQuery; private DevExpress.XtraEditors.SimpleButton btnSave; private DevExpress.XtraEditors.TextEdit txt_defectCode; private DevExpress.XtraEditors.ComboBoxEdit txt_sType; private DevExpress.XtraEditors.MemoEdit txt_defectName; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraEditors.CheckEdit txt_type1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
@@ -26,6 +26,7 @@ getMode(strGuid); this.Text = "更新【" + txt_defectName.Text + "】"; txt_sType.Enabled = false; txt_defectCode.Enabled = false; return; } //这是增加子项 @@ -34,15 +35,18 @@ getMode(strUpGuid); this.Text = "增加【" + txt_defectName.Text + "】的子项目"; txt_sType.Enabled = false; txt_defectCode.Enabled = true; txt_defectCode.Text = ""; txt_defectName.Text = ""; return; } this.Text = "增加新项"; } /// <summary> /// 保存 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void btnQuery_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(txt_defectCode.Text)) @@ -70,6 +74,7 @@ SType = txt_sType.Text.Trim(), DefectName = txt_defectName.Text.Trim(), Pid = UtilityHelper.ToGuid(strUpGuid.Trim()), Type1 = txt_type1.Checked }; try { @@ -98,12 +103,13 @@ /// </summary> public event EventHandler<UpdateParentEventArgs> UpdateParent; /// <summary> /// 读取上级 /// </summary> private void getSelect() { var _obj = new { }; var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectCategory", JsonConvert.SerializeObject(_obj)); var dd = UtilityHelper.ReturnToList(strReturn); @@ -115,7 +121,10 @@ txt_sType.Properties.Items.Add(dr["typeMemo"].ToString()); } } /// <summary> /// 读取实体 /// </summary> /// <param name="strGuid"></param> private void getMode(string strGuid) { var _obj = new @@ -130,7 +139,6 @@ { dynamic dy = _rtn.rtnData; UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, true); } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs
@@ -84,9 +84,9 @@ public string SType { get; set; } /// <summary> /// 类别1 /// 状态 ///</summary> public string Type1 { get; set; } public bool Type1 { get; set; } /// <summary> /// 类别2 DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs
@@ -64,6 +64,7 @@ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.treeListColumn7 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -138,7 +139,8 @@ this.gridColumn4, this.gridColumn3, this.gridColumn1, this.gridColumn2}); this.gridColumn2, this.gridColumn6}); this.gridView1.GridControl = this.gcMain; this.gridView1.GroupCount = 1; this.gridView1.IndicatorWidth = 50; @@ -299,6 +301,14 @@ this.treeListColumn7.Visible = true; this.treeListColumn7.VisibleIndex = 0; // // gridColumn6 // this.gridColumn6.Caption = "主键GUID"; this.gridColumn6.FieldName = "guid"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Width = 94; // // SysHelp // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -340,5 +350,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; } } DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
@@ -1,4 +1,5 @@ using Gs.DevApp.Entity; using DevExpress.XtraGrid.Views.Base.ViewInfo; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using Newtonsoft.Json; @@ -65,8 +66,6 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); //gridColumnSex.GroupIndex = 0;//性别列为第一组 //gridColumndateofbirth.GroupIndex = 1;//出生日期列为第二组 gridView1.ExpandAllGroups();//展开所有组 } else @@ -79,7 +78,11 @@ ToolBox.MsgHelper.Warning("提示：" + ex.Message); } } /// <summary> /// 上传按钮事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gridView1.FocusedRowHandle; @@ -92,13 +95,19 @@ Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(mxGuid); frm.UpdateParent += (ss, ee) => { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("上传成功！"); getPageList(1); Gs.DevApp.ToolBox.MsgHelper.ShowInformation("上传成功！"); int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], mxGuid); gridView1.FocusedRowHandle = rowHandle; }; frm.ShowDialog(); } } /// <summary> /// 预览按钮事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gridView1.FocusedRowHandle; @@ -119,7 +128,11 @@ } } } /// <summary> /// 下载事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gridView1.FocusedRowHandle; DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -75,6 +75,7 @@ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -151,6 +152,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"; @@ -163,7 +165,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; @@ -190,7 +193,8 @@ this.gv_userName, this.gv_operationTable, this.gridColumn1, this.gv_msg}); this.gv_msg, this.gridColumn2}); this.gridView1.GridControl = this.gcMain1; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; @@ -286,7 +290,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 // @@ -296,6 +300,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 = 192; this.splitMx1.TabIndex = 0; @@ -520,6 +525,14 @@ this.layoutControlItem7.Text = "返回JSON"; this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18); // // gridColumn2 // this.gridColumn2.Caption = "主键GUID"; this.gridColumn2.FieldName = "guid"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Width = 94; // // SysLog // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -604,5 +617,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; } }
