From ba29df0e68f9997670bfe62f8bbe3a76dec8bcfb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 09:47:57 +0800
Subject: [PATCH] iqc

---
 DevApp/Gs.DevApp/Properties/Resources.Designer.cs             |   10 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs          |  120 +++++-----
 DevApp/Gs.DevApp/Gs.DevApp.csproj                             |    1 
 DevApp/Gs.DevApp/App.config                                   |    4 
 DevApp/Gs.DevApp/Properties/Resources.resx                    |  223 +++++++++---------
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs |  335 ++++++++++++---------------
 DevApp/Gs.DevApp/Resources/snapmodifytablecellstyle_32x32.png |    0 
 7 files changed, 334 insertions(+), 359 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 673f1fc..729ea9d 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
 		</assemblyBinding>
 	</runtime>
     <appSettings>
-		 <add key="WebApiUrl" value="http://localhost:5263/" />
-		<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
+		 <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+		<add key="WebApiUrl" value="http://192.168.1.145:81/" /> 
         <add key="LogPath" value="logs" />
         <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
         <add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 006260e..055f7a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -67,19 +67,18 @@
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -203,6 +202,7 @@
             this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -374,7 +374,6 @@
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
@@ -387,27 +386,26 @@
             // 
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
             this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn13,
             this.gv_fsubmit,
             this.gv_lotNo,
-            this.gv_lifnr,
+            this.gv_fcheckResu,
             this.gv_releaseNo,
+            this.gv_lifnr,
             this.gv_itemId,
             this.gv_itemNo,
             this.gv_boardStyle,
             this.gridColumn14,
             this.gv_fbatchQty,
-            this.gv_fcheckResu,
             this.gv_fcovertQty,
             this.gv_remarks,
             this.gv_fcheckBy,
             this.gv_fcheckDate,
-            this.gv_checkQty,
             this.gv_createBy,
             this.gridColumn15,
             this.gv_lastupdateBy,
@@ -417,7 +415,8 @@
             this.gridColumn18,
             this.gridColumn19,
             this.gridColumn17,
-            this.gridColumn23});
+            this.gridColumn23,
+            this.gridColumn30});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -429,7 +428,8 @@
             // 
             this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
             this.gridColumn13.FieldName = "urgentLagTxt";
-            this.gridColumn13.MinWidth = 30;
+            this.gridColumn13.MaxWidth = 50;
+            this.gridColumn13.MinWidth = 10;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.OptionsColumn.ReadOnly = true;
             this.gridColumn13.Tag = "query_a.fsubmit";
@@ -440,11 +440,11 @@
             // 
             // gv_fsubmit
             // 
-         
             this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
             this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑";
             this.gv_fsubmit.FieldName = "fsubmitTxt";
-            this.gv_fsubmit.MinWidth = 30;
+            this.gv_fsubmit.MaxWidth = 50;
+            this.gv_fsubmit.MinWidth = 10;
             this.gv_fsubmit.Name = "gv_fsubmit";
             this.gv_fsubmit.OptionsColumn.AllowEdit = false;
             this.gv_fsubmit.Tag = "query_a.fsubmit";
@@ -455,7 +455,6 @@
             // 
             // gv_lotNo
             // 
-         
             this.gv_lotNo.AppearanceCell.Options.UseFont = true;
             this.gv_lotNo.Caption = "閫佹鎵规";
             this.gv_lotNo.FieldName = "lotNo";
@@ -467,23 +466,21 @@
             this.gv_lotNo.VisibleIndex = 2;
             this.gv_lotNo.Width = 120;
             // 
-            // gv_lifnr
+            // gv_fcheckResu
             // 
-          
-            this.gv_lifnr.AppearanceCell.Options.UseFont = true;
-            this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
-            this.gv_lifnr.FieldName = "suppName";
-            this.gv_lifnr.MinWidth = 30;
-            this.gv_lifnr.Name = "gv_lifnr";
-            this.gv_lifnr.OptionsColumn.AllowEdit = false;
-            this.gv_lifnr.Tag = "query_a.lifnr";
-            this.gv_lifnr.Visible = true;
-            this.gv_lifnr.VisibleIndex = 3;
-            this.gv_lifnr.Width = 200;
+            this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
+            this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
+            this.gv_fcheckResu.FieldName = "fcheckResu";
+            this.gv_fcheckResu.MinWidth = 30;
+            this.gv_fcheckResu.Name = "gv_fcheckResu";
+            this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
+            this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
+            this.gv_fcheckResu.Visible = true;
+            this.gv_fcheckResu.VisibleIndex = 3;
+            this.gv_fcheckResu.Width = 50;
             // 
             // gv_releaseNo
             // 
-           
             this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
             this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
             this.gv_releaseNo.FieldName = "releaseNo";
