lu
2025-03-25 ebab62b668bd769f97f4afd5caee472f7e514a27
子体大小
已修改17个文件
已添加4个文件
1086 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs 237 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs 102 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/XtraForm2.cs 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/XtraForm2.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Program.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 181 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/announcement_32x32.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectWompba.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/XtraForm1.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -43,7 +43,7 @@
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -125,7 +125,7 @@
            this.split1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
            this.split1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            this.xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
@@ -229,7 +229,7 @@
            // 
            // split1.Panel1
            // 
            this.split1.Panel1.Controls.Add(this.gcMain);
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            // 
@@ -240,16 +240,16 @@
            this.split1.SplitterPosition = 558;
            this.split1.TabIndex = 0;
            // 
            // gcMain
            // gcMain1
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1158, 519);
            this.gcMain.TabIndex = 2;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1158, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
            // gridView1
@@ -281,7 +281,7 @@
            this.gv_depotNo,
            this.gv_isStatus,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -1237,7 +1237,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
            this.split1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            this.xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
@@ -1303,7 +1303,7 @@
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -119,16 +119,16 @@
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gcMain1.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -58,7 +58,6 @@
            this.gv_caa024 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_caa010 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_caa011 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_saleOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_saleOrderEntryseq = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,7 +66,7 @@
            this.gv_caa016 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_caa005 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -312,7 +311,6 @@
            this.gv_caa024,
            this.gv_caa010,
            this.gv_caa011,
            this.gv_checkUser,
            this.gv_saleOrderNo,
            this.gv_saleOrderEntryseq,
            this.gridColumn2,
@@ -321,7 +319,7 @@
            this.gv_caa016,
            this.gridColumn7,
            this.gridColumn4,
            this.gv_caa005,
            this.gv_createDate,
            this.gridColumn18,
            this.gridColumn19,
            this.gridColumn20,
@@ -532,20 +530,6 @@
            this.gv_caa011.VisibleIndex = 13;
            this.gv_caa011.Width = 180;
            // 
            // gv_checkUser
            //
            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
            this.gv_checkUser.Caption = "审核人";
            this.gv_checkUser.FieldName = "checkUser";
            this.gv_checkUser.MinWidth = 50;
            this.gv_checkUser.Name = "gv_checkUser";
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.CHECK_USER";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.VisibleIndex = 14;
            this.gv_checkUser.Width = 50;
            //
            // gv_saleOrderNo
            // 
            this.gv_saleOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -557,7 +541,7 @@
            this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
            this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
            this.gv_saleOrderNo.Visible = true;
            this.gv_saleOrderNo.VisibleIndex = 15;
            this.gv_saleOrderNo.VisibleIndex = 14;
            this.gv_saleOrderNo.Width = 100;
            // 
            // gv_saleOrderEntryseq
@@ -572,7 +556,7 @@
            this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
            this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
            this.gv_saleOrderEntryseq.Visible = true;
            this.gv_saleOrderEntryseq.VisibleIndex = 16;
            this.gv_saleOrderEntryseq.VisibleIndex = 15;
            this.gv_saleOrderEntryseq.Width = 50;
            // 
            // gridColumn2
@@ -583,7 +567,7 @@
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 17;
            this.gridColumn2.VisibleIndex = 16;
            this.gridColumn2.Width = 110;
            // 
            // gv_forceCloserid
@@ -597,7 +581,7 @@
            this.gv_forceCloserid.OptionsColumn.AllowEdit = false;
            this.gv_forceCloserid.Tag = "query_a.FORCE_CLOSERID";
            this.gv_forceCloserid.Visible = true;
            this.gv_forceCloserid.VisibleIndex = 18;
            this.gv_forceCloserid.VisibleIndex = 17;
            this.gv_forceCloserid.Width = 80;
            // 
            // gv_closeType
@@ -611,7 +595,7 @@
            this.gv_closeType.OptionsColumn.AllowEdit = false;
            this.gv_closeType.Tag = "query_a.CLOSE_TYPE";
            this.gv_closeType.Visible = true;
            this.gv_closeType.VisibleIndex = 19;
            this.gv_closeType.VisibleIndex = 18;
            this.gv_closeType.Width = 80;
            // 
            // gv_caa016
@@ -625,7 +609,7 @@
            this.gv_caa016.OptionsColumn.AllowEdit = false;
            this.gv_caa016.Tag = "query_a.CAA016";
            this.gv_caa016.Visible = true;
            this.gv_caa016.VisibleIndex = 20;
            this.gv_caa016.VisibleIndex = 19;
            this.gv_caa016.Width = 100;
            // 
            // gridColumn7
@@ -636,7 +620,7 @@
            this.gridColumn7.MinWidth = 50;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 21;
            this.gridColumn7.VisibleIndex = 20;
            this.gridColumn7.Width = 50;
            // 
            // gridColumn4
