Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent

cnf

2025-11-11 970ac0e5ddee13a06a5215d29ed028eb756215f0

Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent

 DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs

@@ -30,29 +30,29 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = 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 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.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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -114,6 +114,22 @@
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -157,22 +173,8 @@
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -223,6 +225,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -230,9 +235,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -263,14 +266,15 @@
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            this.xtraTabPage2,
            this.xtraTabPage3});
            // 
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1376, 442);
            this.xtraTabPage1.Size = new System.Drawing.Size(1376, 440);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // split1
@@ -292,7 +296,7 @@
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1376, 442);
            this.split1.Size = new System.Drawing.Size(1376, 440);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
            // 
@@ -304,7 +308,7 @@
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1376, 402);
            this.gcMain1.Size = new System.Drawing.Size(1376, 400);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -551,7 +555,7 @@
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 402);
            this.pageBar1.Location = new System.Drawing.Point(0, 400);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
@@ -564,7 +568,7 @@
            this.xtraTabPage2.Controls.Add(this.splitMx1);
            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1376, 442);
            this.xtraTabPage2.Size = new System.Drawing.Size(1376, 440);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // splitMx1
@@ -585,7 +589,7 @@
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1376, 442);
            this.splitMx1.Size = new System.Drawing.Size(1376, 440);
            this.splitMx1.SplitterPosition = 116;
            this.splitMx1.TabIndex = 0;
            // 
@@ -832,32 +836,32 @@
            this.layoutControlItem6});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11.Width = 100D;
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.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[] {
            columnDefinition9,
            columnDefinition10,
            columnDefinition11,
            columnDefinition12});
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.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[] {
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12});
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1376, 116);
            this.Root.TextVisible = false;
            // 