@@ -495,9 +492,21 @@
             this.gv_releaseNo.VisibleIndex = 4;
             this.gv_releaseNo.Width = 100;
             // 
+            // gv_lifnr
+            // 
+            this.gv_lifnr.AppearanceCell.Options.UseFont = true;
+            this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
+            this.gv_lifnr.FieldName = "suppName";
+            this.gv_lifnr.MinWidth = 30;
+            this.gv_lifnr.Name = "gv_lifnr";
+            this.gv_lifnr.OptionsColumn.AllowEdit = false;
+            this.gv_lifnr.Tag = "query_a.lifnr";
+            this.gv_lifnr.Visible = true;
+            this.gv_lifnr.VisibleIndex = 5;
+            this.gv_lifnr.Width = 200;
+            // 
             // gv_itemId
             // 
-            
             this.gv_itemId.AppearanceCell.Options.UseFont = true;
             this.gv_itemId.Caption = "鐗╂枡ID";
             this.gv_itemId.FieldName = "itemId";
@@ -506,26 +515,24 @@
             this.gv_itemId.OptionsColumn.AllowEdit = false;
             this.gv_itemId.Tag = "query_a.item_id";
             this.gv_itemId.Visible = true;
-            this.gv_itemId.VisibleIndex = 5;
+            this.gv_itemId.VisibleIndex = 6;
             this.gv_itemId.Width = 30;
             // 
             // gv_itemNo
             // 
-            
             this.gv_itemNo.AppearanceCell.Options.UseFont = true;
             this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
-            this.gv_itemNo.FieldName = "itemNo2";
+            this.gv_itemNo.FieldName = "itemNo";
             this.gv_itemNo.MinWidth = 30;
             this.gv_itemNo.Name = "gv_itemNo";
             this.gv_itemNo.OptionsColumn.AllowEdit = false;
             this.gv_itemNo.Tag = "query_a.item_no";
             this.gv_itemNo.Visible = true;
-            this.gv_itemNo.VisibleIndex = 6;
+            this.gv_itemNo.VisibleIndex = 7;
             this.gv_itemNo.Width = 136;
             // 
             // gv_boardStyle
             // 
-          
             this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
             this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
             this.gv_boardStyle.FieldName = "itemName";
@@ -534,7 +541,7 @@
             this.gv_boardStyle.OptionsColumn.AllowEdit = false;
             this.gv_boardStyle.Tag = "query_a.board_style";
             this.gv_boardStyle.Visible = true;
-            this.gv_boardStyle.VisibleIndex = 7;
+            this.gv_boardStyle.VisibleIndex = 8;
             this.gv_boardStyle.Width = 164;
             // 
             // gridColumn14
@@ -545,40 +552,24 @@
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.OptionsColumn.ReadOnly = true;
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 8;
+            this.gridColumn14.VisibleIndex = 9;
             this.gridColumn14.Width = 200;
             // 
             // gv_fbatchQty
             // 
-           
             this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
-            this.gv_fbatchQty.Caption = "閲囪喘鏁伴噺";
+            this.gv_fbatchQty.Caption = "鍒拌揣鏁伴噺";
             this.gv_fbatchQty.FieldName = "fbatchQty";
             this.gv_fbatchQty.MinWidth = 30;
             this.gv_fbatchQty.Name = "gv_fbatchQty";
             this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
             this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
             this.gv_fbatchQty.Visible = true;
-            this.gv_fbatchQty.VisibleIndex = 9;
+            this.gv_fbatchQty.VisibleIndex = 10;
             this.gv_fbatchQty.Width = 80;
-            // 
-            // gv_fcheckResu
-            // 
-         
-            this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
-            this.gv_fcheckResu.FieldName = "fcheckResu";
-            this.gv_fcheckResu.MinWidth = 30;
-            this.gv_fcheckResu.Name = "gv_fcheckResu";
-            this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
-            this.gv_fcheckResu.Visible = true;
-            this.gv_fcheckResu.VisibleIndex = 10;
-            this.gv_fcheckResu.Width = 50;
             // 
             // gv_fcovertQty
             // 
-           
             this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
             this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
             this.gv_fcovertQty.FieldName = "fcovertQty";
@@ -593,7 +584,6 @@
             // 
             // gv_remarks
             // 
-           
             this.gv_remarks.AppearanceCell.Options.UseFont = true;
             this.gv_remarks.Caption = "澶囨敞璇存槑";
             this.gv_remarks.FieldName = "remarks";
@@ -607,7 +597,6 @@
             // 
             // gv_fcheckBy
             // 
-            
             this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
             this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
             this.gv_fcheckBy.FieldName = "fcheckBy";
@@ -621,7 +610,6 @@
             // 
             // gv_fcheckDate
             // 
-           
             this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
             this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
             this.gv_fcheckDate.FieldName = "fcheckDate";