@@ -647,22 +631,22 @@
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 22;
            this.gridColumn4.VisibleIndex = 21;
            this.gridColumn4.Width = 50;
            // 
            // gv_caa005
            // gv_createDate
            // 
            this.gv_caa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_caa005.AppearanceCell.Options.UseFont = true;
            this.gv_caa005.Caption = "同步时间";
            this.gv_caa005.FieldName = "createDate";
            this.gv_caa005.MinWidth = 50;
            this.gv_caa005.Name = "gv_caa005";
            this.gv_caa005.OptionsColumn.AllowEdit = false;
            this.gv_caa005.Tag = "query_a.CAA005";
            this.gv_caa005.Visible = true;
            this.gv_caa005.VisibleIndex = 23;
            this.gv_caa005.Width = 180;
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "同步时间";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 50;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.CAA005";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 22;
            this.gv_createDate.Width = 180;
            // 
            // gridColumn18
            // 
@@ -671,7 +655,7 @@
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 24;
            this.gridColumn18.VisibleIndex = 23;
            this.gridColumn18.Width = 94;
            // 
            // gridColumn19
@@ -681,7 +665,7 @@
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 25;
            this.gridColumn19.VisibleIndex = 24;
            this.gridColumn19.Width = 94;
            // 
            // gridColumn20
@@ -691,7 +675,7 @@
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 26;
            this.gridColumn20.VisibleIndex = 25;
            this.gridColumn20.Width = 94;
            // 
            // gridColumn21
@@ -701,7 +685,7 @@
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 27;
            this.gridColumn21.VisibleIndex = 26;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
@@ -711,7 +695,7 @@
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 28;
            this.gridColumn22.VisibleIndex = 27;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn23
@@ -721,7 +705,7 @@
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 29;
            this.gridColumn23.VisibleIndex = 28;
            this.gridColumn23.Width = 94;
            // 
            // gridColumn24
@@ -731,7 +715,7 @@
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 30;
            this.gridColumn24.VisibleIndex = 29;
            this.gridColumn24.Width = 94;
            // 
            // gridColumn25
@@ -741,7 +725,7 @@
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 31;
            this.gridColumn25.VisibleIndex = 30;
            this.gridColumn25.Width = 94;
            // 
            // gridColumn26
@@ -751,7 +735,7 @@
            this.gridColumn26.MinWidth = 25;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 32;
            this.gridColumn26.VisibleIndex = 31;
            this.gridColumn26.Width = 94;
            // 
            // gridColumn27
@@ -761,7 +745,7 @@
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 33;
            this.gridColumn27.VisibleIndex = 32;
            this.gridColumn27.Width = 94;
            // 
            // gridColumn28
@@ -771,7 +755,7 @@
            this.gridColumn28.MinWidth = 25;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 34;
            this.gridColumn28.VisibleIndex = 33;
            this.gridColumn28.Width = 94;
            // 
            // gridColumn31
@@ -781,7 +765,7 @@
            this.gridColumn31.MinWidth = 25;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 35;
            this.gridColumn31.VisibleIndex = 34;
            this.gridColumn31.Width = 94;
            // 
            // gridColumn32
@@ -791,7 +775,7 @@
            this.gridColumn32.MinWidth = 25;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 36;
            this.gridColumn32.VisibleIndex = 35;
            this.gridColumn32.Width = 94;
            // 
            // gridColumn33
@@ -801,7 +785,7 @@
            this.gridColumn33.MinWidth = 25;
            this.gridColumn33.Name = "gridColumn33";
            this.gridColumn33.Visible = true;
            this.gridColumn33.VisibleIndex = 37;
            this.gridColumn33.VisibleIndex = 36;
            this.gridColumn33.Width = 94;
            // 
            // gridColumn34
@@ -811,7 +795,7 @@
            this.gridColumn34.MinWidth = 25;
            this.gridColumn34.Name = "gridColumn34";
            this.gridColumn34.Visible = true;
            this.gridColumn34.VisibleIndex = 38;
            this.gridColumn34.VisibleIndex = 37;
            this.gridColumn34.Width = 94;
            // 
            // gridColumn35
@@ -821,7 +805,7 @@
            this.gridColumn35.MinWidth = 25;
            this.gridColumn35.Name = "gridColumn35";
            this.gridColumn35.Visible = true;
            this.gridColumn35.VisibleIndex = 39;
            this.gridColumn35.VisibleIndex = 38;
            this.gridColumn35.Width = 94;
            // 
            // gridColumn36
@@ -831,7 +815,7 @@
            this.gridColumn36.MinWidth = 25;
            this.gridColumn36.Name = "gridColumn36";
            this.gridColumn36.Visible = true;
            this.gridColumn36.VisibleIndex = 41;
            this.gridColumn36.VisibleIndex = 40;
            this.gridColumn36.Width = 94;
            // 
            // gridColumn37
