DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@ <appSettings> <!--<add key="webapiurl" value="http://localhost:5263/" />--> <add key="WebApiUrl" value="http://192.168.1.145:8081/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> <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/Ck/Frm_MesCgthSq.cs
@@ -31,6 +31,7 @@ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) => @@ -159,6 +160,8 @@ setSrm(); }; } private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -232,6 +235,11 @@ _filterList = e.FilterList; getPageList(1); } private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 审核事件 /// </summary> @@ -658,6 +666,9 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; } ; toolBarMenu1.guidKey = ""; DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -1,4 +1,3 @@ using DevExpress.XtraCharts.GLGraphics.Platform; using DevExpress.XtraEditors; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; @@ -43,6 +42,7 @@ toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick; toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick; toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) => @@ -211,6 +211,8 @@ }; #endregion } /// <summary> /// 来源明细限制， @@ -722,7 +724,16 @@ } } /// <summary> /// 完结 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 审核事件 /// </summary> @@ -821,6 +832,9 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; case 20: strMsg = "售后审核"; break; @@ -879,7 +893,6 @@ int rowHandle = gridView1.LocateByValue("guid", rowGuid); gridView1.FocusedRowHandle = rowHandle; } } else MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -40,6 +40,7 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Form parentForm = this.FindForm(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); @@ -128,6 +129,9 @@ frm.ShowDialog(); }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -517,6 +521,15 @@ } } /// <summary> /// 完结 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 审核事件 @@ -554,6 +567,9 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; } ; toolBarMenu1.guidKey = ""; DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -30,28 +30,28 @@ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); 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.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(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -213,9 +213,14 @@ this.gridSplitContainer1 = new DevExpress.XtraGrid.GridSplitContainer(); this.gcMx3 = new DevExpress.XtraGrid.GridControl(); this.gvMx3 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView(); this.aqlType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand40 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.facLevel = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand42 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand48 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.aqlTypeCr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand49 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.aqlTypeMa = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand50 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.aqlTypeMi = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gvMx3guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gvMx3aql1Id = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); @@ -254,11 +259,6 @@ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.bandedGridColumn26 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.bandedGridColumn23 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn(); this.gridBand40 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand42 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand48 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand49 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); this.gridBand50 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -776,29 +776,29 @@ this.layoutControlItem13}); 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(2183, 122); this.Root.TextVisible = false; // @@ -1275,10 +1275,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; 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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); 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; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -1816,10 +1816,10 @@ // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); 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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); @@ -2216,10 +2216,10 @@ this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] { this.gvMx3guid, this.gvMx3aql1Id, this.aqlType, this.aqlTypeCr, this.aqlTypeMa, this.aqlTypeMi}); this.aqlTypeMi, this.facLevel}); this.gvMx3.DetailHeight = 428; this.gvMx3.GridControl = this.gcMx3; this.gvMx3.Name = "gvMx3"; @@ -2229,15 +2229,47 @@ this.gvMx3.OptionsView.ShowColumnHeaders = false; this.gvMx3.OptionsView.ShowGroupPanel = false; // // aqlType // gridBand40 // this.aqlType.Caption = "AQL拒收质量水平"; this.aqlType.FieldName = "aqlType"; this.aqlType.MinWidth = 30; this.aqlType.Name = "aqlType"; this.aqlType.Tag = "aqlType"; this.aqlType.Visible = true; this.aqlType.Width = 112; this.gridBand40.Caption = "拒收质量水平"; this.gridBand40.Columns.Add(this.facLevel); this.gridBand40.MinWidth = 12; this.gridBand40.Name = "gridBand40"; this.gridBand40.VisibleIndex = 0; this.gridBand40.Width = 250; // // facLevel // this.facLevel.Caption = "拒收水平"; this.facLevel.FieldName = "facLevel"; this.facLevel.MinWidth = 30; this.facLevel.Name = "facLevel"; this.facLevel.Tag = "facLevel"; this.facLevel.Visible = true; this.facLevel.Width = 250; // // gridBand42 // this.gridBand42.AppearanceHeader.Options.UseTextOptions = true; this.gridBand42.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand42.Caption = "AQL类型"; this.gridBand42.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] { this.gridBand48, this.gridBand49, this.gridBand50}); this.gridBand42.ImageOptions.Alignment = System.Drawing.StringAlignment.Center; this.gridBand42.MinWidth = 12; this.gridBand42.Name = "gridBand42"; this.gridBand42.VisibleIndex = 1; this.gridBand42.Width = 336; // // gridBand48 // this.gridBand48.Caption = "CR"; this.gridBand48.Columns.Add(this.aqlTypeCr); this.gridBand48.Name = "gridBand48"; this.gridBand48.VisibleIndex = 0; this.gridBand48.Width = 112; // // aqlTypeCr // @@ -2249,6 +2281,14 @@ this.aqlTypeCr.Visible = true; this.aqlTypeCr.Width = 112; // // gridBand49 // this.gridBand49.Caption = "MA"; this.gridBand49.Columns.Add(this.aqlTypeMa); this.gridBand49.Name = "gridBand49"; this.gridBand49.VisibleIndex = 1; this.gridBand49.Width = 112; // // aqlTypeMa // this.aqlTypeMa.Caption = "MA"; @@ -2258,6 +2298,14 @@ this.aqlTypeMa.Tag = "edit"; this.aqlTypeMa.Visible = true; this.aqlTypeMa.Width = 112; // // gridBand50 // this.gridBand50.Caption = "MI"; this.gridBand50.Columns.Add(this.aqlTypeMi); this.gridBand50.Name = "gridBand50"; this.gridBand50.VisibleIndex = 2; this.gridBand50.Width = 112; // // aqlTypeMi // @@ -2301,10 +2349,10 @@ // repositoryItemButtonEdit3 // this.repositoryItemButtonEdit3.AutoHeight = false; editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3"; this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; // @@ -2688,54 +2736,6 @@ this.bandedGridColumn23.Tag = "yz_quantity_0_edit"; this.bandedGridColumn23.Width = 142; // // gridBand40 // this.gridBand40.Caption = "拒收质量水平"; this.gridBand40.Columns.Add(this.aqlType); this.gridBand40.MinWidth = 12; this.gridBand40.Name = "gridBand40"; this.gridBand40.VisibleIndex = 0; this.gridBand40.Width = 112; // // gridBand42 // this.gridBand42.AppearanceHeader.Options.UseTextOptions = true; this.gridBand42.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridBand42.Caption = "AQL类型"; this.gridBand42.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] { this.gridBand48, this.gridBand49, this.gridBand50}); this.gridBand42.ImageOptions.Alignment = System.Drawing.StringAlignment.Center; this.gridBand42.MinWidth = 12; this.gridBand42.Name = "gridBand42"; this.gridBand42.VisibleIndex = 1; this.gridBand42.Width = 336; // // gridBand48 // this.gridBand48.Caption = "CR"; this.gridBand48.Columns.Add(this.aqlTypeCr); this.gridBand48.Name = "gridBand48"; this.gridBand48.VisibleIndex = 0; this.gridBand48.Width = 112; // // gridBand49 // this.gridBand49.Caption = "MA"; this.gridBand49.Columns.Add(this.aqlTypeMa); this.gridBand49.Name = "gridBand49"; this.gridBand49.VisibleIndex = 1; this.gridBand49.Width = 112; // // gridBand50 // this.gridBand50.Caption = "MI"; this.gridBand50.Columns.Add(this.aqlTypeMi); this.gridBand50.Name = "gridBand50"; this.gridBand50.VisibleIndex = 2; this.gridBand50.Width = 112; // // Frm_MesQmAql1 // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); @@ -3021,11 +3021,11 @@ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn66; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn26; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn23; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn aqlType; private DevExpress.XtraGrid.GridSplitContainer gridSplitContainer1; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn aqlTypeCr; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn aqlTypeMa; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn aqlTypeMi; private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn facLevel; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand40; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand42; private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand48; DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -339,7 +339,7 @@ var row = gvMx3.GetDataRow(i); if (row != null) { if (string.IsNullOrEmpty(row["aqlType"].ToString())) if (string.IsNullOrEmpty(row["FacLevel"].ToString())) { MsgHelper.ShowError("拒收质量水平不能为空！"); return; @@ -347,10 +347,10 @@ qmaql4.Add(new MesQmAql4 { Guid = UtilityHelper.ToGuid(row["Guid"].ToString()), AqlType = Convert.ToDecimal(row["AqlType"].ToString()), AqlTypeCr = row["AqlTypeCr"].ToString(), AqlTypeMa = row["AqlTypeMa"].ToString(), AqlTypeMi = row["AqlTypeMi"].ToString(), FacLevel = row["FacLevel"].ToString(), }); } } @@ -510,6 +510,7 @@ { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } foreach (var a in _job["rtnData"]["mesQmAql3s"]) { mesQmAql3s.Add(a); @@ -524,8 +525,9 @@ } else { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); } foreach (var a in _job["rtnData"]["mesQmAql4s"]) { @@ -543,6 +545,7 @@ { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3); } } else ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg); DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql4.cs
@@ -16,10 +16,6 @@ ///</summary> public Guid? Aql1Id { get; set; } /// <summary> /// 拒收质量水平 /// </summary> public decimal AqlType { get; set; } /// <summary> /// AQL类型(CR) ///</summary> public string AqlTypeCr { get; set; } @@ -31,5 +27,9 @@ /// AQL类型(MI) ///</summary> public string AqlTypeMi { get; set; } /// <summary> /// 拒收水平 ///</summary> public string FacLevel { get; set; } } } DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -42,6 +42,7 @@ this.toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick; this.toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick; toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -306,6 +307,8 @@ }; #endregion } /// <summary> /// 来源明细限制， /// </summary> @@ -876,6 +879,12 @@ } } private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 审核事件 /// </summary> @@ -951,6 +960,9 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; case 30: strMsg = "财务审核"; break; DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -36,6 +36,7 @@ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick; toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -218,6 +219,9 @@ #endregion } /// <summary> /// 打印 /// </summary> @@ -308,7 +312,16 @@ _filterList = e.FilterList; getPageList(1); } /// <summary> /// 完结 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(199); } /// <summary> /// 批准 /// </summary> @@ -804,6 +817,9 @@ case 5: strMsg = "品质反审核"; break; case 199: strMsg = "完结"; break; } ; toolBarMenu1.guidKey = ""; DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -32,6 +32,7 @@ toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick; toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick; toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) => @@ -105,8 +106,8 @@ _row["kcQty"] = dym.kcQty; //库存数量 _row["depotId"] = dym.depotId; //库存数量 _row["depotName"] = dym.depotName; //库存数量 _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd"); _row["fEntrynote"] = dym.entryNote; ; _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd"); _row["fEntrynote"] = dym.entryNote; ; _Table.Rows.Add(_row); } gcMx1.BindingContext = new BindingContext(); @@ -126,6 +127,8 @@ frm.ShowDialog(); }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -525,6 +528,12 @@ } } private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 财务审核 /// </summary> @@ -581,14 +590,16 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; case 30: strMsg = "财务审核"; break; case 31: strMsg = "财务反审核"; break; } ; }; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo"); @@ -712,6 +723,6 @@ frm.ShowDialog(); } } } DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,5 +1,3 @@ using DevExpress.Utils.VisualEffects; using DevExpress.XtraEditors; using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.DevFrm.Sales; using Gs.DevApp.Entity; @@ -10,8 +8,6 @@ using System; using System.Collections.Generic; using System.Data; using System.IO; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; @@ -37,6 +33,7 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -153,7 +150,6 @@ this.ucBtnPrintAll1.mxList = lst; }; #endregion //销售组织 txt_salesOrg.EditChanged += (s, e) => { @@ -325,7 +321,6 @@ setSrm(); }; } /// <summary> /// 打印 @@ -832,8 +827,16 @@ ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } /// <summary> /// 完结 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 审核事件 /// </summary> @@ -870,6 +873,9 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; } ; toolBarMenu1.guidKey = ""; DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -30,19 +30,19 @@ 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.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.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.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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -64,6 +64,7 @@ this.gv_tbl011 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_tbl012 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -133,7 +134,7 @@ this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -287,7 +288,8 @@ this.gv_tbl011, this.gv_tbl012, this.gridColumn11, this.gridColumn14}); this.gridColumn14, this.gridColumn15}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -339,7 +341,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.bill_no"; this.gv_billNo.Visible = true; this.gv_billNo.VisibleIndex = 1; this.gv_billNo.VisibleIndex = 2; this.gv_billNo.Width = 94; // // gv_tbl003 @@ -352,7 +354,7 @@ this.gv_tbl003.OptionsColumn.AllowEdit = false; this.gv_tbl003.Tag = "query_a.tbl003"; this.gv_tbl003.Visible = true; this.gv_tbl003.VisibleIndex = 2; this.gv_tbl003.VisibleIndex = 3; this.gv_tbl003.Width = 94; // // gv_tbl002 @@ -365,7 +367,7 @@ this.gv_tbl002.OptionsColumn.AllowEdit = false; this.gv_tbl002.Tag = "query_a.tbl002"; this.gv_tbl002.Visible = true; this.gv_tbl002.VisibleIndex = 3; this.gv_tbl002.VisibleIndex = 4; this.gv_tbl002.Width = 94; // // gridColumn6 @@ -375,7 +377,7 @@ this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 4; this.gridColumn6.VisibleIndex = 5; this.gridColumn6.Width = 94; // // gridColumn10 @@ -385,7 +387,7 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 5; this.gridColumn10.VisibleIndex = 6; this.gridColumn10.Width = 94; // // gv_tbl004 @@ -398,7 +400,7 @@ this.gv_tbl004.OptionsColumn.AllowEdit = false; this.gv_tbl004.Tag = "query_a.tbl004"; this.gv_tbl004.Visible = true; this.gv_tbl004.VisibleIndex = 6; this.gv_tbl004.VisibleIndex = 7; this.gv_tbl004.Width = 94; // // gv_tbl005 @@ -411,7 +413,7 @@ this.gv_tbl005.OptionsColumn.AllowEdit = false; this.gv_tbl005.Tag = "query_a.tbl005"; this.gv_tbl005.Visible = true; this.gv_tbl005.VisibleIndex = 7; this.gv_tbl005.VisibleIndex = 8; this.gv_tbl005.Width = 94; // // gv_tbl009 @@ -424,7 +426,7 @@ this.gv_tbl009.OptionsColumn.AllowEdit = false; this.gv_tbl009.Tag = "query_a.tbl009"; this.gv_tbl009.Visible = true; this.gv_tbl009.VisibleIndex = 8; this.gv_tbl009.VisibleIndex = 9; this.gv_tbl009.Width = 94; // // gv_tbl010 @@ -437,7 +439,7 @@ this.gv_tbl010.OptionsColumn.AllowEdit = false; this.gv_tbl010.Tag = "query_a.tbl010"; this.gv_tbl010.Visible = true; this.gv_tbl010.VisibleIndex = 9; this.gv_tbl010.VisibleIndex = 10; this.gv_tbl010.Width = 94; // // gv_tbl011 @@ -450,7 +452,7 @@ this.gv_tbl011.OptionsColumn.AllowEdit = false; this.gv_tbl011.Tag = "query_a.tbl011"; this.gv_tbl011.Visible = true; this.gv_tbl011.VisibleIndex = 10; this.gv_tbl011.VisibleIndex = 11; this.gv_tbl011.Width = 94; // // gv_tbl012 @@ -463,7 +465,7 @@ this.gv_tbl012.OptionsColumn.AllowEdit = false; this.gv_tbl012.Tag = "query_a.tbl012"; this.gv_tbl012.Visible = true; this.gv_tbl012.VisibleIndex = 11; this.gv_tbl012.VisibleIndex = 12; this.gv_tbl012.Width = 94; // // gridColumn11 @@ -473,8 +475,18 @@ this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 12; this.gridColumn11.VisibleIndex = 13; this.gridColumn11.Width = 94; // // gridColumn14 // this.gridColumn14.Caption = "入库货主"; this.gridColumn14.FieldName = "tlOrg"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 14; this.gridColumn14.Width = 94; // // pageBar1 // @@ -717,32 +729,32 @@ this.layoutControlItem13}); 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, 144); this.Root.TextVisible = false; // @@ -1112,10 +1124,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions2.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)}); 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -1304,15 +1316,15 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // gridColumn14 // gridColumn15 // this.gridColumn14.Caption = "入库货主"; this.gridColumn14.FieldName = "tlOrg"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 13; this.gridColumn14.Width = 94; this.gridColumn15.Caption = "完结"; this.gridColumn15.FieldName = "txtColor"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 1; this.gridColumn15.Width = 94; // // Frm_WwTbl // @@ -1480,5 +1492,6 @@ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; } } DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -30,6 +30,7 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -89,6 +90,8 @@ frm.ShowDialog(); }; } private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -162,6 +165,15 @@ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) { _toolCk(0); } /// <summary> /// 完结 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 取消事件 @@ -566,6 +578,9 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; } ; toolBarMenu1.guidKey = ""; DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -32,6 +32,7 @@ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick; toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) => @@ -193,6 +194,9 @@ }; #endregion } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -620,7 +624,16 @@ } } /// <summary> /// 完结 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 审核事件 /// </summary> @@ -677,6 +690,9 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; case 20: strMsg = "售后审核"; break; DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -463,6 +463,8 @@ this.gridColumn23.FieldName = "isCgChk"; this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.OptionsColumn.ReadOnly = true; this.gridColumn23.Tag = "query_a.qt015"; this.gridColumn23.Visible = true; this.gridColumn23.VisibleIndex = 2; this.gridColumn23.Width = 94; DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -1,6 +1,4 @@ using DevExpress.XtraEditors; using DevExpress.XtraRichEdit.Model; using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -35,6 +33,7 @@ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick; toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick; toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -78,6 +77,8 @@ } }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -531,6 +532,17 @@ } /// <summary> /// 完结 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnWjClick(object sender, EventArgs e) { _toolCk(2); } /// <summary> /// 审核事件 /// </summary> /// <param name="sender"></param> @@ -584,6 +596,9 @@ case 0: strMsg = "反审核"; break; case 2: strMsg = "完结"; break; case 40: strMsg = "采购审核"; break; DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -423,6 +423,7 @@ lst.Add(btnReport.Name); lst.Add(btnDesign.Name); lst.Add(btnChk.Name); lst.Add(btnWj.Name); lst.Add(btnFchk.Name); lst.Add(btnOut.Name); lst.Add(btnIn.Name); @@ -471,6 +472,7 @@ lst.Add(btnAdd.Name); lst.Add(btnEdit.Name); lst.Add(btnChk.Name); lst.Add(btnWj.Name); lst.Add(btnFchk.Name); lst.Add(btnDel.Name); lst.Add(btnQuery.Name);