@@ -630,26 +618,11 @@
             this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
             this.gv_fcheckDate.Tag = "query_a.fcheck_date";
             this.gv_fcheckDate.Visible = true;
-            this.gv_fcheckDate.VisibleIndex = 15;
+            this.gv_fcheckDate.VisibleIndex = 14;
             this.gv_fcheckDate.Width = 182;
-            // 
-            // gv_checkQty
-            // 
-           
-            this.gv_checkQty.AppearanceCell.Options.UseFont = true;
-            this.gv_checkQty.Caption = "鎶芥鏁伴噺";
-            this.gv_checkQty.FieldName = "checkQty";
-            this.gv_checkQty.MinWidth = 30;
-            this.gv_checkQty.Name = "gv_checkQty";
-            this.gv_checkQty.OptionsColumn.AllowEdit = false;
-            this.gv_checkQty.Tag = "query_a.check_qty";
-            this.gv_checkQty.Visible = true;
-            this.gv_checkQty.VisibleIndex = 16;
-            this.gv_checkQty.Width = 50;
             // 
             // gv_createBy
             // 
-            
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜�";
             this.gv_createBy.FieldName = "createBy";
@@ -658,7 +631,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 14;
+            this.gv_createBy.VisibleIndex = 15;
             this.gv_createBy.Width = 67;
             // 
             // gridColumn15
@@ -668,49 +641,46 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 17;
+            this.gridColumn15.VisibleIndex = 16;
             this.gridColumn15.Width = 94;
             // 
             // gv_lastupdateBy
             // 
-           
             this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
+            this.gv_lastupdateBy.Caption = "鏇存柊浜�";
             this.gv_lastupdateBy.FieldName = "lastupdateBy";
             this.gv_lastupdateBy.MinWidth = 30;
             this.gv_lastupdateBy.Name = "gv_lastupdateBy";
             this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
             this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 18;
+            this.gv_lastupdateBy.VisibleIndex = 17;
             this.gv_lastupdateBy.Width = 60;
             // 
             // gv_lastupdateDate
             // 
-            
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�";
+            this.gv_lastupdateDate.Caption = "鏇存柊鏃ユ湡";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
             this.gv_lastupdateDate.MinWidth = 30;
             this.gv_lastupdateDate.Name = "gv_lastupdateDate";
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
             this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 19;
+            this.gv_lastupdateDate.VisibleIndex = 18;
             this.gv_lastupdateDate.Width = 120;
             // 
             // gv_fngHandle
             // 
-           
             this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
             this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
             this.gv_fngHandle.FieldName = "fngHandle";
-            this.gv_fngHandle.MinWidth = 30;
+            this.gv_fngHandle.MinWidth = 10;
             this.gv_fngHandle.Name = "gv_fngHandle";
             this.gv_fngHandle.OptionsColumn.AllowEdit = false;
             this.gv_fngHandle.Tag = "query_a.fng_handle";
             this.gv_fngHandle.Visible = true;
-            this.gv_fngHandle.VisibleIndex = 20;
+            this.gv_fngHandle.VisibleIndex = 19;
             this.gv_fngHandle.Width = 100;
             // 
             // bandedGridColumn1
@@ -721,7 +691,7 @@
             this.bandedGridColumn1.Name = "bandedGridColumn1";
             this.bandedGridColumn1.Tag = "org.fnamber";
             this.bandedGridColumn1.Visible = true;
-            this.bandedGridColumn1.VisibleIndex = 21;
+            this.bandedGridColumn1.VisibleIndex = 20;
             this.bandedGridColumn1.Width = 250;
             // 
             // gridColumn18
@@ -731,7 +701,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 22;
+            this.gridColumn18.VisibleIndex = 21;
             this.gridColumn18.Width = 94;
             // 
             // gridColumn19
@@ -741,7 +711,7 @@
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 23;
+            this.gridColumn19.VisibleIndex = 22;
             this.gridColumn19.Width = 94;
             // 
             // gridColumn17
@@ -759,7 +729,7 @@
             this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 24;
+            this.gridColumn23.VisibleIndex = 23;
             this.gridColumn23.Width = 94;
             // 
             // pageBar1
@@ -797,6 +767,7 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
             this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1342, 688);
             this.splitMx1.SplitterPosition = 141;
             this.splitMx1.TabIndex = 0;
@@ -846,39 +817,37 @@
             // txt_suppName
             // 
             this.txt_suppName.Enabled = false;
-            this.txt_suppName.Location = new System.Drawing.Point(734, 76);
+            this.txt_suppName.Location = new System.Drawing.Point(744, 72);
             this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Size = new System.Drawing.Size(249, 24);
+            this.txt_suppName.Size = new System.Drawing.Size(254, 24);
             this.txt_suppName.StyleController = this.layoutMx1;
             this.txt_suppName.TabIndex = 801;
             this.txt_suppName.Tag = "readonly";
             // 
             // txt_remarks
             // 