@@ -1020,11 +1024,195 @@
            this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage2;
            this.tabMx.Size = new System.Drawing.Size(1376, 316);
            this.tabMx.Size = new System.Drawing.Size(1376, 314);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
            this.tabMxPage2});
            // 
            // tabMxPage2
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1374, 288);
            this.tabMxPage2.Text = "已打印条码";
            // 
            // gcMx2
            // 
            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1374, 288);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            // 
            // gvMx2
            // 
            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx2.Appearance.Row.Options.UseFont = true;
            this.gvMx2.ColumnPanelRowHeight = 39;
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx2guid,
            this.gridColumn24,
            this.gvMx2itemBarcode,
            this.gvMx2itemNo,
            this.gridColumn25,
            this.gridColumn26,
            this.gvMx2oldqty,
            this.gridColumn27,
            this.gridColumn28,
            this.gridColumn29,
            this.gridColumn30,
            this.gridColumn31,
            this.gridColumn32});
            this.gvMx2.DetailHeight = 272;
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            // 
            // gvMx2guid
            // 
            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
            this.gvMx2guid.Caption = "guid ";
            this.gvMx2guid.FieldName = "guid";
            this.gvMx2guid.MinWidth = 44;
            this.gvMx2guid.Name = "gvMx2guid";
            this.gvMx2guid.Tag = "query_a.guid";
            this.gvMx2guid.Width = 82;
            // 
            // gridColumn24
            // 
            this.gridColumn24.Caption = "是否入库";
            this.gridColumn24.FieldName = "isRk";
            this.gridColumn24.MaxWidth = 44;
            this.gridColumn24.MinWidth = 44;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 0;
            this.gridColumn24.Width = 44;
            // 
            // gvMx2itemBarcode
            // 
            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemBarcode.Caption = "物料条码";
            this.gvMx2itemBarcode.FieldName = "itemBarcode";
            this.gvMx2itemBarcode.MinWidth = 44;
            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx2itemBarcode.Visible = true;
            this.gvMx2itemBarcode.VisibleIndex = 1;
            this.gvMx2itemBarcode.Width = 262;
            // 
            // gvMx2itemNo
            // 
            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemNo.Caption = "物料编码 ";
            this.gvMx2itemNo.FieldName = "itemNo";
            this.gvMx2itemNo.MinWidth = 44;
            this.gvMx2itemNo.Name = "gvMx2itemNo";
            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
            this.gvMx2itemNo.Visible = true;
            this.gvMx2itemNo.VisibleIndex = 2;
            this.gvMx2itemNo.Width = 87;
            // 
            // gridColumn25
            // 
            this.gridColumn25.Caption = "物料名称";
            this.gridColumn25.FieldName = "itemName";
            this.gridColumn25.MinWidth = 44;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 3;
            this.gridColumn25.Width = 131;
            // 
            // gridColumn26
            // 
            this.gridColumn26.Caption = "规格型号";
            this.gridColumn26.FieldName = "itemModel";
            this.gridColumn26.MinWidth = 44;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 4;
            this.gridColumn26.Width = 131;
            // 
            // gvMx2oldqty
            // 
            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
            this.gvMx2oldqty.Caption = "数量";
            this.gvMx2oldqty.FieldName = "quantity";
            this.gvMx2oldqty.MinWidth = 44;
            this.gvMx2oldqty.Name = "gvMx2oldqty";
            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
            this.gvMx2oldqty.Visible = true;
            this.gvMx2oldqty.VisibleIndex = 5;
            this.gvMx2oldqty.Width = 82;
            // 
            // gridColumn27
            // 
            this.gridColumn27.Caption = "单位";
            this.gridColumn27.FieldName = "dwName";
            this.gridColumn27.MinWidth = 22;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 6;
            this.gridColumn27.Width = 82;
            // 
            // gridColumn28
            // 
            this.gridColumn28.Caption = "打码人";
            this.gridColumn28.FieldName = "createBy";
            this.gridColumn28.MinWidth = 22;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 7;
            this.gridColumn28.Width = 82;
            // 
            // gridColumn29
            // 
            this.gridColumn29.Caption = "打码日期";
            this.gridColumn29.FieldName = "createDate";
            this.gridColumn29.MinWidth = 10;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 8;
            this.gridColumn29.Width = 157;
            // 
            // gridColumn30
            // 
            this.gridColumn30.Caption = "入库人";
            this.gridColumn30.FieldName = "rkUser";
            this.gridColumn30.MinWidth = 22;
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Visible = true;
            this.gridColumn30.VisibleIndex = 9;
            this.gridColumn30.Width = 82;
            // 
            // gridColumn31
            // 
            this.gridColumn31.Caption = "入库日期";
            this.gridColumn31.FieldName = "rkDate";
            this.gridColumn31.MinWidth = 22;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 10;
            this.gridColumn31.Width = 82;
            // 
            // gridColumn32
            // 
            this.gridColumn32.Caption = "入库位";
            this.gridColumn32.FieldName = "rkPositon";
            this.gridColumn32.MinWidth = 22;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 11;
            this.gridColumn32.Width = 82;
            // 
            // tabMxPage1
            // 
@@ -1395,10 +1583,10 @@
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
            editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
            editorButtonImageOptions4.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, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1416,10 +1604,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions5.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, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1475,10 +1663,10 @@
            // rptHistory
            // 
            this.rptHistory.AutoHeight = false;
            editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
            editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
            editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "记录", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.rptHistory.Name = "rptHistory";
            this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick);