@@ -841,7 +825,7 @@
            this.gridColumn37.MinWidth = 25;
            this.gridColumn37.Name = "gridColumn37";
            this.gridColumn37.Visible = true;
            this.gridColumn37.VisibleIndex = 40;
            this.gridColumn37.VisibleIndex = 39;
            this.gridColumn37.Width = 94;
            // 
            // gridColumn38
@@ -851,7 +835,7 @@
            this.gridColumn38.MinWidth = 25;
            this.gridColumn38.Name = "gridColumn38";
            this.gridColumn38.Visible = true;
            this.gridColumn38.VisibleIndex = 42;
            this.gridColumn38.VisibleIndex = 41;
            this.gridColumn38.Width = 94;
            // 
            // gridColumn39
@@ -861,7 +845,7 @@
            this.gridColumn39.MinWidth = 25;
            this.gridColumn39.Name = "gridColumn39";
            this.gridColumn39.Visible = true;
            this.gridColumn39.VisibleIndex = 43;
            this.gridColumn39.VisibleIndex = 42;
            this.gridColumn39.Width = 94;
            // 
            // pageBar1
@@ -946,21 +930,21 @@
            // 
            // txt_wtOrg
            // 
            this.txt_wtOrg.Location = new System.Drawing.Point(942, 140);
            this.txt_wtOrg.Location = new System.Drawing.Point(927, 140);
            this.txt_wtOrg.Name = "txt_wtOrg";
            this.txt_wtOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_wtOrg.Properties.Appearance.Options.UseFont = true;
            this.txt_wtOrg.Size = new System.Drawing.Size(172, 28);
            this.txt_wtOrg.Size = new System.Drawing.Size(166, 28);
            this.txt_wtOrg.StyleController = this.layoutMx1;
            this.txt_wtOrg.TabIndex = 465;
            // 
            // txt_scOrg
            // 
            this.txt_scOrg.Location = new System.Drawing.Point(942, 108);
            this.txt_scOrg.Location = new System.Drawing.Point(927, 108);
            this.txt_scOrg.Name = "txt_scOrg";
            this.txt_scOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
            this.txt_scOrg.Size = new System.Drawing.Size(172, 28);
            this.txt_scOrg.Size = new System.Drawing.Size(166, 28);
            this.txt_scOrg.StyleController = this.layoutMx1;
            this.txt_scOrg.TabIndex = 463;
            // 
@@ -970,27 +954,27 @@
            this.txt_caa016.Name = "txt_caa016";
            this.txt_caa016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa016.Properties.Appearance.Options.UseFont = true;
            this.txt_caa016.Size = new System.Drawing.Size(446, 28);
            this.txt_caa016.Size = new System.Drawing.Size(436, 28);
            this.txt_caa016.StyleController = this.layoutMx1;
            this.txt_caa016.TabIndex = 243;
            // 
            // txt_djlx
            // 
            this.txt_djlx.Location = new System.Drawing.Point(666, 76);
            this.txt_djlx.Location = new System.Drawing.Point(656, 76);
            this.txt_djlx.Name = "txt_djlx";
            this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_djlx.Properties.Appearance.Options.UseFont = true;
            this.txt_djlx.Size = new System.Drawing.Size(170, 28);
            this.txt_djlx.Size = new System.Drawing.Size(165, 28);
            this.txt_djlx.StyleController = this.layoutMx1;
            this.txt_djlx.TabIndex = 461;
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(666, 140);
            this.txt_itemModel.Location = new System.Drawing.Point(656, 140);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
            this.txt_itemModel.Size = new System.Drawing.Size(170, 28);
            this.txt_itemModel.Size = new System.Drawing.Size(165, 28);
            this.txt_itemModel.StyleController = this.layoutMx1;
            this.txt_itemModel.TabIndex = 459;
            // 