-            this.txt_remarks.Location = new System.Drawing.Point(409, 108);
+            this.txt_remarks.Location = new System.Drawing.Point(414, 102);
             this.txt_remarks.Name = "txt_remarks";
-           
             this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(574, 28);
+            this.txt_remarks.Size = new System.Drawing.Size(584, 24);
             this.txt_remarks.StyleController = this.layoutMx1;
             this.txt_remarks.TabIndex = 797;
             // 
             // txt_fcheckResu
             // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(409, 76);
+            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 72);
             this.txt_fcheckResu.Name = "txt_fcheckResu";
-            this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
+            this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckResu.StyleController = this.layoutMx1;
             this.txt_fcheckResu.TabIndex = 798;
             this.txt_fcheckResu.Tag = "readonly";
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(84, 44);
+            this.txt_itemName.Location = new System.Drawing.Point(84, 42);
             this.txt_itemName.Name = "txt_itemName";
-          
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(249, 28);
+            this.txt_itemName.Size = new System.Drawing.Size(254, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 800;
             this.txt_itemName.Tag = "readonly";
@@ -887,51 +856,47 @@
             // 
             this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
             this.txt_releaseNo.Name = "txt_releaseNo";
-           
             this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_releaseNo.Size = new System.Drawing.Size(249, 28);
+            this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
             this.txt_releaseNo.StyleController = this.layoutMx1;
             this.txt_releaseNo.TabIndex = 213;
             this.txt_releaseNo.Tag = "readonly";
             // 
             // txt_fcheckDate
             // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(409, 12);
+            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 12);
             this.txt_fcheckDate.Name = "txt_fcheckDate";
-         
             this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckDate.Size = new System.Drawing.Size(249, 28);
+            this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckDate.StyleController = this.layoutMx1;
             this.txt_fcheckDate.TabIndex = 216;
             this.txt_fcheckDate.Tag = "readonly";
             // 
             // txt_lotNo
             // 
-            this.txt_lotNo.Location = new System.Drawing.Point(734, 12);
+            this.txt_lotNo.Location = new System.Drawing.Point(744, 12);
             this.txt_lotNo.Name = "txt_lotNo";
-          
             this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_lotNo.Size = new System.Drawing.Size(249, 28);
+            this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
             this.txt_lotNo.StyleController = this.layoutMx1;
             this.txt_lotNo.TabIndex = 262;
             this.txt_lotNo.Tag = "readonly";
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(84, 76);
+            this.txt_itemNo.Location = new System.Drawing.Point(84, 72);
             this.txt_itemNo.Name = "txt_itemNo";
-            
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(249, 28);
+            this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 789;
             this.txt_itemNo.Tag = "readonly";
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(84, 108);
+            this.txt_itemModel.Location = new System.Drawing.Point(84, 102);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 801;
             this.txt_itemModel.Tag = "readonly";
@@ -947,59 +912,57 @@
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(409, 44);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 42);
             this.txt_fcheckBy.Name = "txt_fcheckBy";
-           
             this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckBy.Size = new System.Drawing.Size(249, 28);
+            this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckBy.StyleController = this.layoutMx1;
             this.txt_fcheckBy.TabIndex = 217;
             this.txt_fcheckBy.Tag = "readonly";
             // 
             // txt_fbatchQty
             // 
-            this.txt_fbatchQty.Location = new System.Drawing.Point(734, 44);
+            this.txt_fbatchQty.Location = new System.Drawing.Point(744, 42);
             this.txt_fbatchQty.Name = "txt_fbatchQty";
-           
             this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbatchQty.Size = new System.Drawing.Size(249, 28);
+            this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
             this.txt_fbatchQty.StyleController = this.layoutMx1;
             this.txt_fbatchQty.TabIndex = 222;
             this.txt_fbatchQty.Tag = "readonly";
             // 
             // txt_fsubmitBy
             // 
-            this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 44);
+            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 42);
             this.txt_fsubmitBy.Name = "txt_fsubmitBy";
-            this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
+            this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
             this.txt_fsubmitBy.StyleController = this.layoutMx1;
             this.txt_fsubmitBy.TabIndex = 804;
             this.txt_fsubmitBy.Tag = "readonly";
             // 
             // txt_fsubmitDate
             // 
-            this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 76);
+            this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 72);
             this.txt_fsubmitDate.Name = "txt_fsubmitDate";
-            this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
+            this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
             this.txt_fsubmitDate.StyleController = this.layoutMx1;
             this.txt_fsubmitDate.TabIndex = 805;
             this.txt_fsubmitDate.Tag = "readonly";
             // 
             // txt_fsubmit
             // 
-            this.txt_fsubmit.Location = new System.Drawing.Point(987, 12);
+            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12);
             this.txt_fsubmit.Name = "txt_fsubmit";
             this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