@@ -1531,189 +1719,22 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // tabMxPage2
            // xtraTabPage3
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1374, 290);
            this.tabMxPage2.Text = "已打印条码";
            this.xtraTabPage3.Controls.Add(this.ucRptCgdhd1);
            this.xtraTabPage3.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1376, 440);
            this.xtraTabPage3.Text = "明细报表";
            // 
            // gcMx2
            // ucRptCgdhd1
            // 
            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1374, 290);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            // 
            // gvMx2
            // 
            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx2.Appearance.Row.Options.UseFont = true;
            this.gvMx2.ColumnPanelRowHeight = 39;
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx2guid,
            this.gridColumn24,
            this.gvMx2itemBarcode,
            this.gvMx2itemNo,
            this.gridColumn25,
            this.gridColumn26,
            this.gvMx2oldqty,
            this.gridColumn27,
            this.gridColumn28,
            this.gridColumn29,
            this.gridColumn30,
            this.gridColumn31,
            this.gridColumn32});
            this.gvMx2.DetailHeight = 272;
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            // 
            // gvMx2guid
            // 
            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
            this.gvMx2guid.Caption = "guid ";
            this.gvMx2guid.FieldName = "guid";
            this.gvMx2guid.MinWidth = 44;
            this.gvMx2guid.Name = "gvMx2guid";
            this.gvMx2guid.Tag = "query_a.guid";
            this.gvMx2guid.Width = 82;
            // 
            // gridColumn24
            // 
            this.gridColumn24.Caption = "是否入库";
            this.gridColumn24.FieldName = "isRk";
            this.gridColumn24.MaxWidth = 44;
            this.gridColumn24.MinWidth = 44;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 0;
            this.gridColumn24.Width = 44;
            // 
            // gvMx2itemBarcode
            // 
            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemBarcode.Caption = "物料条码";
            this.gvMx2itemBarcode.FieldName = "itemBarcode";
            this.gvMx2itemBarcode.MinWidth = 44;
            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx2itemBarcode.Visible = true;
            this.gvMx2itemBarcode.VisibleIndex = 1;
            this.gvMx2itemBarcode.Width = 262;
            // 
            // gvMx2itemNo
            // 
            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemNo.Caption = "物料编码 ";
            this.gvMx2itemNo.FieldName = "itemNo";
            this.gvMx2itemNo.MinWidth = 44;
            this.gvMx2itemNo.Name = "gvMx2itemNo";
            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
            this.gvMx2itemNo.Visible = true;
            this.gvMx2itemNo.VisibleIndex = 2;
            this.gvMx2itemNo.Width = 87;
            // 
            // gridColumn25
            // 
            this.gridColumn25.Caption = "物料名称";
            this.gridColumn25.FieldName = "itemName";
            this.gridColumn25.MinWidth = 44;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 3;
            this.gridColumn25.Width = 131;
            // 
            // gridColumn26
            // 
            this.gridColumn26.Caption = "规格型号";
            this.gridColumn26.FieldName = "itemModel";
            this.gridColumn26.MinWidth = 44;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 4;
            this.gridColumn26.Width = 131;
            // 
            // gvMx2oldqty
            // 
            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
            this.gvMx2oldqty.Caption = "数量";
            this.gvMx2oldqty.FieldName = "quantity";
            this.gvMx2oldqty.MinWidth = 44;
            this.gvMx2oldqty.Name = "gvMx2oldqty";
            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
            this.gvMx2oldqty.Visible = true;
            this.gvMx2oldqty.VisibleIndex = 5;
            this.gvMx2oldqty.Width = 82;
            // 
            // gridColumn27
            // 
            this.gridColumn27.Caption = "单位";
            this.gridColumn27.FieldName = "dwName";
            this.gridColumn27.MinWidth = 22;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 6;
            this.gridColumn27.Width = 82;
            // 
            // gridColumn28
            // 
            this.gridColumn28.Caption = "打码人";
            this.gridColumn28.FieldName = "createBy";
            this.gridColumn28.MinWidth = 22;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 7;
            this.gridColumn28.Width = 82;
            // 
            // gridColumn29
            // 
            this.gridColumn29.Caption = "打码日期";
            this.gridColumn29.FieldName = "createDate";
            this.gridColumn29.MinWidth = 10;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 8;
            this.gridColumn29.Width = 157;
            // 
            // gridColumn30
            // 
            this.gridColumn30.Caption = "入库人";
            this.gridColumn30.FieldName = "rkUser";
            this.gridColumn30.MinWidth = 22;
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Visible = true;
            this.gridColumn30.VisibleIndex = 9;
            this.gridColumn30.Width = 82;
            // 
            // gridColumn31
            // 
            this.gridColumn31.Caption = "入库日期";
            this.gridColumn31.FieldName = "rkDate";
            this.gridColumn31.MinWidth = 22;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 10;
            this.gridColumn31.Width = 82;
            // 
            // gridColumn32
            // 
            this.gridColumn32.Caption = "入库位";
            this.gridColumn32.FieldName = "rkPositon";
            this.gridColumn32.MinWidth = 22;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 11;
            this.gridColumn32.Width = 82;
            this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.ucRptCgdhd1.Location = new System.Drawing.Point(0, 0);
            this.ucRptCgdhd1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.ucRptCgdhd1.Name = "ucRptCgdhd1";
            this.ucRptCgdhd1.Size = new System.Drawing.Size(1376, 440);
            this.ucRptCgdhd1.TabIndex = 0;
            // 
            // Frm_MesInvItemArn
            // 