@@ -1000,47 +984,47 @@
            this.txt_caa001.Name = "txt_caa001";
            this.txt_caa001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa001.Properties.Appearance.Options.UseFont = true;
            this.txt_caa001.Size = new System.Drawing.Size(170, 28);
            this.txt_caa001.Size = new System.Drawing.Size(165, 28);
            this.txt_caa001.StyleController = this.layoutMx1;
            this.txt_caa001.TabIndex = 213;
            // 
            // txt_caa012
            // 
            this.txt_caa012.Location = new System.Drawing.Point(390, 12);
            this.txt_caa012.Location = new System.Drawing.Point(385, 12);
            this.txt_caa012.Name = "txt_caa012";
            this.txt_caa012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa012.Properties.Appearance.Options.UseFont = true;
            this.txt_caa012.Size = new System.Drawing.Size(170, 28);
            this.txt_caa012.Size = new System.Drawing.Size(165, 28);
            this.txt_caa012.StyleController = this.layoutMx1;
            this.txt_caa012.TabIndex = 231;
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(390, 108);
            this.txt_itemName.Location = new System.Drawing.Point(385, 108);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(170, 28);
            this.txt_itemName.Size = new System.Drawing.Size(165, 28);
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 457;
            // 
            // txt_dptName
            // 
            this.txt_dptName.Location = new System.Drawing.Point(666, 12);
            this.txt_dptName.Location = new System.Drawing.Point(656, 12);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
            this.txt_dptName.Size = new System.Drawing.Size(170, 28);
            this.txt_dptName.Size = new System.Drawing.Size(165, 28);
            this.txt_dptName.StyleController = this.layoutMx1;
            this.txt_dptName.TabIndex = 451;
            // 
            // txt_caa010
            // 
            this.txt_caa010.Location = new System.Drawing.Point(942, 12);
            this.txt_caa010.Location = new System.Drawing.Point(927, 12);
            this.txt_caa010.Name = "txt_caa010";
            this.txt_caa010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa010.Properties.Appearance.Options.UseFont = true;
            this.txt_caa010.Size = new System.Drawing.Size(172, 28);
            this.txt_caa010.Size = new System.Drawing.Size(166, 28);
            this.txt_caa010.StyleController = this.layoutMx1;
            this.txt_caa010.TabIndex = 226;
            // 
@@ -1050,37 +1034,37 @@
            this.txt_caa020.Name = "txt_caa020";
            this.txt_caa020.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa020.Properties.Appearance.Options.UseFont = true;
            this.txt_caa020.Size = new System.Drawing.Size(170, 28);
            this.txt_caa020.Size = new System.Drawing.Size(165, 28);
            this.txt_caa020.StyleController = this.layoutMx1;
            this.txt_caa020.TabIndex = 262;
            // 
            // txt_caa024
            // 
            this.txt_caa024.Location = new System.Drawing.Point(390, 44);
            this.txt_caa024.Location = new System.Drawing.Point(385, 44);
            this.txt_caa024.Name = "txt_caa024";
            this.txt_caa024.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa024.Properties.Appearance.Options.UseFont = true;
            this.txt_caa024.Size = new System.Drawing.Size(170, 28);
            this.txt_caa024.Size = new System.Drawing.Size(165, 28);
            this.txt_caa024.StyleController = this.layoutMx1;
            this.txt_caa024.TabIndex = 370;
            // 
            // txt_gdzt
            // 
            this.txt_gdzt.Location = new System.Drawing.Point(666, 44);
            this.txt_gdzt.Location = new System.Drawing.Point(656, 44);
            this.txt_gdzt.Name = "txt_gdzt";
            this.txt_gdzt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_gdzt.Properties.Appearance.Options.UseFont = true;
            this.txt_gdzt.Size = new System.Drawing.Size(170, 28);
            this.txt_gdzt.Size = new System.Drawing.Size(165, 28);
            this.txt_gdzt.StyleController = this.layoutMx1;
            this.txt_gdzt.TabIndex = 455;
            // 
            // txt_caa011
            // 
            this.txt_caa011.Location = new System.Drawing.Point(942, 44);
            this.txt_caa011.Location = new System.Drawing.Point(927, 44);
            this.txt_caa011.Name = "txt_caa011";
            this.txt_caa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa011.Properties.Appearance.Options.UseFont = true;
            this.txt_caa011.Size = new System.Drawing.Size(172, 28);
            this.txt_caa011.Size = new System.Drawing.Size(166, 28);
            this.txt_caa011.StyleController = this.layoutMx1;
            this.txt_caa011.TabIndex = 228;
            // 
@@ -1090,7 +1074,7 @@
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(170, 28);
            this.txt_itemNo.Size = new System.Drawing.Size(165, 28);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 219;
            // 
@@ -1100,35 +1084,35 @@
            this.txt_saleOrderNo.Name = "txt_saleOrderNo";
            this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
            this.txt_saleOrderNo.Size = new System.Drawing.Size(170, 28);
            this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 28);
            this.txt_saleOrderNo.StyleController = this.layoutMx1;
            this.txt_saleOrderNo.TabIndex = 450;
            // 
            // txt_dwName
            // 
            this.txt_dwName.Location = new System.Drawing.Point(390, 76);
            this.txt_dwName.Location = new System.Drawing.Point(385, 76);
            this.txt_dwName.Name = "txt_dwName";
            this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_dwName.Properties.Appearance.Options.UseFont = true;
            this.txt_dwName.Size = new System.Drawing.Size(170, 28);
            this.txt_dwName.Size = new System.Drawing.Size(165, 28);
            this.txt_dwName.StyleController = this.layoutMx1;
            this.txt_dwName.TabIndex = 222;
            // 
            // txt_caa005
            // 
            this.txt_caa005.Location = new System.Drawing.Point(942, 76);
            this.txt_caa005.Location = new System.Drawing.Point(927, 76);
            this.txt_caa005.Name = "txt_caa005";
            this.txt_caa005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa005.Properties.Appearance.Options.UseFont = true;
            this.txt_caa005.Size = new System.Drawing.Size(172, 28);
            this.txt_caa005.Size = new System.Drawing.Size(166, 28);
            this.txt_caa005.StyleController = this.layoutMx1;
            this.txt_caa005.TabIndex = 217;
            // 
            // txt_srcBillNo
            // 
            this.txt_srcBillNo.Location = new System.Drawing.Point(666, 108);
            this.txt_srcBillNo.Location = new System.Drawing.Point(656, 108);
            this.txt_srcBillNo.Name = "txt_srcBillNo";
            this.txt_srcBillNo.Size = new System.Drawing.Size(170, 24);
            this.txt_srcBillNo.Size = new System.Drawing.Size(165, 24);
            this.txt_srcBillNo.StyleController = this.layoutMx1;
            this.txt_srcBillNo.TabIndex = 467;
            // 