+            this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
             this.txt_fsubmit.StyleController = this.layoutMx1;
             this.txt_fsubmit.TabIndex = 806;
             this.txt_fsubmit.Tag = "readonly";
             // 
             // txt_slOrg
             // 
-            this.txt_slOrg.Location = new System.Drawing.Point(1059, 108);
+            this.txt_slOrg.Location = new System.Drawing.Point(1074, 102);
             this.txt_slOrg.Name = "txt_slOrg";
-            this.txt_slOrg.Size = new System.Drawing.Size(250, 24);
+            this.txt_slOrg.Size = new System.Drawing.Size(256, 24);
             this.txt_slOrg.StyleController = this.layoutMx1;
             this.txt_slOrg.TabIndex = 807;
             this.txt_slOrg.Tag = "readonly";
@@ -1094,7 +1057,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1321, 148);
+            this.Root.Size = new System.Drawing.Size(1342, 141);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1102,133 +1065,133 @@
             this.layoutControlItem1.Control = this.txt_releaseNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_fcheckDate;
-            this.layoutControlItem2.Location = new System.Drawing.Point(325, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(330, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_lotNo;
-            this.layoutControlItem3.Location = new System.Drawing.Point(650, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem3.Text = "閫佹鎵瑰彿";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_itemName;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 30);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_itemNo;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 60);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 90);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem6.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
             this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_fcheckBy;