@@ -1776,6 +1797,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1783,9 +1807,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            this.ResumeLayout(false);

        }
@@ -1910,5 +1932,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private Rpt.UcRptCgdhd ucRptCgdhd1;
    }
}

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs

@@ -48,7 +48,11 @@
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            }, lbGuid);
            }, lbGuid, toolBarMenu1
            , () =>
            {
                ucRptCgdhd1.Initialize();
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //设置组织
@@ -174,12 +178,17 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                gridView1.ActiveFilter.Clear();
                gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
                frm.UpdateParent += Frm_UpdateParent;
                frm.ShowDialog();
                return;
            }
            ucRptCgdhd1.ToolBarMenu1_btnQueryClick(sender, e);
        }

        /// <summary>

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx

@@ -121,6 +121,6 @@
    <value>17, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>33</value>
    <value>140</value>
  </metadata>
</root>

 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,387 @@
namespace Gs.DevApp.DevFrm.Rpt
{
    partial class UcRptCgdhd
    {
        /// <summary> 
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary> 
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.gcMain1Report = new DevExpress.XtraGrid.GridControl();
            this.gridView1Report = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = 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.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
            this.SuspendLayout();
            // 
            // gcMain1Report
            // 
            this.gcMain1Report.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1Report.Location = new System.Drawing.Point(0, 0);
            this.gcMain1Report.MainView = this.gridView1Report;
            this.gcMain1Report.Name = "gcMain1Report";
            this.gcMain1Report.Size = new System.Drawing.Size(1339, 644);
            this.gcMain1Report.TabIndex = 2;
            this.gcMain1Report.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1Report});
            // 
            // gridView1Report
            // 
            this.gridView1Report.Appearance.Row.Options.UseFont = true;
            this.gridView1Report.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_guid,
            this.gv_itemId,
            this.gridColumn3,
            this.gridColumn2,
            this.gridColumn4,
            this.gv_quantity,
            this.gv_depotId,
            this.gridColumn6,
            this.gridColumn1,
            this.gv_depotSectionsCode,
            this.gv_ownerType,
            this.gv_ownerId,
            this.gridColumn5,
            this.gv_indepUserCode,
            this.gv_indepDate,
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10,
            this.gridColumn11});
            this.gridView1Report.GridControl = this.gcMain1Report;
            this.gridView1Report.IndicatorWidth = 50;
            this.gridView1Report.Name = "gridView1Report";
            this.gridView1Report.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1Report.OptionsView.ShowAutoFilterRow = true;
            this.gridView1Report.OptionsView.ShowFooter = true;
            this.gridView1Report.OptionsView.ShowGroupPanel = false;
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键GUID";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            // 
            // gv_itemId
            // 
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料ID ";
            this.gv_itemId.FieldName = "itemId";
            this.gv_itemId.MinWidth = 50;
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.ITEM_ID";
            this.gv_itemId.Width = 73;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料编码";
            this.gridColumn3.FieldName = "itemNo";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 74;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料名称";
            this.gridColumn2.FieldName = "itemName";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 74;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "规格型号";
            this.gridColumn4.FieldName = "itemModel";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 9;
            this.gridColumn4.Width = 74;
            // 
            // gv_quantity
            // 
            this.gv_quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gv_quantity.AppearanceCell.Options.UseFont = true;
            this.gv_quantity.AppearanceCell.Options.UseForeColor = true;
            this.gv_quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;
            this.gv_quantity.Caption = "收料数量 ";
            this.gv_quantity.FieldName = "quantity";
            this.gv_quantity.MinWidth = 50;
            this.gv_quantity.Name = "gv_quantity";
            this.gv_quantity.OptionsColumn.AllowEdit = false;
            this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计={0:0.##}")});
            this.gv_quantity.Tag = "query_a.QUANTITY";
            this.gv_quantity.Visible = true;
            this.gv_quantity.VisibleIndex = 2;
            this.gv_quantity.Width = 74;
            // 
            // gv_depotId
            // 
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "检验状态";
            this.gv_depotId.FieldName = "txtColor";
            this.gv_depotId.MinWidth = 50;
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 4;
            this.gv_depotId.Width = 73;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "检验结果";
            this.gridColumn6.FieldName = "checkRes";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 74;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "退货";
            this.gridColumn1.FieldName = "returnFlag";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 13;
            this.gridColumn1.Width = 74;
            // 
            // gv_depotSectionsCode
            // 
            this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotSectionsCode.Caption = "急料";
            this.gv_depotSectionsCode.FieldName = "urgentFlagTxt";
            this.gv_depotSectionsCode.MinWidth = 50;
            this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
            this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
            this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
            this.gv_depotSectionsCode.Visible = true;
            this.gv_depotSectionsCode.VisibleIndex = 10;
            this.gv_depotSectionsCode.Width = 74;
            // 
            // gv_ownerType
            // 
            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
            this.gv_ownerType.Caption = "收料组织";
            this.gv_ownerType.FieldName = "receivingOrg";
            this.gv_ownerType.MinWidth = 50;
            this.gv_ownerType.Name = "gv_ownerType";
            this.gv_ownerType.OptionsColumn.AllowEdit = false;
            this.gv_ownerType.Tag = "query_a.Owner_Type";
            this.gv_ownerType.Visible = true;
            this.gv_ownerType.VisibleIndex = 17;
            this.gv_ownerType.Width = 74;
            // 
            // gv_ownerId
            // 
            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
            this.gv_ownerId.Caption = "采购单号";
            this.gv_ownerId.FieldName = "ebeln";
            this.gv_ownerId.MinWidth = 50;
            this.gv_ownerId.Name = "gv_ownerId";
            this.gv_ownerId.OptionsColumn.AllowEdit = false;
            this.gv_ownerId.Tag = "query_a.Owner_Id";
            this.gv_ownerId.Visible = true;
            this.gv_ownerId.VisibleIndex = 0;
            this.gv_ownerId.Width = 74;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "到货单号";
            this.gridColumn5.FieldName = "dhdNo";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 74;
            // 
            // gv_indepUserCode
            // 
            this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
            this.gv_indepUserCode.Caption = "收货人";
            this.gv_indepUserCode.FieldName = "dhdUser";
            this.gv_indepUserCode.MinWidth = 50;
            this.gv_indepUserCode.Name = "gv_indepUserCode";
            this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
            this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
            this.gv_indepUserCode.Visible = true;
            this.gv_indepUserCode.VisibleIndex = 11;
            this.gv_indepUserCode.Width = 74;
            // 
            // gv_indepDate
            // 
            this.gv_indepDate.AppearanceCell.Options.UseFont = true;
            this.gv_indepDate.Caption = "收货日期 ";
            this.gv_indepDate.FieldName = "dhdDate";
            this.gv_indepDate.MinWidth = 10;
            this.gv_indepDate.Name = "gv_indepDate";
            this.gv_indepDate.OptionsColumn.AllowEdit = false;
            this.gv_indepDate.Tag = "query_a.INDEP_DATE";
            this.gv_indepDate.Visible = true;
            this.gv_indepDate.VisibleIndex = 12;
            this.gv_indepDate.Width = 80;
            // 
            // gridColumn7
            // 
            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn7.Caption = "收料备注";
            this.gridColumn7.FieldName = "memo";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 77;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "OA处理意见";
            this.gridColumn8.FieldName = "clyj";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 14;
            this.gridColumn8.Width = 77;
            // 
            // gridColumn9
            // 
            this.gridColumn9.Caption = "OA挑选数量";
            this.gridColumn9.FieldName = "txsl";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 15;
            this.gridColumn9.Width = 77;
            // 
            // gridColumn10
            // 
            this.gridColumn10.Caption = "OA选别类别";
            this.gridColumn10.FieldName = "xblb";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 16;
            this.gridColumn10.Width = 88;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 644);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1339, 38);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // gridColumn11
            // 
            this.gridColumn11.Caption = "供应商";
            this.gridColumn11.FieldName = "gysName";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 8;
            this.gridColumn11.Width = 94;
            // 
            // UcRptCgdhd
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.gcMain1Report);
            this.Controls.Add(this.pageBar1);
            this.Name = "UcRptCgdhd";
            this.Size = new System.Drawing.Size(1339, 682);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).EndInit();
            this.ResumeLayout(false);

        }
        #endregion
        private DevExpress.XtraGrid.GridControl gcMain1Report;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1Report;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}

 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,152 @@
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.Rpt
{
    public partial class UcRptCgdhd : DevExpress.XtraEditors.XtraUserControl
    {
        string _webServiceName = "MesInvItemArnManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public UcRptCgdhd()
        {
            InitializeComponent();
        }
        public bool isInitialize = false;
        /// <summary>
        /// è¿™å’Œæ™®é€šé¡µä¸ä¸€æ ·
        /// </summary>
        public void Initialize()
        {
            if (isInitialize)
                return;
            string _formNamespace = this.GetType().FullName;
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<GridView>();
            gvList.Add(gridView1Report);
            GridControl gcMain = this.Controls.Find("gcMain1Report", true).OfType<GridControl>().FirstOrDefault();
            UtilityHelper.GetUcXmlConfig(_formNamespace, gvList, gcMain);
            Form parentForm = this.FindForm();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1Report, null, parentForm, "", "", (value) =>
            {
                //  Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
            //Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            //{
            //    getModel(value);
            //}, (value) =>
            //{
            //    getPageList(this.pageBar1.CurrentPage);
            //}, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            this.isInitialize=true;
        }


        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1Report.Columns, gridView1Report);
            await Task.Delay(100);
            getPageList(1);
        }

        /// <summary>
        /// åˆ†é¡µäº‹ä»¶
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage);
        }
        /// <summary>
        /// æŸ¥è¯¢äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        public void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1Report.ActiveFilter.Clear();
            gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1Report.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
        /// <summary>
        /// æŸ¥è¯¢å›žè°ƒ
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1);
        }

        /// <summary>
        /// åˆ·æ–°äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        public void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            getPageList(this.pageBar1.CurrentPage);
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1Report.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageReport", json);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain1Report.BindingContext = new BindingContext();
                    gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain1Report.DataSource = dt;
                        gcMain1Report.ForceInitialize();
                        gridView1Report.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1Report);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1Report, gridView1Report);
                    gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示：" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }



    }
}

 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs

@@ -127,8 +127,8 @@
            this.ucBtnPrintOne1.btnPrintClick += (s, e) =>
            {
                string mainGuid = lbGuid.Text.Trim();
                ucBtnPrint1.guidKey = mainGuid;
                  this.ucBtnPrint1.rptParameter = "rpt_Arrival{"
                ucBtnPrintOne1.guidKey = mainGuid;
                  this.ucBtnPrintOne1.rptParameter = "rpt_Arrival{"
                       + "101"//一键打印101
                       + "," + ""
                       + "," + ""

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -148,6 +148,76 @@
                : "linktoprevious_16x16") as Image;
            return image2;
        }
        /// <summary>
        /// ç”¨æˆ·æŽ§ä»¶è¯»å–xml配置
        /// </summary>
        /// <param name="_formNamespace"></param>
        /// <param name="gvList"></param>
        /// <param name="gcMain"></param>
        public static void GetUcXmlConfig(string _formNamespace, List<DevExpress.XtraGrid.Views.Grid.GridView> gvList, GridControl gcMain)
        {
            JArray array = new JArray();
            var _obj = new
            {
                formPath = _formNamespace,
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Fm/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    JObject _job = JObject.Parse(strJson);
                    foreach (var a in _job["rtnData"]["list"])
                    {
                        array.Add(a);
                    }
                    foreach (GridView gv in gvList)
                    {
                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());
                        if (john != null)
                        {
                            string controlId = john["controlId"].ToString();
                            string controlXml = john["controlXml"].ToString();
                            byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
                            using (var stream = new MemoryStream(byteArray))
                            {
                                gv.RestoreLayoutFromStream(stream);
                            }
                        }
                    }

                    //设置查询条件beg
                    if (gcMain != null)
                    {
                        GridView gv1 = gcMain.MainView as GridView;
                        if (gv1 != null)
                        {
                            foreach (var a in _job["rtnData"]["list2"])
                            {
                                string _gvColName = a["gvColName"].ToString();
                                string _sqlField = a["sqlField"].ToString();
                                string _sqlFieldType = a["sqlFieldType"].ToString();
                                var column = gv1.Columns.Cast<DevExpress.XtraGrid.Columns.GridColumn>()
                                                .FirstOrDefault(c => c.Name == _gvColName);
                                if (column != null)
                                {
                                    column.Tag = _sqlField;
                                    column.UnboundExpression = _sqlFieldType;
                                }
                            }
                        }
                    }
                    //设置查询条件end
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        /// <summary>
        ///     åˆå§‹åŒ–一个表
@@ -1946,19 +2016,36 @@
                    column.Width = 500;
            }
        }
        
        public delegate void DelegateGetUserControlList();
        /// <summary>
        /// è®¾ç½®é€‰é¡¹å¡
        /// </summary>
        /// <param name="gridView1"></param>
        /// <param name="xtraTabControl1"></param>
        /// <param name="pageBar1"></param>
        /// <param name="action"></param>
        /// <param name="page"></param>
        public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null)
        /// <param name="action">读取实体</param>
        /// <param name="page">读取列表</param>
        /// <param name="lbGuid"></param>
        /// <param name="barMenu"></param>
        /// <param name="ucLst">读取报表</param>
        public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null, UcToolBarMenu barMenu = null, DelegateGetUserControlList ucLst = null)
        {
            xtraTabControl1.SelectedPageChanged += (s, e) =>
            {
                if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
                {
                    if (barMenu != null)
                        barMenu.SetAllButton(0);

                    page(pageBar1.CurrentPage);
                    int rowHandle = 0;
                    rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
                    if (rowHandle < 0)
                        rowHandle = 0;
                    gridView1.FocusedRowHandle = rowHandle;
                    return;
                }

                if (xtraTabControl1.SelectedTabPageIndex == 1)
                {
                    int _handle = gridView1.FocusedRowHandle;
@@ -1986,19 +2073,19 @@
                        return;
                    }
                    action(_guid);
                    return;
                }
                if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)

                if (barMenu != null && xtraTabControl1.SelectedTabPageIndex == 2)
                {
                    page(pageBar1.CurrentPage);
                    int rowHandle = 0;
                    rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
                    if (rowHandle < 0)
                        rowHandle = 0;
                    gridView1.FocusedRowHandle = rowHandle;
                    barMenu.SetAllButton(2);
                    ucLst();
                    return;
                }
            };
        }


        /// <summary>
        /// è®¾ç½®æ˜Žç»†grid样式
        /// </summary>

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -79,8 +79,49 @@
        }


        /// <summary>
        /// 
        /// </summary>
        /// <param name="inType"></param>
        public void SetAllButton(int inType)
        {
            var lstBtn = new List<string>();
            if (inType == 0)
            {
                lstBtn.Add(btnSave.Name);
                lstBtn.Add(btnEsc.Name);
                foreach (BarItem item in barManager1.Items)
                    if (item is BarLargeButtonItem largeButtonItem)
                    {
                        if (!lstBtn.Contains(item.Name))
                            largeButtonItem.Enabled = true;
                        else
                            largeButtonItem.Enabled = false;
                    }
                return;
            }
            if (inType == 2)
            {
                lstBtn.Add(btnHelp.Name);
                lstBtn.Add(btnLoad.Name);
                lstBtn.Add(btnQuery.Name);
                lstBtn.Add(btnLayout.Name);
                lstBtn.Add(btnFont.Name);
                lstBtn.Add(btnAdd.Name);
                foreach (BarItem item in barManager1.Items)
                    if (item is BarLargeButtonItem largeButtonItem)
                    {
                        if (lstBtn.Contains(item.Name))
                            largeButtonItem.Enabled = true;
                        else
                            largeButtonItem.Enabled = false;
                    }
                return;
            }

       
        }


        /// <summary>
        ///     åˆå§‹åŒ–按钮状态
        /// </summary>

 README.md

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
## LB_MesClient

蓝宝PC前端