@@ -1199,7 +1183,7 @@
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1126, 180);
            this.Root.Size = new System.Drawing.Size(1105, 180);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -1207,37 +1191,37 @@
            this.layoutControlItem1.Control = this.txt_caa001;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem1.Text = "投料单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_caa012;
            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem2.Text = "工单数量";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_dptName;
            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem3.Text = "生产车间";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_caa010;
            this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem4.Text = "预计开工时间";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1247,40 +1231,40 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem5.Text = "任务单号";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_caa024;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 32);
            this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem6.Text = "入库数量";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_gdzt;
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 32);
            this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem7.Text = "工单状态";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_caa011;
            this.layoutControlItem8.Location = new System.Drawing.Point(828, 32);
            this.layoutControlItem8.Location = new System.Drawing.Point(813, 32);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem8.Text = "预计完工时间";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1290,40 +1274,40 @@
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem9.Text = "需求单号";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_dwName;
            this.layoutControlItem10.Location = new System.Drawing.Point(276, 64);
            this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem10.Text = "单位";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_djlx;
            this.layoutControlItem11.Location = new System.Drawing.Point(552, 64);
            this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem11.Text = "单据类型";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_caa005;
            this.layoutControlItem12.Location = new System.Drawing.Point(828, 64);
            this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem12.Text = "计划下达时间";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1333,29 +1317,29 @@
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem13.Text = "产品编码";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_itemName;
            this.layoutControlItem14.Location = new System.Drawing.Point(276, 96);
            this.layoutControlItem14.Location = new System.Drawing.Point(271, 96);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem14.Text = "产品名称";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_scOrg;
            this.layoutControlItem16.Location = new System.Drawing.Point(828, 96);
            this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem16.Text = "生产组织";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1366,40 +1350,40 @@
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem17.Size = new System.Drawing.Size(552, 32);
            this.layoutControlItem17.Size = new System.Drawing.Size(542, 32);
            this.layoutControlItem17.Text = "备注";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_wtOrg;
            this.layoutControlItem18.Location = new System.Drawing.Point(828, 128);
            this.layoutControlItem18.Location = new System.Drawing.Point(813, 128);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem18.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem18.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem18.Text = "委托组织";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem20
            // 
            this.layoutControlItem20.Control = this.txt_srcBillNo;
            this.layoutControlItem20.Location = new System.Drawing.Point(552, 96);
            this.layoutControlItem20.Location = new System.Drawing.Point(542, 96);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem20.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem20.Text = "源单类型";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_itemModel;
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 128);
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 128);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem15.Text = "产品规格";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1857,7 +1841,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa024;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa010;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa011;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
        private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrderNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrderEntryseq;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -1866,7 +1849,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa016;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa005;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -38,7 +38,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -59,7 +59,7 @@
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -346,6 +346,7 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    else
                    {
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,18 +29,18 @@
        /// </summary>
        private void InitializeComponent()
        {
            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 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.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();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -121,10 +121,10 @@
            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -179,6 +179,7 @@
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.defaultActions = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -531,6 +532,7 @@
            this.txt_fstatus.Size = new System.Drawing.Size(268, 24);
            this.txt_fstatus.StyleController = this.layoutMx1;
            this.txt_fstatus.TabIndex = 461;
            this.txt_fstatus.Tag = "readonly";
            // 
            // layoutControlItem9
            // 
@@ -559,29 +561,29 @@
            this.layoutControlItem8});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            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(1105, 116);
            this.Root.TextVisible = false;
            // 
@@ -720,8 +722,8 @@
            this.gvMx1daa005,
            this.gvMx1daa003,
            this.gvMx1daa004,
            this.gvMx1daa018,
            this.gvMx1daa016,
            this.gvMx1daa018,
            this.gvMx1daa008,
            this.gvMx1daa006,
            this.gvMx1daa007,