-            this.layoutControlItem8.Location = new System.Drawing.Point(325, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(330, 30);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_fbatchQty;
-            this.layoutControlItem9.Location = new System.Drawing.Point(650, 32);
+            this.layoutControlItem9.Location = new System.Drawing.Point(660, 30);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(325, 32);
-            this.layoutControlItem9.Text = "鎵规鏁伴噺";
+            this.layoutControlItem9.Size = new System.Drawing.Size(330, 30);
+            this.layoutControlItem9.Text = "鍒拌揣鏁伴噺";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(325, 64);
+            this.layoutControlItem10.Location = new System.Drawing.Point(330, 60);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_suppName;
-            this.layoutControlItem13.Location = new System.Drawing.Point(650, 64);
+            this.layoutControlItem13.Location = new System.Drawing.Point(660, 60);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem13.Text = "渚涘簲鍟�";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_fsubmitBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(975, 32);
+            this.layoutControlItem15.Location = new System.Drawing.Point(990, 30);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem15.Size = new System.Drawing.Size(332, 30);
             this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_fsubmitDate;
-            this.layoutControlItem16.Location = new System.Drawing.Point(975, 64);
+            this.layoutControlItem16.Location = new System.Drawing.Point(990, 60);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem16.Size = new System.Drawing.Size(332, 30);
             this.layoutControlItem16.Text = "瀹℃牳浜�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_fsubmit;
-            this.layoutControlItem14.Location = new System.Drawing.Point(975, 0);
+            this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(332, 30);
             this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem14.TextVisible = false;
@@ -1236,23 +1199,23 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(325, 96);
+            this.layoutControlItem12.Location = new System.Drawing.Point(330, 90);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(650, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(660, 31);
             this.layoutControlItem12.Text = "澶囨敞璇存槑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_slOrg;
-            this.layoutControlItem18.Location = new System.Drawing.Point(975, 96);
+            this.layoutControlItem18.Location = new System.Drawing.Point(990, 90);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem18.Size = new System.Drawing.Size(332, 31);
             this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1292,8 +1255,9 @@
             // 
             this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
             this.splitMx2.Panel2.Text = "Panel2";
+            this.splitMx2.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx2.Size = new System.Drawing.Size(1340, 457);
-            this.splitMx2.SplitterPosition = 201;
+            this.splitMx2.SplitterPosition = 219;
             this.splitMx2.TabIndex = 3;
             // 
             // gcMx1
@@ -1302,7 +1266,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1340, 201);
+            this.gcMx1.Size = new System.Drawing.Size(1340, 219);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1338,7 +1302,6 @@
             // 
             // gvMx1guid
             // 
-           
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
             this.gvMx1guid.FieldName = "guid";
@@ -1349,7 +1312,6 @@
             // 
             // gvMx1fcheckItem
             // 
-            
             this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
             this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
             this.gvMx1fcheckItem.FieldName = "fcheckItem";
@@ -1362,7 +1324,6 @@
             // 
             // gvMx1fcheckTool
             // 
-            
             this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
             this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
             this.gvMx1fcheckTool.FieldName = "fcheckTool";
@@ -1375,7 +1336,6 @@
             // 
             // gvMx1fcheckItemDesc
             // 
-           
             this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
             this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
             this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
@@ -1388,7 +1348,6 @@
             // 
             // gvMx1fspecRequ
             // 
-            
             this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
             this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
             this.gvMx1fspecRequ.FieldName = "fspecRequ";
@@ -1401,7 +1360,6 @@
             // 
             // gvMx1fupAllow
             // 
-            
             this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
             this.gvMx1fupAllow.Caption = "涓婇檺";
             this.gvMx1fupAllow.FieldName = "fupAllow";
@@ -1414,7 +1372,6 @@
             // 
             // gvMx1fstand
             // 
-            
             this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
             this.gvMx1fstand.Caption = "鏍囧噯鍊�";
             this.gvMx1fstand.FieldName = "fstand";
@@ -1427,7 +1384,6 @@
             // 
             // gvMx1fdownAllow
             // 
-           
             this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
             this.gvMx1fdownAllow.Caption = "涓嬮檺";
             this.gvMx1fdownAllow.FieldName = "fdownAllow";
@@ -1440,7 +1396,6 @@
             // 
             // gvMx1freQty
             // 
-           
             this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1freQty.Caption = "RE鏁伴噺";
             this.gvMx1freQty.FieldName = "freQty";
@@ -1453,7 +1408,6 @@
             // 
             // gvMx1checkQyt
             // 
-           
             this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
             this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
             this.gvMx1checkQyt.FieldName = "checkQyt";
@@ -1466,7 +1420,6 @@
             // 
             // gvMx1fenterQty
             // 
-           
             this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
             this.gvMx1fenterQty.FieldName = "fenterQty";
@@ -1479,7 +1432,6 @@
             // 
             // gvMx1fcheckResu
             // 
-          
             this.gvMx1fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
             this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
             this.gvMx1fcheckResu.AppearanceCell.Options.UseForeColor = true;
@@ -1496,7 +1448,6 @@
             // 
             // gvMx1fngRate
             // 
-           
             this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
             this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
             this.gvMx1fngRate.FieldName = "fngRateName";
@@ -1509,7 +1460,6 @@
             // 
             // gvMx1fngQty
             // 
-            
             this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
             this.gvMx1fngQty.FieldName = "fngQty";
@@ -1522,7 +1472,6 @@
             // 
             // gvMx1sampleSizeNo
             // 
-            
             this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
             this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
@@ -1535,7 +1484,6 @@
             // 
             // gvMx1fcheckLevel
             // 
-           
             this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
             this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
             this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
@@ -1548,7 +1496,6 @@
             // 
             // gvMx1facLevel
             // 
-            
             this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
             this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
             this.gvMx1facLevel.FieldName = "facLevel";
@@ -1574,7 +1521,7 @@
             // 
             this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
             this.splitYangLi.Panel2.Text = "Panel2";
-            this.splitYangLi.Size = new System.Drawing.Size(1340, 244);
+            this.splitYangLi.Size = new System.Drawing.Size(1340, 226);
             this.splitYangLi.SplitterPosition = 676;
             this.splitYangLi.TabIndex = 4;
             // 
@@ -1584,7 +1531,7 @@
             this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupControl1.Location = new System.Drawing.Point(0, 0);
             this.groupControl1.Name = "groupControl1";
-            this.groupControl1.Size = new System.Drawing.Size(676, 244);
+            this.groupControl1.Size = new System.Drawing.Size(676, 226);
             this.groupControl1.TabIndex = 3;
             this.groupControl1.Text = "妫�娴嬬粨鏋�";
             // 
@@ -1594,14 +1541,13 @@
             this.gcMx2.Location = new System.Drawing.Point(2, 28);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(672, 214);
+            this.gcMx2.Size = new System.Drawing.Size(672, 196);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
             // 
             // gvMx2
             // 
-           
             this.gvMx2.Appearance.Row.Options.UseFont = true;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn4,
@@ -1680,7 +1626,7 @@
             this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupControl2.Location = new System.Drawing.Point(0, 0);
             this.groupControl2.Name = "groupControl2";
-            this.groupControl2.Size = new System.Drawing.Size(652, 244);
+            this.groupControl2.Size = new System.Drawing.Size(652, 226);
             this.groupControl2.TabIndex = 4;
             this.groupControl2.Text = "鏍锋湰缁撴灉";
             // 
@@ -1690,14 +1636,13 @@
             this.gcMx3.Location = new System.Drawing.Point(2, 28);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(648, 214);
+            this.gcMx3.Size = new System.Drawing.Size(648, 196);
             this.gcMx3.TabIndex = 0;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
             // 
             // gvMx3
             // 
-          
             this.gvMx3.Appearance.Row.Options.UseFont = true;
             this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn1,
@@ -1806,8 +1751,8 @@
             // 
             // btnIpt
             // 
-            this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.editname_32x321;
-            this.btnIpt.Location = new System.Drawing.Point(1202, 2);
+            this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.snapmodifytablecellstyle_32x32;
+            this.btnIpt.Location = new System.Drawing.Point(1202, 3);
             this.btnIpt.Name = "btnIpt";
             this.btnIpt.Size = new System.Drawing.Size(132, 36);
             this.btnIpt.StyleController = this.layoutControl1;
@@ -1817,7 +1762,7 @@
             // btnLoad
             // 
             this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
-            this.btnLoad.Location = new System.Drawing.Point(838, 2);
+            this.btnLoad.Location = new System.Drawing.Point(838, 3);
             this.btnLoad.Name = "btnLoad";
             this.btnLoad.Size = new System.Drawing.Size(162, 36);
             this.btnLoad.StyleController = this.layoutControl1;
@@ -1826,11 +1771,10 @@
             // 
             // txtJianYan
             // 
-            this.txtJianYan.Location = new System.Drawing.Point(221, 2);
+            this.txtJianYan.Location = new System.Drawing.Point(221, 9);
             this.txtJianYan.Name = "txtJianYan";
-           
             this.txtJianYan.Properties.Appearance.Options.UseFont = true;
-            this.txtJianYan.Size = new System.Drawing.Size(445, 36);
+            this.txtJianYan.Size = new System.Drawing.Size(445, 24);
             this.txtJianYan.StyleController = this.layoutControl1;
             this.txtJianYan.TabIndex = 2;
             // 
@@ -1867,6 +1811,7 @@
             // 
             // layoutControlItem11
             // 
+            this.layoutControlItem11.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             this.layoutControlItem11.Control = this.txtJianYan;
             this.layoutControlItem11.CustomizationFormText = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
             this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
@@ -1879,6 +1824,7 @@
             // layoutControlItem20
             // 
             this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
+            this.layoutControlItem20.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             this.layoutControlItem20.Control = this.btnIpt;
             this.layoutControlItem20.Location = new System.Drawing.Point(1002, 0);
             this.layoutControlItem20.MaxSize = new System.Drawing.Size(136, 40);
@@ -1894,6 +1840,7 @@
             // layoutControlItem19
             // 
             this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
+            this.layoutControlItem19.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             this.layoutControlItem19.Control = this.btnLoad;
             this.layoutControlItem19.Location = new System.Drawing.Point(668, 0);
             this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
@@ -2021,11 +1968,13 @@
             // repositoryItemButtonEdit2
             // 
             this.repositoryItemButtonEdit2.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.show_16x16;
             editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
             // 
             // gridColumn16
             // 
@@ -2046,6 +1995,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
             this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
             // 
             // gridColumn12
             // 
@@ -2066,6 +2016,7 @@
             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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // ucUpFile1
             // 
@@ -2108,6 +2059,16 @@
             // gridView4
             // 
             this.gridView4.Name = "gridView4";
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "鍗曟嵁绫诲瀷";
+            this.gridColumn30.FieldName = "orderType";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 24;
+            this.gridColumn30.Width = 94;
             // 
             // Frm_MesQaItemsDetect01
             // 
@@ -2248,7 +2209,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
@@ -2370,5 +2330,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 34d4fff..5bc3a91 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -48,22 +48,48 @@
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             txtJianYan.KeyDown += TxtJianYan_KeyDown;
-            this.btnLoad.Click += BtnLoad_Click;
             ucUpFile1.UpChanged += UcUpFile1_UpChanged;
             xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
             gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
-            btnIpt.Click += BtnIpt_Click;
-        }
-        /// <summary>
-        /// 鎵归噺褰曞叆
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private void BtnIpt_Click(object sender, EventArgs e)
-        {
-            Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim() );
-            frm.ShowDialog();
+            //閲嶆柊鍔犺浇
+            this.btnLoad.Click += (s, e) =>
+            {
+                if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛焅n\r璇ユ搷浣滃皢浼氭竻绌轰箣鍓嶇殑妫�楠岃褰曪紒"))
+                    return;
+                string strGuid = lbGuid.Text.Trim();
+                if (string.IsNullOrEmpty(strGuid))
+                {
+                    ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                    return;
+                }
+                var _obj = new
+                {
+                    guid = strGuid,
+                };
+                try
+                {
+                    string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
+                    ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            };
+            //鎵归噺褰曞叆
+            btnIpt.Click += (s, e) =>
+            {
+                Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim());
+                frm.ShowDialog();
+            };
         }
 
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -83,43 +109,7 @@
                 getList12(rowGuid);
             }
         }