@@ -859,7 +861,7 @@
            this.gvMx1daa018.Name = "gvMx1daa018";
            this.gvMx1daa018.Tag = "edit";
            this.gvMx1daa018.Visible = true;
            this.gvMx1daa018.VisibleIndex = 5;
            this.gvMx1daa018.VisibleIndex = 6;
            this.gvMx1daa018.Width = 50;
            // 
            // repositoryItemDateEdit3
@@ -886,7 +888,7 @@
            this.gvMx1daa016.Name = "gvMx1daa016";
            this.gvMx1daa016.Tag = "edit";
            this.gvMx1daa016.Visible = true;
            this.gvMx1daa016.VisibleIndex = 6;
            this.gvMx1daa016.VisibleIndex = 5;
            this.gvMx1daa016.Width = 78;
            // 
            // repositoryItemDateEdit2
@@ -1236,6 +1238,16 @@
            this.gvMx1fstatus.VisibleIndex = 15;
            this.gvMx1fstatus.Width = 76;
            // 
            // gridColumn6
            //
            this.gridColumn6.Caption = "次序";
            this.gridColumn6.FieldName = "scheduleOrder";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 16;
            this.gridColumn6.Width = 94;
            //
            // gvMxDel
            // 
            this.gvMxDel.Caption = "移出";
@@ -1249,10 +1261,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -1267,16 +1279,6 @@
            this.picCheckBox.TabIndex = 7;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "次序";
            this.gridColumn6.FieldName = "scheduleOrder";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 16;
            this.gridColumn6.Width = 94;
            // 
            // Frm_Wompba
            // 
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -105,7 +105,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
DevApp/Gs.DevApp/DevFrm/XtraForm2.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,101 @@
namespace Gs.DevApp.DevFrm
{
    partial class XtraForm2
    {
        /// <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.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            this.SuspendLayout();
            //
            // panelControl1
            //
            this.panelControl1.Controls.Add(this.labelControl1);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panelControl1.Location = new System.Drawing.Point(0, 0);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(1046, 77);
            this.panelControl1.TabIndex = 0;
            //
            // labelControl1
            //
            this.labelControl1.Location = new System.Drawing.Point(138, 54);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(30, 18);
            this.labelControl1.TabIndex = 0;
            this.labelControl1.Text = "你好";
            //
            // gcMain1
            //
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.gcMain1.Location = new System.Drawing.Point(0, 123);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1046, 531);
            this.gcMain1.TabIndex = 1;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsView.RowAutoHeight = true;
            //
            // XtraForm2
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1046, 654);
            this.Controls.Add(this.gcMain1);
            this.Controls.Add(this.panelControl1);
            this.Name = "XtraForm2";
            this.Text = "XtraForm2";
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.panelControl1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
    }
}
DevApp/Gs.DevApp/DevFrm/XtraForm2.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
    public partial class XtraForm2 : DevExpress.XtraEditors.XtraForm
    {
        private readonly string _webServiceName = "MesItemsManager/";
        public XtraForm2()
        {
            InitializeComponent();
            getPageList(1);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var pgq = new PageQueryModel(curPage,999999, "doc_Code");
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    "DocNoRule/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain1.BindingContext = new BindingContext();
                    if (dt.Rows.Count > 0)
                    {
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/XtraForm2.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -821,6 +821,12 @@
    <Compile Include="DevFrm\WW\WwBlclDj.Designer.cs">
      <DependentUpon>WwBlclDj.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\XtraForm2.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\XtraForm2.Designer.cs">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </Compile>
    <Compile Include="Entity\LoginInfoModel.cs" />
    <Compile Include="Entity\PageQueryModel.cs" />
    <Compile Include="Entity\ReturnModel.cs" />
@@ -1403,6 +1409,9 @@
    <EmbeddedResource Include="DevFrm\WW\WwBlclDj.resx">
      <DependentUpon>WwBlclDj.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\XtraForm2.resx">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\licenses.licx" />
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
@@ -1758,6 +1767,7 @@
    <None Include="Resources\lookup&amp;reference_16x163.png" />
    <None Include="Resources\replace_32x32.png" />
    <None Include="Resources\replace_16x161.png" />
    <None Include="Resources\announcement_32x32.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
DevApp/Gs.DevApp/Program.cs
@@ -5,6 +5,7 @@
using CefSharp.WinForms;
using CefSharp;
using Gs.DevApp.DevFrm;
using DevExpress.XtraEditors;
namespace Gs.DevApp
{
@@ -40,6 +41,14 @@
        {
            //Application.Run(RibbonForm1());
            //return;
            #region è®¾ç½®é»˜è®¤å­—体、日期格式、汉化dev
            //DevExpress.Utils.AppearanceObject.DefaultFont = new System.Drawing.Font("宋体", 10);
            //DevExpress.XtraEditors.WindowsFormsSettings.DefaultFont = new System.Drawing.Font("宋体", 10);
            //DevExpress.XtraEditors.WindowsFormsSettings.DefaultMenuFont = new System.Drawing.Font("宋体", 10);
            //DevExpress.XtraEditors.WindowsFormsSettings.DefaultPrintFont = new System.Drawing.Font("宋体", 10);
            #endregion
            CefSettings settings = new CefSettings();
            settings.Locale = "zh-CN";
            Cef.Initialize(settings);
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -183,6 +183,16 @@
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„æœ¬åœ°åŒ–资源。
        /// </summary>
        internal static System.Drawing.Bitmap announcement_32x32 {
            get {
                object obj = ResourceManager.GetObject("announcement_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„æœ¬åœ°åŒ–资源。
        /// </summary>
        internal static System.Drawing.Bitmap apply_32x32 {
            get {
                object obj = ResourceManager.GetObject("apply_32x32", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,13 +124,8 @@
  <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -146,8 +141,8 @@
  <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -156,11 +151,6 @@
  </data>
  <data name="lookup&amp;reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -223,6 +213,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -239,6 +232,9 @@
  </data>
  <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -292,10 +288,8 @@
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -322,13 +316,14 @@
    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
@@ -338,16 +333,11 @@
  <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -355,10 +345,8 @@
  <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -517,13 +505,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -554,14 +542,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -600,6 +585,11 @@
  <data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -607,6 +597,9 @@
    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -650,9 +643,6 @@
  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -667,19 +657,17 @@
  <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -746,8 +734,8 @@
  <data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -794,13 +782,16 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -819,8 +810,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
@@ -847,8 +840,10 @@
  <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -860,8 +855,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -869,16 +866,18 @@
  <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -907,19 +906,19 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -940,13 +939,15 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -957,16 +958,18 @@
  <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -976,7 +979,7 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="announcement_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\announcement_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/announcement_32x32.png
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -36,7 +36,7 @@
            {
            });
            getPageList(1, UtilityHelper.GetPageSize());
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
@@ -53,7 +53,7 @@
            };
            radioGroup1.SelectedIndexChanged += (s, e) =>
            {
                getPageList(1, UtilityHelper.GetPageSize());
                getPageList(1);
            };
        }
@@ -69,19 +69,19 @@
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage, pageSize);
            getPageList(curPage);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            var _obj = new
            {
                currentPage = curPage,
                everyPageSize = pageSize,
                everyPageSize = this.pageBar1.RowsCount,
                sortName = "",
                keyWhere = "",
                inBusType = (radioGroup1.SelectedIndex+1),//1是采购,2是委外
DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
@@ -29,12 +29,8 @@
        private void InitializeComponent()
        {
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -51,55 +47,25 @@
            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            this.SuspendLayout();
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
            this.pageBar1.Location = new System.Drawing.Point(59, 2);
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
            this.pageBar1.Location = new System.Drawing.Point(2, 2);
            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(984, 39);
            this.pageBar1.Size = new System.Drawing.Size(943, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            //
            // panelControl1
            //
            this.panelControl1.Controls.Add(this.btnIn);
            this.panelControl1.Controls.Add(this.pageBar1);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panelControl1.Location = new System.Drawing.Point(0, 485);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(1045, 43);
            this.panelControl1.TabIndex = 4;
            //
            // btnIn
            //
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
            this.btnIn.Location = new System.Drawing.Point(2, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.panelControl1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1045, 528);
            this.xtraTabPage1.Text = "请选择采需要排的数据";
            // 
            // gcMain
            // 
@@ -108,7 +74,7 @@
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1045, 485);
            this.gcMain.Size = new System.Drawing.Size(1047, 517);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -121,7 +87,6 @@
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_chk,
            this.gv_guid,
            this.gv_remarks,
            this.gridColumn4,
@@ -142,23 +107,10 @@
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsSelection.MultiSelect = true;
            this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_chk
            //
            this.gv_chk.AppearanceCell.ForeColor = System.Drawing.Color.Black;
            this.gv_chk.AppearanceCell.Options.UseForeColor = true;
            this.gv_chk.AppearanceHeader.ForeColor = System.Drawing.Color.Black;
            this.gv_chk.AppearanceHeader.Options.UseForeColor = true;
            this.gv_chk.Caption = "选择";
            this.gv_chk.FieldName = "gvChk";
            this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_chk.MinWidth = 60;
            this.gv_chk.Name = "gv_chk";
            this.gv_chk.Visible = true;
            this.gv_chk.VisibleIndex = 0;
            this.gv_chk.Width = 94;
            // 
            // gv_guid
            // 
@@ -367,37 +319,48 @@
            this.gridColumn1.VisibleIndex = 15;
            this.gridColumn1.Width = 94;
            // 
            // xtraTabControl1
            // panelControl1
            // 
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1047, 560);
            this.xtraTabControl1.TabIndex = 4;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1});
            this.panelControl1.Controls.Add(this.btnIn);
            this.panelControl1.Controls.Add(this.pageBar1);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panelControl1.Location = new System.Drawing.Point(0, 517);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(1047, 43);
            this.panelControl1.TabIndex = 5;
            //
            // btnIn
            //
            this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            this.btnIn.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnIn.Appearance.Options.UseBackColor = true;
            this.btnIn.Appearance.Options.UseFont = true;
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
            this.btnIn.Location = new System.Drawing.Point(951, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            // 
            // SelectWompba
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1047, 560);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.gcMain);
            this.Controls.Add(this.panelControl1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "SelectWompba";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择生产任务单";
            this.Text = "选择生产任务单,只显示下达,用料清单已审核的";
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.ResumeLayout(false);
        }
@@ -405,12 +368,8 @@
        #endregion
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -425,8 +384,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
    }
}
DevApp/Gs.DevApp/UserControl/SelectWompba.cs
@@ -3,6 +3,7 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -18,7 +19,7 @@
            InitializeComponent();
            this.workId = _workId;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getPageList(1, UtilityHelper.GetPageSize());
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
             
@@ -26,15 +27,12 @@
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
                for (var i = 0; i < gridView1.DataRowCount; i++)
                int[] rows = this.gridView1.GetSelectedRows();//先获取选择行的行号
                DataTable dt = this.gcMain.DataSource as DataTable;//得到GridControl的数据源
                foreach (int idx in rows)
                {
                    var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
                    if (checkBox == "Checked")
                    {
                        var _guid = gridView1.GetRowCellValue(i, "guid")
                            .ToString();
                        list.Add(_guid);
                    }
                    string _guid = dt.Rows[idx]["guid"].ToString();
                    list.Add(_guid);
                }
                UpdateParent?.Invoke(this,
                    new UpdateParentEventArgs { StringList = list });
@@ -54,19 +52,19 @@
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage, pageSize);
            getPageList(curPage);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            var _obj = new
            {
                currentPage = curPage,
                everyPageSize = pageSize,
                everyPageSize = this.pageBar1.RowsCount,
                sortName = "",
                keyWhere = "",
                workId = this.workId
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -29,21 +29,21 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions14 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject53 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject54 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject55 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject56 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions15 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject57 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject58 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject59 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject60 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions13 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject49 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject50 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject51 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject52 = new DevExpress.Utils.SerializableAppearanceObject();
            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.panel1 = new System.Windows.Forms.Panel();
            this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
            this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
@@ -269,10 +269,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions14.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions14.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, editorButtonImageOptions14, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject53, serializableAppearanceObject54, serializableAppearanceObject55, serializableAppearanceObject56, "", 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);
@@ -349,7 +349,7 @@
            // 
            this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
            this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo, "请选择", -1, true, true, false, editorButtonImageOptions15, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject57, serializableAppearanceObject58, serializableAppearanceObject59, serializableAppearanceObject60, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo, "请选择", -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.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
            this.repositoryItemSearchLookUpEdit1.NullText = "请选择";
            this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View;
@@ -428,10 +428,10 @@
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions13.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions13.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.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, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "", 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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -399,8 +399,7 @@
            // 
            this.btnTzbl.Caption = "通知备料";
            this.btnTzbl.Id = 41;
            this.btnTzbl.ImageOptions.ImageUri.Uri = "business%20objects/bo_security_permission_object";
            this.btnTzbl.ImageOptions.SvgImage = global::Gs.DevApp.Properties.Resources.time;
            this.btnTzbl.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.announcement_32x32;
            this.btnTzbl.Name = "btnTzbl";
            this.btnTzbl.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            this.btnTzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -487,7 +486,7 @@
            // 
            this.barDockControlBottom.CausesValidation = false;
            this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 67);
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 63);
            this.barDockControlBottom.Manager = this.barManager1;
            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
            // 
@@ -516,7 +515,7 @@
            this.Controls.Add(this.barDockControlBottom);
            this.Controls.Add(this.barDockControlTop);
            this.Name = "UcToolBarMenu";
            this.Size = new System.Drawing.Size(1543, 67);
            this.Size = new System.Drawing.Size(1543, 63);
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();
DevApp/Gs.DevApp/XtraForm1.Designer.cs
@@ -33,10 +33,10 @@
            // 
            // simpleButton1
            // 
            this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.stackedsplinearea_32x32;
            this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.announcement_32x32;
            this.simpleButton1.Location = new System.Drawing.Point(343, 110);
            this.simpleButton1.Name = "simpleButton1";
            this.simpleButton1.Size = new System.Drawing.Size(94, 29);
            this.simpleButton1.Size = new System.Drawing.Size(247, 29);
            this.simpleButton1.TabIndex = 0;
            this.simpleButton1.Text = "simpleButton1";
            //