-        /// <summary>
-        ///  閲嶆柊鍔犺浇妫�楠�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnLoad_Click(object sender, EventArgs e)
-        {
-            if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛岃鎿嶄綔灏嗕細娓呯┖涔嬪墠鐨勬楠岃褰曪紵"))
-                return;
-            string strGuid = lbGuid.Text.Trim();
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            var _obj = new
-            {
-                guid = strGuid,
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    getModel(lbGuid.Text.Trim());
-                }
-                else
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
+       
         /// <summary>
         /// 杈撳叆妫�楠屼簨浠�
         /// </summary>
@@ -204,7 +194,7 @@
             gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
             gridView1.ActiveFilter.Clear();
             gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -253,7 +243,7 @@
                 return;
             if (txt_fcheckResu.Text.Trim() == "涓嶅悎鏍�")
             {
-                if (string.IsNullOrEmpty(txt_remarks.Text.Trim()) )
+                if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
                 {
                     MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
                     return;
@@ -381,6 +371,7 @@
                     lbGuid.Text = _rtn.rtnData;
                     toolBarMenu1.isSetBtn = true;
                     UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+
                 }
             }
             catch (Exception ex)
@@ -397,7 +388,7 @@
         private void getPageList(int curPage)
         {
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            _sbSqlWhere += " and isnull(fsubmit,0)=0";
+          //  _sbSqlWhere += " and isnull(fsubmit,0)=0";
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -431,7 +422,6 @@
             {
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
         private void getModel(string strGuid)
         {
@@ -492,7 +482,6 @@
             {
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
 
 
@@ -503,7 +492,7 @@
         /// <param name="e"></param>
         private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
         {
-            if (e.Page.Name == "xtraTabPage3")
+            if (e.Page.Name == "tabMxPage2")
             {
                 getFileList();
             }
@@ -586,7 +575,11 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-
+        /// <summary>
+        /// 鍒犻櫎涓婁紶
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             var rowhandle = gvMx4.FocusedRowHandle;
@@ -615,7 +608,11 @@
                 }
             }
         }
-
+        /// <summary>
+        /// 鏌ョ湅涓婁紶
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             var rowhandle = gvMx4.FocusedRowHandle;
@@ -634,10 +631,13 @@
                 {
                     Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                 }
-
             }
         }
-
+        /// <summary>
+        /// 涓嬭浇涓婁紶
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             var rowhandle = gvMx4.FocusedRowHandle;
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d3b4972..23efa03 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1818,6 +1818,7 @@
     <None Include="Resources\subreport_32x32.png" />
     <None Include="Resources\subreport_16x16.png" />
     <None Include="Resources\checkbox2_32x324.png" />
+    <None Include="Resources\snapmodifytablecellstyle_32x32.png" />
     <Content Include="Resources\user_16x16.png" />
   </ItemGroup>
   <ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 0f06f53..5a60ca6 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1953,6 +1953,16 @@
         /// <summary>
         ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
         /// </summary>
+        internal static System.Drawing.Bitmap snapmodifytablecellstyle_32x32 {
+            get {
+                object obj = ResourceManager.GetObject("snapmodifytablecellstyle_32x32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
         internal static System.Drawing.Bitmap sortandfilter_16x16 {
             get {
                 object obj = ResourceManager.GetObject("sortandfilter_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 9f5be5b..461892b 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,8 +124,10 @@
   <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="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="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -141,11 +143,26 @@
   <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,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </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="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <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>
@@ -211,8 +228,10 @@
             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="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="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>
@@ -231,17 +250,16 @@
   <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>
   </data>
   <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -249,8 +267,8 @@
   <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
+  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -262,11 +280,6 @@
   </data>
   <data name="radiobuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -286,18 +299,11 @@
   <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="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>
@@ -327,25 +333,22 @@
   <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <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="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="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="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 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="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>
@@ -353,20 +356,30 @@
   <data name="calculatenow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\calculatenow.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</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>
   </data>
   <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lookup&amp;reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lookup&amp;reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -525,13 +538,13 @@
             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,
+  <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="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>
@@ -562,8 +575,8 @@
             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="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="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>
@@ -608,11 +621,6 @@
   <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>
@@ -623,9 +631,6 @@
     <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>
@@ -680,14 +685,14 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="printlayoutview_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\printlayoutview_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <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>
@@ -697,6 +702,11 @@
   </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>
@@ -711,8 +721,10 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <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="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
@@ -772,6 +784,9 @@
   <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="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -812,21 +827,14 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="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>
@@ -840,13 +848,13 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
+  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
@@ -873,10 +881,8 @@
   <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -888,10 +894,8 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data 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="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>
@@ -899,23 +903,16 @@
   <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
-            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,
+  <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="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -944,22 +941,22 @@
             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="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lookup&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="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -977,15 +974,16 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
+  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -999,8 +997,8 @@
   <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="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
+  <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>
@@ -1015,7 +1013,12 @@
   <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="snapmodifytablecellstyle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\snapmodifytablecellstyle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/snapmodifytablecellstyle_32x32.png b/DevApp/Gs.DevApp/Resources/snapmodifytablecellstyle_32x32.png
new file mode 100644
index 0000000..ae7cc67
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/snapmodifytablecellstyle_32x32.png
Binary files differ

--
Gitblit v1.9.3