~tjx/GsMesClient.git

2025-03-17 ca2aef7370cbfa419e3a0f0ea7467fa2c85f6c43

打印

已添加7个文件

已修改18个文件

已删除3个文件

	DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs	231 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs	238 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs	217 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs	333 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs	332 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs	84 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs	165 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs	91 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.resx	120 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Gs.DevApp.csproj	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Program.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Properties/Resources.Designer.cs	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Properties/Resources.resx	202 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Properties/licenses.licx	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Resources/dafualtfax_32x32.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Resources/defaultprinter.svg	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Resources/defaultprinter_32x32.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/Resources/printarea_32x32.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs	169 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs

@@ -83,6 +83,9 @@
            this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit();
            this.lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
            this.lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -92,9 +95,13 @@
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -120,13 +127,6 @@
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -157,6 +157,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -166,9 +169,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -176,13 +183,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -666,6 +666,7 @@
            this.txt_isOut.Size = new System.Drawing.Size(267, 24);
            this.txt_isOut.StyleController = this.layoutMx1;
            this.txt_isOut.TabIndex = 527;
            this.txt_isOut.Tag = "readOnly";
            // 
            // txt_status
            // 
@@ -704,6 +705,37 @@
            this.lastUpdateTime.StyleController = this.layoutMx1;
            this.lastUpdateTime.TabIndex = 531;
            this.lastUpdateTime.Tag = "readonly";
            // 
            // txt_guid
            // 
            this.txt_guid.Location = new System.Drawing.Point(942, 148);
            this.txt_guid.Name = "txt_guid";
            this.txt_guid.Size = new System.Drawing.Size(172, 24);
            this.txt_guid.StyleController = this.layoutMx1;
            this.txt_guid.TabIndex = 532;
            // 
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_guid;
            this.layoutControlItem17.Location = new System.Drawing.Point(828, 136);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
            this.layoutControlItem17.Text = "ä¸»é®Guid";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.lbGuid;
            this.layoutControlItem13.Location = new System.Drawing.Point(828, 102);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(278, 34);
            this.layoutControlItem13.Text = "lbGuid";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            // 
            // Root
            // 
@@ -842,18 +874,6 @@
            this.layoutControlItem10.Text = "å®¡æ ¸æ¶é´";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.lbGuid;
            this.layoutControlItem13.Location = new System.Drawing.Point(828, 102);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(278, 34);
            this.layoutControlItem13.Text = "lbGuid";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.lastUpdateUser;
@@ -874,6 +894,66 @@
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem15.Text = "æåæ´æ°æ¶é´";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 128);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "éè´§æç»";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_suppId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem4.Text = "éä¾åºå";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 96);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
            this.layoutControlItem7.Text = "éè´§å¤æ³¨";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem11.Text = "å®¡æ ¸æ è¯";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_isFinish;
            this.layoutControlItem12.Location = new System.Drawing.Point(542, 64);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem12.Text = "å®ç»æ è¯";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            // 
            // tabMx
            // 
@@ -1177,85 +1257,6 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 128);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "éè´§æç»";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_suppId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem4.Text = "éä¾åºå";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 96);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
            this.layoutControlItem7.Text = "éè´§å¤æ³¨";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem11.Text = "å®¡æ ¸æ è¯";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_isFinish;
            this.layoutControlItem12.Location = new System.Drawing.Point(542, 64);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem12.Text = "å®ç»æ è¯";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            // 
            // txt_guid
            // 
            this.txt_guid.Location = new System.Drawing.Point(942, 148);
            this.txt_guid.Name = "txt_guid";
            this.txt_guid.Size = new System.Drawing.Size(172, 24);
            this.txt_guid.StyleController = this.layoutMx1;
            this.txt_guid.TabIndex = 532;
            // 
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_guid;
            this.layoutControlItem17.Location = new System.Drawing.Point(828, 136);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
            this.layoutControlItem17.Text = "ä¸»é®Guid";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
            // 
            // Frm_MesCgthSq
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1296,6 +1297,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1305,9 +1309,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1315,13 +1323,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            this.ResumeLayout(false);

        }

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs

@@ -62,7 +62,7 @@
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("è¯·åéæ©ä¾åºåï¼");
                    return;
                }
                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId(), (txt_isOut.Checked == true ? 1 : 0).ToString());
                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId());
                //èµå¼ç»æç»è¡¨
                frm.UpdateParent += (ss, ee) =>
                {

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs

@@ -58,6 +58,7 @@
            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -74,6 +75,8 @@
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -85,8 +88,6 @@
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -106,6 +107,8 @@
            this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -120,8 +123,17 @@
            this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.txt_sqdNo = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.lab_createBy = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -152,6 +164,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -163,8 +177,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage2.SuspendLayout();
@@ -175,6 +187,12 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -265,7 +283,9 @@
            this.gridColumn4,
            this.gv_checkDate,
            this.gv_reason,
            this.gv_fmrmode});
            this.gv_fmrmode,
            this.gridColumn7,
            this.gridColumn18});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -453,6 +473,16 @@
            this.gv_fmrmode.VisibleIndex = 14;
            this.gv_fmrmode.Width = 94;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "åæ®ç±»å";
            this.gridColumn7.FieldName = "outType";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 15;
            this.gridColumn7.Width = 94;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -506,6 +536,9 @@
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_status);
            this.layoutMx1.Controls.Add(this.txt_guid);
            this.layoutMx1.Controls.Add(this.txt_sqdNo);
            this.layoutMx1.Controls.Add(this.txt_createBy);
            this.layoutMx1.Controls.Add(this.txt_createDate);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.lb_guid,
@@ -609,10 +642,11 @@
            // 
            this.txt_fType.Location = new System.Drawing.Point(283, 12);
            this.txt_fType.Name = "txt_fType";
            this.txt_fType.Properties.Caption = "å§å¤";
            this.txt_fType.Properties.Caption = "å§å¤æ è¯";
            this.txt_fType.Size = new System.Drawing.Size(267, 24);
            this.txt_fType.StyleController = this.layoutMx1;
            this.txt_fType.TabIndex = 525;
            this.txt_fType.Tag = "readOnly";
            // 
            // txt_remark
            // 
@@ -620,7 +654,7 @@
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(195, 28);
            this.txt_remark.Size = new System.Drawing.Size(466, 28);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 235;
            // 
@@ -641,6 +675,29 @@
            this.txt_guid.StyleController = this.layoutMx1;
            this.txt_guid.TabIndex = 528;
            // 
            // lb_guid
            // 
            this.lb_guid.Control = this.txt_guid;
            this.lb_guid.Location = new System.Drawing.Point(542, 96);
            this.lb_guid.Name = "lb_guid";
            this.lb_guid.OptionsTableLayoutItem.ColumnIndex = 2;
            this.lb_guid.OptionsTableLayoutItem.RowIndex = 3;
            this.lb_guid.Size = new System.Drawing.Size(271, 32);
            this.lb_guid.Text = "ä¸»é®Guid";
            this.lb_guid.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.lbGuid;
            this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem12.Text = "lbGuid";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            // 
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -655,7 +712,10 @@
            this.layoutControlItem8,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem11});
            this.layoutControlItem11,
            this.layoutControlItem13,
            this.lab_createBy,
            this.layoutControlItem15});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -754,8 +814,9 @@
            this.layoutControlItem8.Control = this.txt_remark;
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem8.Size = new System.Drawing.Size(542, 32);
            this.layoutControlItem8.Text = "å¤æ³¨ä¿¡æ¯";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -791,29 +852,6 @@
            this.layoutControlItem11.Text = "å®¡æ ¸æ è¯";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.lbGuid;
            this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem12.Text = "lbGuid";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            // 
            // lb_guid
            // 
            this.lb_guid.Control = this.txt_guid;
            this.lb_guid.Location = new System.Drawing.Point(542, 96);
            this.lb_guid.Name = "lb_guid";
            this.lb_guid.OptionsTableLayoutItem.ColumnIndex = 2;
            this.lb_guid.OptionsTableLayoutItem.RowIndex = 3;
            this.lb_guid.Size = new System.Drawing.Size(271, 32);
            this.lb_guid.Text = "ä¸»é®Guid";
            this.lb_guid.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -862,7 +900,9 @@
            this.gvMx2remark,
            this.gvMx2ebelnK3id,
            this.gvMx2lineK3id,
            this.gvMx2itemOutId});
            this.gvMx2itemOutId,
            this.gridColumn14,
            this.gridColumn15});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1053,6 +1093,26 @@
            this.gvMx2itemOutId.Tag = "query_a.item_out_id";
            this.gvMx2itemOutId.Width = 94;
            // 
            // gridColumn14
            // 
            this.gridColumn14.Caption = "åå»ºäºº";
            this.gridColumn14.FieldName = "createBy";
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 12;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn15
            // 
            this.gridColumn15.Caption = "åå»ºæ¶é´";
            this.gridColumn15.FieldName = "createDate";
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 13;
            this.gridColumn15.Width = 94;
            // 
            // xtraTabPage3
            // 
            this.xtraTabPage3.Controls.Add(this.gcMx2);
@@ -1084,7 +1144,9 @@
            this.gvMx1depotCode,
            this.gvMx1depotSectionCode,
            this.gvMx1ebelnK3id,
            this.gvMx1lineK3id});
            this.gvMx1lineK3id,
            this.gridColumn16,
            this.gridColumn17});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1215,6 +1277,26 @@
            this.gvMx1lineK3id.VisibleIndex = 9;
            this.gvMx1lineK3id.Width = 94;
            // 
            // gridColumn16
            // 
            this.gridColumn16.Caption = "åå»ºäºº";
            this.gridColumn16.FieldName = "createBy";
            this.gridColumn16.MinWidth = 25;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 10;
            this.gridColumn16.Width = 94;
            // 
            // gridColumn17
            // 
            this.gridColumn17.Caption = "åå»ºæ¶é´";
            this.gridColumn17.FieldName = "createDate";
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 11;
            this.gridColumn17.Width = 94;
            // 
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1233,6 +1315,72 @@
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
            // 
            // gridColumn18
            // 
            this.gridColumn18.Caption = "ç³è¯·åå·";
            this.gridColumn18.FieldName = "sqdNo";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 16;
            this.gridColumn18.Width = 94;
            // 
            // txt_sqdNo
            // 
            this.txt_sqdNo.Location = new System.Drawing.Point(626, 76);
            this.txt_sqdNo.Name = "txt_sqdNo";
            this.txt_sqdNo.Size = new System.Drawing.Size(195, 24);
            this.txt_sqdNo.StyleController = this.layoutMx1;
            this.txt_sqdNo.TabIndex = 529;
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_sqdNo;
            this.layoutControlItem13.Location = new System.Drawing.Point(542, 64);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem13.Text = "ç³è¯·åå·";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(626, 12);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Size = new System.Drawing.Size(195, 24);
            this.txt_createBy.StyleController = this.layoutMx1;
            this.txt_createBy.TabIndex = 530;
            // 
            // lab_createBy
            // 
            this.lab_createBy.Control = this.txt_createBy;
            this.lab_createBy.Location = new System.Drawing.Point(542, 0);
            this.lab_createBy.Name = "lab_createBy";
            this.lab_createBy.OptionsTableLayoutItem.ColumnIndex = 2;
            this.lab_createBy.Size = new System.Drawing.Size(271, 32);
            this.lab_createBy.Text = "åå»ºäºº";
            this.lab_createBy.TextSize = new System.Drawing.Size(60, 18);
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(626, 44);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Size = new System.Drawing.Size(195, 24);
            this.txt_createDate.StyleController = this.layoutMx1;
            this.txt_createDate.TabIndex = 531;
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_createDate;
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 32);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem15.Text = "åå»ºæ¶é´";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // Frm_MesCgthSqDj
            // 
@@ -1274,6 +1422,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1285,8 +1435,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage2.ResumeLayout(false);
@@ -1297,6 +1445,12 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            this.ResumeLayout(false);

        }
@@ -1386,5 +1540,17 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
        private DevExpress.XtraEditors.TextEdit txt_guid;
        private DevExpress.XtraLayout.LayoutControlItem lb_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraEditors.TextEdit txt_sqdNo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private DevExpress.XtraLayout.LayoutControlItem lab_createBy;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs

@@ -160,13 +160,18 @@
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.groupControl2 = new DevExpress.XtraEditors.GroupControl();
            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panMsg = new DevExpress.XtraEditors.PanelControl();
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            this.btnIpt = new DevExpress.XtraEditors.SimpleButton();
@@ -197,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.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -409,7 +415,8 @@
            this.bandedGridColumn1,
            this.gridColumn18,
            this.gridColumn19,
            this.gridColumn17});
            this.gridColumn17,
            this.gridColumn23});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -828,28 +835,28 @@
            // 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, 76);
            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, 108);
            this.txt_remarks.Name = "txt_remarks";
            this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            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, 28);
            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, 76);
            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";
@@ -860,7 +867,7 @@
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(249, 28);
            this.txt_itemName.Size = new System.Drawing.Size(254, 28);
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 800;
            this.txt_itemName.Tag = "readonly";
@@ -871,29 +878,29 @@
            this.txt_releaseNo.Name = "txt_releaseNo";
            this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            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, 28);
            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.Font = new System.Drawing.Font("Tahoma", 10F);
            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, 28);
            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.Font = new System.Drawing.Font("Tahoma", 10F);
            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, 28);
            this.txt_lotNo.StyleController = this.layoutMx1;
            this.txt_lotNo.TabIndex = 262;
            this.txt_lotNo.Tag = "readonly";
@@ -904,7 +911,7 @@
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(249, 28);
            this.txt_itemNo.Size = new System.Drawing.Size(254, 28);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 789;
            this.txt_itemNo.Tag = "readonly";
@@ -913,7 +920,7 @@
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(84, 108);
            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";
@@ -929,59 +936,59 @@
            // 
            // txt_fcheckBy
            // 
            this.txt_fcheckBy.Location = new System.Drawing.Point(409, 44);
            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 44);
            this.txt_fcheckBy.Name = "txt_fcheckBy";
            this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            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, 28);
            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, 44);
            this.txt_fbatchQty.Name = "txt_fbatchQty";
            this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            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, 28);
            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, 44);
            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, 76);
            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, 108);
            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";
@@ -1076,7 +1083,7 @@
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            this.Root.Size = new System.Drawing.Size(1321, 148);
            this.Root.Size = new System.Drawing.Size(1342, 148);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -1084,27 +1091,27 @@
            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, 32);
            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, 32);
            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, 32);
            this.layoutControlItem3.Text = "éæ£æ¹å·";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1114,7 +1121,7 @@
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
            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, 32);
            this.layoutControlItem4.Text = "ç©æåç§°";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1124,7 +1131,7 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
            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, 32);
            this.layoutControlItem5.Text = "ç©æç¼ç ";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1134,83 +1141,83 @@
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 96);
            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, 32);
            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, 32);
            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, 32);
            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, 32);
            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.Size = new System.Drawing.Size(330, 32);
            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, 64);
            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, 32);
            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, 64);
            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, 32);
            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, 32);
            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, 32);
            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, 64);
            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, 32);
            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, 32);
            this.layoutControlItem14.Text = "å®¡æ ¸æ è¯";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
@@ -1218,23 +1225,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, 96);
            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, 32);
            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, 96);
            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, 32);
            this.layoutControlItem18.Text = "æ¶æç»ç»";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1587,7 +1594,9 @@
            this.gridColumn4,
            this.gridColumn3,
            this.gridColumn2,
            this.gridColumn20});
            this.gridColumn20,
            this.gridColumn21,
            this.gridColumn25});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            // 
@@ -1632,6 +1641,26 @@
            this.gridColumn20.VisibleIndex = 1;
            this.gridColumn20.Width = 94;
            // 
            // gridColumn21
            // 
            this.gridColumn21.Caption = "æä½äºº";
            this.gridColumn21.FieldName = "createBy";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 2;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn25
            // 
            this.gridColumn25.Caption = "æä½æ¶é´";
            this.gridColumn25.FieldName = "createDate";
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 3;
            this.gridColumn25.Width = 94;
            // 
            // groupControl2
            // 
            this.groupControl2.Controls.Add(this.gcMx3);
@@ -1658,8 +1687,11 @@
            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn1,
            this.gridColumn22,
            this.gridColumn23,
            this.gridColumn24});
            this.gridColumn28,
            this.gridColumn29,
            this.gridColumn24,
            this.gridColumn26,
            this.gridColumn27});
            this.gvMx3.GridControl = this.gcMx3;
            this.gvMx3.Name = "gvMx3";
            // 
@@ -1675,7 +1707,7 @@
            // gridColumn22
            // 
            this.gridColumn22.Caption = "é¡¹ç®";
            this.gridColumn22.FieldName = "fcheckItem";
            this.gridColumn22.FieldName = "fcheckItemd5";
            this.gridColumn22.MaxWidth = 192;
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
@@ -1684,26 +1716,55 @@
            this.gridColumn22.VisibleIndex = 0;
            this.gridColumn22.Width = 192;
            // 
            // gridColumn23
            // gridColumn28
            // 
            this.gridColumn23.Caption = "æ½æ£ç»æ";
            this.gridColumn23.FieldName = "fcheckResu";
            this.gridColumn23.MaxWidth = 80;
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.OptionsColumn.ReadOnly = true;
            this.gridColumn23.Width = 80;
            this.gridColumn28.Caption = "æ ·æ¬é";
            this.gridColumn28.FieldName = "fcheckItem";
            this.gridColumn28.MinWidth = 25;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 1;
            this.gridColumn28.Width = 94;
            // 
            // gridColumn29
            // 
            this.gridColumn29.Caption = "æ ·æ¬å¼";
            this.gridColumn29.FieldName = "fcheckResu";
            this.gridColumn29.MinWidth = 25;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 2;
            this.gridColumn29.Width = 94;
            // 
            // gridColumn24
            // 
            this.gridColumn24.Caption = "å¤å®æ å¿";
            this.gridColumn24.ColumnEdit = this.repositoryItemComboBox1;
            this.gridColumn24.FieldName = "fstand";
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 1;
            this.gridColumn24.VisibleIndex = 3;
            this.gridColumn24.Width = 94;
            // 
            // gridColumn26
            // 
            this.gridColumn26.Caption = "æä½äºº";
            this.gridColumn26.FieldName = "createBy";
            this.gridColumn26.MinWidth = 25;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 4;
            this.gridColumn26.Width = 94;
            // 
            // gridColumn27
            // 
            this.gridColumn27.Caption = "æä½æ¶é´";
            this.gridColumn27.FieldName = "createDate";
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 5;
            this.gridColumn27.Width = 94;
            // 
            // panMsg
            // 
@@ -2033,6 +2094,16 @@
            // 
            this.gridView4.Name = "gridView4";
            // 
            // gridColumn23
            // 
            this.gridColumn23.Caption = "éè´åå·";
            this.gridColumn23.FieldName = "cgdNo";
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 24;
            this.gridColumn23.Width = 94;
            // 
            // Frm_MesQaItemsDetect01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2283,10 +2354,16 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
        private DevExpress.XtraEditors.TextEdit txt_guid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs

@@ -558,19 +558,33 @@
            };
            try
            {
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;
                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
                JObject _job = JObject.Parse(strJson);
                JArray array = new JArray();
                foreach (var a in _job["rtnData"]["list"])
                {
                    array.Add(a);
                }
                DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                gcMx2.BindingContext = new BindingContext();
                gcMx2.DataSource = dt;
                gcMx2.ForceInitialize();
                gvMx2.BestFitColumns();
                JArray array1 = new JArray();
                foreach (var a in _job["rtnData"]["list2"])
                {
                    array1.Add(a);
                }
                DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
                gcMx3.BindingContext = new BindingContext();
                gcMx3.DataSource = dt1;
                gcMx3.ForceInitialize();
                gvMx3.BestFitColumns();
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("æç¤ºï¼" + ex.Message);
            }

        }

        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs

@@ -86,6 +86,7 @@
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -109,7 +110,9 @@
            this.txt_slOrg = new DevExpress.XtraEditors.TextEdit();
            this.txt_modify1Date = new DevExpress.XtraEditors.TextEdit();
            this.txt_modify1By = new DevExpress.XtraEditors.TextEdit();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -151,15 +154,29 @@
            this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl();
            this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.groupControl2 = new DevExpress.XtraEditors.GroupControl();
            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx4 = new DevExpress.XtraGrid.GridControl();
            this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -211,7 +228,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Date.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1By.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -242,13 +261,23 @@
            this.splitMx2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).BeginInit();
            this.splitYangLi.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).BeginInit();
            this.splitYangLi.Panel2.SuspendLayout();
            this.splitYangLi.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
            this.groupControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            this.tabMxPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.groupControl2)).BeginInit();
            this.groupControl2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
            this.tabMxPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -354,7 +383,8 @@
            this.gridColumn18,
            this.gridColumn17,
            this.gridColumn15,
            this.gridColumn20});
            this.gridColumn20,
            this.gridColumn31});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -702,6 +732,16 @@
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Width = 94;
            // 
            // gridColumn31
            // 
            this.gridColumn31.Caption = "éè´åå·";
            this.gridColumn31.FieldName = "cgdNo";
            this.gridColumn31.MinWidth = 25;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 25;
            this.gridColumn31.Width = 94;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -762,9 +802,11 @@
            this.layoutMx1.Controls.Add(this.txt_slOrg);
            this.layoutMx1.Controls.Add(this.txt_modify1Date);
            this.layoutMx1.Controls.Add(this.txt_modify1By);
            this.layoutMx1.Controls.Add(this.txt_guid);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem16});
            this.layoutControlItem16,
            this.layoutControlItem19});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(940, 345, 812, 500);
@@ -986,6 +1028,15 @@
            this.txt_modify1By.TabIndex = 814;
            this.txt_modify1By.Tag = "readonly";
            // 
            // txt_guid
            // 
            this.txt_guid.Location = new System.Drawing.Point(1065, 140);
            this.txt_guid.Name = "txt_guid";
            this.txt_guid.Size = new System.Drawing.Size(244, 24);
            this.txt_guid.StyleController = this.layoutMx1;
            this.txt_guid.TabIndex = 815;
            this.txt_guid.Tag = "readonly";
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.lbGuid;
@@ -997,6 +1048,17 @@
            this.layoutControlItem16.Text = "lbGuid";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_guid;
            this.layoutControlItem19.Location = new System.Drawing.Point(975, 128);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem19.Size = new System.Drawing.Size(326, 32);
            this.layoutControlItem19.Text = "ä¸»é®GUID";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(50, 20);
            // 
            // Root
            // 
@@ -1279,10 +1341,10 @@
            // 
            // splitMx2.Panel2
            // 
            this.splitMx2.Panel2.Controls.Add(this.groupControl1);
            this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
            this.splitMx2.Panel2.Text = "Panel2";
            this.splitMx2.Size = new System.Drawing.Size(1340, 465);
            this.splitMx2.SplitterPosition = 249;
            this.splitMx2.SplitterPosition = 241;
            this.splitMx2.TabIndex = 3;
            // 
            // gcMx1
@@ -1291,7 +1353,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, 249);
            this.gcMx1.Size = new System.Drawing.Size(1340, 241);
            this.gcMx1.TabIndex = 2;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1548,15 +1610,34 @@
            this.gvMx1facLevel.VisibleIndex = 15;
            this.gvMx1facLevel.Width = 200;
            // 
            // splitYangLi
            // 
            this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitYangLi.Location = new System.Drawing.Point(0, 0);
            this.splitYangLi.Name = "splitYangLi";
            // 
            // splitYangLi.Panel1
            // 
            this.splitYangLi.Panel1.Controls.Add(this.groupControl1);
            this.splitYangLi.Panel1.Text = "Panel1";
            // 
            // splitYangLi.Panel2
            // 
            this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
            this.splitYangLi.Panel2.Text = "Panel2";
            this.splitYangLi.Size = new System.Drawing.Size(1340, 212);
            this.splitYangLi.SplitterPosition = 583;
            this.splitYangLi.TabIndex = 0;
            // 
            // groupControl1
            // 
            this.groupControl1.Controls.Add(this.gcMx2);
            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(1340, 204);
            this.groupControl1.TabIndex = 3;
            this.groupControl1.Text = "æ½æ ·ç»æ";
            this.groupControl1.Size = new System.Drawing.Size(583, 212);
            this.groupControl1.TabIndex = 4;
            this.groupControl1.Text = "æ£æµç»æ";
            // 
            // gcMx2
            // 
@@ -1564,7 +1645,7 @@
            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(1336, 174);
            this.gcMx2.Size = new System.Drawing.Size(579, 182);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -1572,23 +1653,35 @@
            // gvMx2
            // 
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn1,
            this.gridColumn3,
            this.gridColumn2,
            this.gridColumn1});
            this.gridColumn21,
            this.gridColumn22,
            this.gridColumn25});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "guidä¸è½å é¤";
            this.gridColumn1.FieldName = "guid";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "é¡¹ç®";
            this.gridColumn3.FieldName = "fcheckItem";
            this.gridColumn3.MaxWidth = 200;
            this.gridColumn3.MaxWidth = 192;
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.ReadOnly = true;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 0;
            this.gridColumn3.Width = 94;
            this.gridColumn3.Width = 192;
            // 
            // gridColumn2
            // 
@@ -1598,48 +1691,157 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.ReadOnly = true;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 80;
            // 
            // gridColumn1
            // gridColumn21
            // 
            this.gridColumn1.Caption = "å¤å®æ å¿";
            this.gridColumn1.FieldName = "fstand";
            this.gridColumn1.MaxWidth = 80;
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 2;
            this.gridColumn1.Width = 80;
            this.gridColumn21.Caption = "å¤å®æ å¿";
            this.gridColumn21.FieldName = "fstand";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 1;
            this.gridColumn21.Width = 94;
            // 
            // tabMxPage3
            // gridColumn22
            // 
            this.tabMxPage3.Controls.Add(this.gcMx3);
            this.tabMxPage3.Controls.Add(this.ucUpFile1);
            this.tabMxPage3.Name = "tabMxPage3";
            this.tabMxPage3.Size = new System.Drawing.Size(1340, 465);
            this.tabMxPage3.Text = "éä»¶ä¿¡æ¯";
            this.gridColumn22.Caption = "æä½äºº";
            this.gridColumn22.FieldName = "createBy";
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 2;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn25
            // 
            this.gridColumn25.Caption = "æä½æ¶é´";
            this.gridColumn25.FieldName = "createDate";
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 3;
            this.gridColumn25.Width = 94;
            // 
            // groupControl2
            // 
            this.groupControl2.Controls.Add(this.gcMx3);
            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(745, 212);
            this.groupControl2.TabIndex = 5;
            this.groupControl2.Text = "æ ·æ¬ç»æ";
            // 
            // gcMx3
            // 
            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx3.Location = new System.Drawing.Point(0, 57);
            this.gcMx3.Location = new System.Drawing.Point(2, 28);
            this.gcMx3.MainView = this.gvMx3;
            this.gcMx3.Name = "gcMx3";
            this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1,
            this.repositoryItemButtonEdit2,
            this.repositoryItemButtonEdit3});
            this.gcMx3.Size = new System.Drawing.Size(1340, 408);
            this.gcMx3.TabIndex = 1;
            this.gcMx3.Size = new System.Drawing.Size(741, 182);
            this.gcMx3.TabIndex = 0;
            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx3});
            // 
            // gvMx3
            // 
            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn23,
            this.gridColumn24,
            this.gridColumn28,
            this.gridColumn29,
            this.gridColumn26,
            this.gridColumn27,
            this.gridColumn30});
            this.gvMx3.GridControl = this.gcMx3;
            this.gvMx3.Name = "gvMx3";
            // 
            // gridColumn23
            // 
            this.gridColumn23.Caption = "guidä¸è½å é¤";
            this.gridColumn23.FieldName = "guid";
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.OptionsColumn.ReadOnly = true;
            this.gridColumn23.Width = 94;
            // 
            // gridColumn24
            // 
            this.gridColumn24.Caption = "é¡¹ç®";
            this.gridColumn24.FieldName = "fcheckItemd5";
            this.gridColumn24.MaxWidth = 192;
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.OptionsColumn.ReadOnly = true;
            this.gridColumn24.Width = 192;
            // 
            // gridColumn28
            // 
            this.gridColumn28.Caption = "æ ·æ¬é";
            this.gridColumn28.FieldName = "fcheckItem";
            this.gridColumn28.MinWidth = 25;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Width = 94;
            // 
            // gridColumn29
            // 
            this.gridColumn29.Caption = "æ ·æ¬å¼";
            this.gridColumn29.FieldName = "fcheckResu";
            this.gridColumn29.MinWidth = 25;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Width = 94;
            // 
            // gridColumn26
            // 
            this.gridColumn26.Caption = "å¤å®æ å¿";
            this.gridColumn26.FieldName = "fstand";
            this.gridColumn26.MinWidth = 25;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Width = 94;
            // 
            // gridColumn27
            // 
            this.gridColumn27.Caption = "æä½äºº";
            this.gridColumn27.FieldName = "createBy";
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Width = 94;
            // 
            // gridColumn30
            // 
            this.gridColumn30.Caption = "æä½æ¶é´";
            this.gridColumn30.FieldName = "createDate";
            this.gridColumn30.MinWidth = 25;
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Width = 94;
            // 
            // tabMxPage3
            // 
            this.tabMxPage3.Controls.Add(this.gcMx4);
            this.tabMxPage3.Controls.Add(this.ucUpFile1);
            this.tabMxPage3.Name = "tabMxPage3";
            this.tabMxPage3.Size = new System.Drawing.Size(1340, 465);
            this.tabMxPage3.Text = "éä»¶ä¿¡æ¯";
            // 
            // gcMx4
            // 
            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx4.Location = new System.Drawing.Point(0, 57);
            this.gcMx4.MainView = this.gvMx4;
            this.gcMx4.Name = "gcMx4";
            this.gcMx4.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1,
            this.repositoryItemButtonEdit2,
            this.repositoryItemButtonEdit3});
            this.gcMx4.Size = new System.Drawing.Size(1340, 408);
            this.gcMx4.TabIndex = 1;
            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx4});
            // 
            // gvMx4
            // 
            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn4,
            this.gridColumn5,
            this.gridColumn11,
@@ -1649,8 +1851,8 @@
            this.gridColumn10,
            this.gridColumn16,
            this.gridColumn9});
            this.gvMx3.GridControl = this.gcMx3;
            this.gvMx3.Name = "gvMx3";
            this.gvMx4.GridControl = this.gcMx4;
            this.gvMx4.Name = "gvMx4";
            // 
            // gridColumn4
            // 
@@ -1841,7 +2043,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Date.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1By.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1872,13 +2076,23 @@
            this.splitMx2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).EndInit();
            this.splitYangLi.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).EndInit();
            this.splitYangLi.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).EndInit();
            this.splitYangLi.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).EndInit();
            this.groupControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            this.tabMxPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.groupControl2)).EndInit();
            this.groupControl2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
            this.tabMxPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
@@ -1942,15 +2156,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
        private DevExpress.XtraEditors.GroupControl groupControl1;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraTab.XtraTabPage tabMxPage3;
        private DevExpress.XtraGrid.GridControl gcMx3;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
        private DevExpress.XtraGrid.GridControl gcMx4;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
@@ -2007,5 +2215,28 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraEditors.SplitContainerControl splitYangLi;
        private DevExpress.XtraEditors.GroupControl groupControl1;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
        private DevExpress.XtraEditors.GroupControl groupControl2;
        private DevExpress.XtraGrid.GridControl gcMx3;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
        private DevExpress.XtraEditors.TextEdit txt_guid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs

@@ -34,6 +34,7 @@
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
           {
@@ -412,9 +413,9 @@
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMx3.BindingContext = new BindingContext();
                    gcMx3.DataSource = dt;
                    gcMx3.ForceInitialize();
                    gcMx4.BindingContext = new BindingContext();
                    gcMx4.DataSource = dt;
                    gcMx4.ForceInitialize();
                }
                else
                {
@@ -439,13 +440,28 @@
            };
            try
            {
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;
                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
                JObject _job = JObject.Parse(strJson);
                JArray array = new JArray();
                foreach (var a in _job["rtnData"]["list"])
                {
                    array.Add(a);
                }
                DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                gcMx2.BindingContext = new BindingContext();
                gcMx2.DataSource = dt;
                gcMx2.ForceInitialize();
                gvMx2.BestFitColumns();
                JArray array1 = new JArray();
                foreach (var a in _job["rtnData"]["list2"])
                {
                    array1.Add(a);
                }
                DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
                gcMx4.BindingContext = new BindingContext();
                gcMx4.DataSource = dt1;
                gcMx4.ForceInitialize();
                gvMx4.BestFitColumns();
            }
            catch (Exception ex)
            {
@@ -454,12 +470,12 @@
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx3.FocusedRowHandle;
            var rowhandle = gvMx4.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx3.GetDataRow(rowhandle);
                var dr = gvMx4.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("ä½ éæ©äº1æ¡æ°æ®ï¼ç¡®å®å é¤åï¼"))
                    return;
@@ -471,7 +487,7 @@
                    strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
                        JsonConvert.SerializeObject(lst));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) gvMx3.DeleteRow(rowhandle);
                    if (_rtn.rtnCode > 0) gvMx4.DeleteRow(rowhandle);
                    MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg);
                }
                catch (Exception ex)
@@ -482,14 +498,14 @@
        }
        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx3.FocusedRowHandle;
            var rowhandle = gvMx4.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                try
                {
                    var dr = gvMx3.GetDataRow(rowhandle);
                    var dr = gvMx4.GetDataRow(rowhandle);
                    var urlPath = dr["urlPath"].ToString();
                    Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
                    frm.ShowDialog();
@@ -503,14 +519,14 @@

        private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx3.FocusedRowHandle;
            var rowhandle = gvMx4.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                try
                {
                    var dr = gvMx3.GetDataRow(rowhandle);
                    var dr = gvMx4.GetDataRow(rowhandle);
                    var urlPath = dr["urlPath"].ToString();
                    using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
                    {

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs

@@ -142,13 +142,13 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        gvMx1.Columns["guid"].Visible = false;
                        gvMx1.Columns["parentGuid"].Visible = false;
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    gvMx1.Columns["guid"].Visible = false;
                    gvMx1.Columns["parentGuid"].Visible = false;
                }
                else
                    ToolBox.MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg);

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs

ÎÄ¼þÒÑÉ¾³ý

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs

ÎÄ¼þÒÑÉ¾³ý

 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs

ÎÄ¼þÒÑÉ¾³ý

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

@@ -138,6 +138,8 @@
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
@@ -1031,6 +1033,8 @@
            this.gridColumn7,
            this.gvMx1memo,
            this.gridColumn10,
            this.gridColumn12,
            this.gridColumn13,
            this.gvBtnAlawys,
            this.gvMxDel});
            this.gvMx1.GridControl = this.gcMx1;
@@ -1344,7 +1348,7 @@
            this.gvBtnAlawys.MinWidth = 80;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 17;
            this.gvBtnAlawys.VisibleIndex = 19;
            this.gvBtnAlawys.Width = 80;
            // 
            // repositoryItemButtonEdit2
@@ -1358,6 +1362,26 @@
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
            // 
            // gridColumn12
            // 
            this.gridColumn12.Caption = "élææ¶é´";
            this.gridColumn12.FieldName = "returnDate";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 17;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn13
            // 
            this.gridColumn13.Caption = "éæäºº";
            this.gridColumn13.FieldName = "returnBy";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 18;
            this.gridColumn13.Width = 94;
            // 
            // gvMxDel
            // 
            this.gvMxDel.Caption = "ç§»åº";
@@ -1365,7 +1389,7 @@
            this.gvMxDel.MinWidth = 80;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 18;
            this.gvMxDel.VisibleIndex = 20;
            this.gvMxDel.Width = 80;
            // 
            // repositoryItemButtonEdit1
@@ -1554,5 +1578,7 @@
        private DevExpress.XtraEditors.TextEdit txt_guid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
    }
}

 DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,91 @@
ï»¿namespace Gs.DevApp.DevFrm.Sys
{
    partial class EasyRptEdt
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

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

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
            this.splitMx1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
            this.splitMx1.SuspendLayout();
            this.SuspendLayout();
            // 
            // splitMx1
            // 
            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx1.Horizontal = false;
            this.splitMx1.Location = new System.Drawing.Point(0, 0);
            this.splitMx1.Name = "splitMx1";
            // 
            // splitMx1.Panel1
            // 
            this.splitMx1.Panel1.Controls.Add(this.flowLayoutPanel1);
            this.splitMx1.Panel1.Text = "Panel1";
            // 
            // splitMx1.Panel2
            // 
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.Size = new System.Drawing.Size(918, 623);
            this.splitMx1.SplitterPosition = 593;
            this.splitMx1.TabIndex = 0;
            // 
            // flowLayoutPanel1
            // 
            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
            this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
            this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(100);
            this.flowLayoutPanel1.Size = new System.Drawing.Size(918, 593);
            this.flowLayoutPanel1.TabIndex = 1;
            // 
            // EasyRptEdt
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(918, 623);
            this.Controls.Add(this.splitMx1);
            this.Name = "EasyRptEdt";
            this.Text = "EasyRptEdt";
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
            this.splitMx1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
            this.splitMx1.ResumeLayout(false);
            this.ResumeLayout(false);

        }

        #endregion

        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
    }
}

 DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,57 @@
ï»¿using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.Sys
{
    public partial class EasyRptEdt : DevExpress.XtraEditors.XtraForm
    {
        public EasyRptEdt()
        {
            InitializeComponent();
            GetList();
        }

        private void GetList()
        {
            var _obj = new
            {

            };
            var strReturn = "";
            try
            {
                strReturn = UtilityHelper.HttpPost("", "Report/GetTemplateList",
                    JsonConvert.SerializeObject(_obj));
                ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
                DataTable dt = dd.rtnData;
                foreach (DataRow row in dt.Rows)
                {
                    SimpleButton btn = new DevExpress.XtraEditors.SimpleButton();
                    btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32;
                    btn.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
                    btn.Name = Guid.NewGuid().ToString();
                    btn.Size = new System.Drawing.Size(150, 150);
                    btn.TabIndex = 1;
                    btn.Text = row["reportName"].ToString()+"(" + row["reportType"].ToString() + ")";
                    btn.Margin = new System.Windows.Forms.Padding(20);
                    this.flowLayoutPanel1.Controls.Add(btn);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("æç¤ºï¼" + ex.Message);
            }
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.resx

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,120 @@
ï»¿<?xml version="1.0" encoding="utf-8"?>
<root>
  <!-- 
    Microsoft ResX Schema 
    
    Version 2.0
    
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 
    associated with the data types.
    
    Example:
    
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
                
    There are any number of "resheader" rows that contain simple 
    name/value pairs.
    
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 
    mimetype set.
    
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
    
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
    
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -365,9 +365,6 @@
    </Compile>
    <Compile Include="DevFrm\QC\Models\MesDefectCode.cs" />
    <Compile Include="DevFrm\QC\Models\MesDefectType.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
@@ -417,6 +414,12 @@
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.Designer.cs">
      <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sys\EasyRptEdt.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sys\EasyRptEdt.Designer.cs">
      <DependentUpon>EasyRptEdt.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\User\ViewRole.cs">
      <SubType>Form</SubType>
@@ -1150,6 +1153,9 @@
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNotice.resx">
      <DependentUpon>Frm_SalesReturnNotice.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
      <DependentUpon>EasyRptEdt.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\User\ViewRole.resx">
      <DependentUpon>ViewRole.cs</DependentUpon>
    </EmbeddedResource>
@@ -1643,6 +1649,10 @@
    <None Include="Resources\upload_16x16.png" />
    <None Include="Resources\editname_32x321.png" />
    <None Include="Resources\refresh_16x16.png" />
    <None Include="Resources\dafualtfax_32x32.png" />
    <None Include="Resources\defaultprinter_32x32.png" />
    <None Include="Resources\printarea_32x32.png" />
    <None Include="Resources\defaultprinter.svg" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />

 DevApp/Gs.DevApp/Program.cs

@@ -38,7 +38,7 @@
        /// </summary>
        private static void _startLogin()
        {
            //Application.Run(new XtraForm1());
            //Application.Run(new Gs.DevApp.TestForm.test());
            //return;
            CefSettings settings = new CefSettings();
            settings.Locale = "zh-CN";

 DevApp/Gs.DevApp/Properties/Resources.Designer.cs

@@ -623,6 +623,36 @@
        /// <summary>
        ///   æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
        /// </summary>
        internal static System.Drawing.Bitmap dafualtfax_32x32 {
            get {
                object obj = ResourceManager.GetObject("dafualtfax_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æ¥æ¾ DevExpress.Utils.Svg.SvgImage ç±»åçæ¬å°åèµæºã
        /// </summary>
        internal static DevExpress.Utils.Svg.SvgImage defaultprinter {
            get {
                object obj = ResourceManager.GetObject("defaultprinter", resourceCulture);
                return ((DevExpress.Utils.Svg.SvgImage)(obj));
            }
        }
        
        /// <summary>
        ///   æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
        /// </summary>
        internal static System.Drawing.Bitmap defaultprinter_32x32 {
            get {
                object obj = ResourceManager.GetObject("defaultprinter_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
        /// </summary>
        internal static System.Drawing.Bitmap deletelist2_16x16 {
            get {
                object obj = ResourceManager.GetObject("deletelist2_16x16", resourceCulture);
@@ -1373,6 +1403,16 @@
        /// <summary>
        ///   æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
        /// </summary>
        internal static System.Drawing.Bitmap printarea_32x32 {
            get {
                object obj = ResourceManager.GetObject("printarea_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
        /// </summary>
        internal static System.Drawing.Bitmap printernetwork_16x16 {
            get {
                object obj = ResourceManager.GetObject("printernetwork_16x16", resourceCulture);

 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="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
@@ -138,8 +140,8 @@
  <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
  <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>
@@ -148,6 +150,11 @@
  </data>
  <data name="lookup&amp;reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -204,9 +211,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -223,9 +227,6 @@
  </data>
  <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -247,6 +248,9 @@
  <data name="richeditcleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\richeditcleartablestyle_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printarea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printarea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </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,
@@ -254,6 +258,11 @@
  </data>
  <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\csharp_16x16.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>
@@ -265,8 +274,8 @@
  <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="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="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="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>
@@ -286,20 +295,20 @@
            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="editname_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editname_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="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="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,
@@ -309,11 +318,16 @@
  <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="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="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>
  </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>
@@ -321,8 +335,10 @@
  <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>
@@ -481,18 +497,19 @@
            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>
  </data>
  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="refresh_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_check" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -517,8 +534,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>
@@ -560,9 +577,6 @@
  <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editname_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editname_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <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>
@@ -602,10 +616,8 @@
            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 name="defaultprinter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\defaultprinter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
@@ -614,6 +626,9 @@
  </data>
  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x32.png;System.Drawing.Bitmap,
@@ -625,11 +640,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_16x16.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>
@@ -638,20 +648,24 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodetails_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_16x16.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>
@@ -669,8 +683,8 @@
  <data name="sortasc_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_32x32.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 name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap,
@@ -707,6 +721,9 @@
  </data>
  <data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <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>
@@ -750,16 +767,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</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,
  <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="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
  <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>
@@ -768,15 +782,18 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_32x32.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>
  <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 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,
@@ -800,10 +817,13 @@
    <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="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,
@@ -815,10 +835,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>
@@ -826,18 +844,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="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>
@@ -864,16 +880,16 @@
            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>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
  <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="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="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="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="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>
@@ -891,15 +907,13 @@
            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,
  <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="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>
@@ -910,25 +924,23 @@
  <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>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="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="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="refresh_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="defaultprinter" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\defaultprinter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
</root>

 DevApp/Gs.DevApp/Properties/licenses.licx

@@ -1,14 +1,15 @@
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

 DevApp/Gs.DevApp/Resources/dafualtfax_32x32.png


 DevApp/Gs.DevApp/Resources/defaultprinter.svg

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,18 @@
ï»¿<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
  <style type="text/css">
    .Black{fill:#727272;}
    .Yellow{fill:#FFB115;}
    .Blue{fill:#1177D7;}
    .Red{fill:#D11C1C;}
    .White{fill:#FFFFFF;}
    .Green{fill:#039C23;}
    .st0{fill:#727272;}
    .st1{opacity:0.5;}
    .st2{opacity:0.75;}
</style>
  <g id="DefaultPrinter">
    <path d="M8,16H6V6h8v2H8V16z M26,18v8c0,1.1-0.9,2-2,2h-4v4H6v-4H2c-1.1,0-2-0.9-2-2V16c0-1.1,0.9-2,2-2h2v3   c0,0.6,0.4,1,1,1H26z M18,22H8v8h10V22z" class="Black" />
    <path d="M31,0H17c-0.5,0-1,0.5-1,1v14c0,0.5,0.5,1,1,1h14c0.5,0,1-0.5,1-1V1C32,0.5,31.5,0,31,0z M30,5l-8,8l-4-4V6   l4,4l8-8V5z" class="Green" />
  </g>
</svg>

 DevApp/Gs.DevApp/Resources/defaultprinter_32x32.png


 DevApp/Gs.DevApp/Resources/printarea_32x32.png


 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -409,7 +409,13 @@
                        if (colType is CheckEdit)
                        {
                            var txt = colType as CheckEdit;
                            if (txt != null)
                            if (_isRead(txt.Tag))
                            {
                                txt.ReadOnly = true;
                            }
                            else
                                txt.ReadOnly = isEdt;
                            if (txt != null) {
                                switch (strVal)
                                {
                                    case "True":
@@ -425,8 +431,8 @@
                                        txt.Checked = false;
                                        break;
                                }
                            }

                            txt.ReadOnly = isEdt;
                            continue;
                        }
                        //åé
@@ -452,6 +458,7 @@
                            txt.Enabled = !isEdt;
                            continue;
                        }

                        //æ¶é´
                        if (colType is DateTimePicker)
                        {
@@ -797,7 +804,6 @@
                    else
                        txt.ReadOnly = isEdt;
                    continue;

                }
                //èªå®ä¹ä»åº
                if (ctrl is UcLookCk)

 DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs

@@ -382,9 +382,9 @@
            // 
            // btnIn
            // 
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
            this.btnIn.Location = new System.Drawing.Point(2, 2);
            this.btnIn.Location = new System.Drawing.Point(1028, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
@@ -393,8 +393,8 @@
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
            this.pageBar1.Location = new System.Drawing.Point(138, 2);
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
            this.pageBar1.Location = new System.Drawing.Point(2, 2);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;

 DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs

@@ -28,11 +28,14 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
            this.label1 = new System.Windows.Forms.Label();
            this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -44,30 +47,58 @@
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
            this.panelControl3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            this.SuspendLayout();
            // 
            // panelControl3
            // 
            this.panelControl3.Controls.Add(this.label1);
            this.panelControl3.Controls.Add(this.radioGroup1);
            this.panelControl3.Dock = System.Windows.Forms.DockStyle.Top;
            this.panelControl3.Location = new System.Drawing.Point(0, 0);
            this.panelControl3.Name = "panelControl3";
            this.panelControl3.Size = new System.Drawing.Size(1128, 38);
            this.panelControl3.TabIndex = 7;
            // 
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.Location = new System.Drawing.Point(54, 11);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(128, 18);
            this.label1.TabIndex = 1;
            this.label1.Text = "éæ©éè´åç±»åï¼";
            // 
            // radioGroup1
            // 
            this.radioGroup1.EditValue = ((short)(0));
            this.radioGroup1.Location = new System.Drawing.Point(189, 4);
            this.radioGroup1.Name = "radioGroup1";
            this.radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(0)), "éè´"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(1)), "å§å¤")});
            this.radioGroup1.Size = new System.Drawing.Size(197, 34);
            this.radioGroup1.TabIndex = 0;
            // 
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.Location = new System.Drawing.Point(0, 38);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1126, 607);
            this.gcMain.TabIndex = 1;
            this.gcMain.Size = new System.Drawing.Size(1128, 601);
            this.gcMain.TabIndex = 8;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
@@ -80,7 +111,6 @@
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_guid,
            this.gv_chk,
            this.gridColumn3,
            this.gridColumn4,
            this.gv_billNo,
@@ -93,11 +123,14 @@
            this.gv_purchaseUnit,
            this.gridColumn10,
            this.gridColumn2,
            this.gridColumn1});
            this.gridColumn1,
            this.gridColumn8});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsSelection.MultiSelect = true;
            this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
@@ -114,18 +147,6 @@
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            // 
            // gv_chk
            // 
            this.gv_chk.Caption = "éæ©";
            this.gv_chk.FieldName = "gvChk";
            this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_chk.MaxWidth = 50;
            this.gv_chk.MinWidth = 50;
            this.gv_chk.Name = "gv_chk";
            this.gv_chk.Visible = true;
            this.gv_chk.VisibleIndex = 0;
            this.gv_chk.Width = 50;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "å§å¤æ è¯";
@@ -137,6 +158,16 @@
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 1;
            this.gridColumn3.Width = 50;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "å¥åºåå·";
            this.gridColumn4.FieldName = "invBillNo";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 94;
            // 
            // gv_billNo
            // 
@@ -270,40 +301,21 @@
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Width = 94;
            // 
            // xtraTabControl1
            // 
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 682);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1});
            // 
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.panelControl1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 650);
            this.xtraTabPage1.Text = "è¯·éæ©ééè¦éè´§çæç»";
            // 
            // panelControl1
            // 
            this.panelControl1.Controls.Add(this.btnIn);
            this.panelControl1.Controls.Add(this.pageBar1);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panelControl1.Location = new System.Drawing.Point(0, 607);
            this.panelControl1.Location = new System.Drawing.Point(0, 639);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(1126, 43);
            this.panelControl1.TabIndex = 4;
            this.panelControl1.Size = new System.Drawing.Size(1128, 43);
            this.panelControl1.TabIndex = 9;
            // 
            // btnIn
            // 
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
            this.btnIn.Location = new System.Drawing.Point(2, 2);
            this.btnIn.Location = new System.Drawing.Point(1032, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
@@ -312,8 +324,8 @@
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
            this.pageBar1.Location = new System.Drawing.Point(140, 2);
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
            this.pageBar1.Location = new System.Drawing.Point(2, 2);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
@@ -321,22 +333,24 @@
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
            // gridColumn4
            // gridColumn8
            // 
            this.gridColumn4.Caption = "å¥åºåå·";
            this.gridColumn4.FieldName = "invBillNo";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 94;
            this.gridColumn8.Caption = "åæ®ç±»å";
            this.gridColumn8.FieldName = "inType";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 12;
            this.gridColumn8.Width = 94;
            // 
            // SelectMesCgthSq
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 682);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.gcMain);
            this.Controls.Add(this.panelControl1);
            this.Controls.Add(this.panelControl3);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
@@ -344,38 +358,41 @@
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "éæ©éè´§æç»";
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit();
            this.panelControl3.ResumeLayout(false);
            this.panelControl3.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.ResumeLayout(false);

        }
        #endregion

        private DevExpress.XtraEditors.PanelControl panelControl3;
        private System.Windows.Forms.Label label1;
        private DevExpress.XtraEditors.RadioGroup radioGroup1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
    }
}

 DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs

@@ -21,19 +21,18 @@
        private readonly string _webServiceName = "MesCgthSqManager/";
        private string suppId = "";
        private string receiveOrgId = "";
        private string isWw = "";
       /// <summary>
       /// 
       /// </summary>
       /// <param name="_suppId">ä¾åºåç¼å· </param>
       /// <param name="_receiveOrgId">ç»ç»ç¼å·</param>
       /// <param name="_isWw">2ä¸ºå§å¤ï¼1ä¸ºéè´</param>
        public SelectMesCgthSq(string _suppId, string _receiveOrgId, string _isWw)
        public SelectMesCgthSq(string _suppId, string _receiveOrgId)
        {
            InitializeComponent();
            radioGroup1.SelectedIndex = 0;
            this.suppId = _suppId;
            this.receiveOrgId = _receiveOrgId;
            this.isWw = _isWw;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
@@ -43,19 +42,20 @@
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
                for (var i = 0; i < gridView1.DataRowCount; i++)
                int[] rows = this.gridView1.GetSelectedRows();//åè·åéæ©è¡çè¡å·
                DataTable dt = this.gcMain.DataSource as DataTable;//å¾å°GridControlçæ°æ®æº
                foreach (int idx in rows)
                {
                    var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
                    if (checkBox == "Checked")
                    {
                        var _guid = gridView1.GetRowCellValue(i, "guid")
                            .ToString();
                    string _guid = dt.Rows[idx]["guid"].ToString();
                        list.Add(_guid);
                    }
                }
                UpdateParent?.Invoke(this,
                    new UpdateParentEventArgs { StringList = list });
                Close();
            };
            radioGroup1.SelectedIndexChanged += (s, e) =>
            {
                getPageList(1, UtilityHelper.GetPageSize());
            };
        }

@@ -86,7 +86,8 @@
                everyPageSize = pageSize,
                sortName = "",
                keyWhere = "",
                inIsWw = this.isWw,
             //   inIsWw = this.isWw,
                inIsWw = (radioGroup1.SelectedIndex),//0æ¯éè´ï¼1æ¯å§å¤
                inSupId = this.suppId,
                inReceiveOrgId = this.receiveOrgId,
            };

			@@ -83,6 +83,9 @@
			this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit();
			this.lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
			this.lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
			this.txt_guid = new DevExpress.XtraEditors.TextEdit();
			this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
			this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
			this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			@@ -92,9 +95,13 @@
			this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
			this.tabMx = new DevExpress.XtraTab.XtraTabControl();
			this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.gcMx1 = new DevExpress.XtraGrid.GridControl();
			@@ -120,13 +127,6 @@
			this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
			this.txt_guid = new DevExpress.XtraEditors.TextEdit();
			this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -157,6 +157,9 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
			@@ -166,9 +169,13 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
			this.tabMx.SuspendLayout();
			this.tabMxPage1.SuspendLayout();
			@@ -176,13 +183,6 @@
			((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
			this.SuspendLayout();
			//
			// toolBarMenu1
			@@ -666,6 +666,7 @@
			this.txt_isOut.Size = new System.Drawing.Size(267, 24);
			this.txt_isOut.StyleController = this.layoutMx1;
			this.txt_isOut.TabIndex = 527;
			this.txt_isOut.Tag = "readOnly";
			//
			// txt_status
			//
			@@ -704,6 +705,37 @@
			this.lastUpdateTime.StyleController = this.layoutMx1;
			this.lastUpdateTime.TabIndex = 531;
			this.lastUpdateTime.Tag = "readonly";
			//
			// txt_guid
			//
			this.txt_guid.Location = new System.Drawing.Point(942, 148);
			this.txt_guid.Name = "txt_guid";
			this.txt_guid.Size = new System.Drawing.Size(172, 24);
			this.txt_guid.StyleController = this.layoutMx1;
			this.txt_guid.TabIndex = 532;
			//
			// layoutControlItem17
			//
			this.layoutControlItem17.Control = this.txt_guid;
			this.layoutControlItem17.Location = new System.Drawing.Point(828, 136);
			this.layoutControlItem17.Name = "layoutControlItem17";
			this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
			this.layoutControlItem17.Text = "ä¸»é®Guid";
			this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
			//
			// layoutControlItem13
			//
			this.layoutControlItem13.Control = this.lbGuid;
			this.layoutControlItem13.Location = new System.Drawing.Point(828, 102);
			this.layoutControlItem13.Name = "layoutControlItem13";
			this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem13.Size = new System.Drawing.Size(278, 34);
			this.layoutControlItem13.Text = "lbGuid";
			this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem13.TextVisible = false;
			//
			// Root
			//
			@@ -842,18 +874,6 @@
			this.layoutControlItem10.Text = "å®¡æ ¸æ¶é´";
			this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
			//
			// layoutControlItem13
			//
			this.layoutControlItem13.Control = this.lbGuid;
			this.layoutControlItem13.Location = new System.Drawing.Point(828, 102);
			this.layoutControlItem13.Name = "layoutControlItem13";
			this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem13.Size = new System.Drawing.Size(278, 34);
			this.layoutControlItem13.Text = "lbGuid";
			this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem13.TextVisible = false;
			//
			// layoutControlItem14
			//
			this.layoutControlItem14.Control = this.lastUpdateUser;
			@@ -874,6 +894,66 @@
			this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem15.Text = "æåæ´æ°æ¶é´";
			this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
			//
			// layoutControlItem16
			//
			this.layoutControlItem16.Control = this.btnSelect;
			this.layoutControlItem16.Location = new System.Drawing.Point(0, 128);
			this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
			this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
			this.layoutControlItem16.Name = "layoutControlItem16";
			this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
			this.layoutControlItem16.Text = "éè´§æç»";
			this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem16.TextVisible = false;
			//
			// layoutControlItem4
			//
			this.layoutControlItem4.Control = this.txt_suppId;
			this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
			this.layoutControlItem4.Name = "layoutControlItem4";
			this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem4.Text = "éä¾åºå";
			this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
			//
			// layoutControlItem7
			//
			this.layoutControlItem7.Control = this.txt_remark;
			this.layoutControlItem7.Location = new System.Drawing.Point(271, 96);
			this.layoutControlItem7.Name = "layoutControlItem7";
			this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
			this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
			this.layoutControlItem7.Text = "éè´§å¤æ³¨";
			this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
			//
			// layoutControlItem11
			//
			this.layoutControlItem11.Control = this.txt_status;
			this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
			this.layoutControlItem11.Name = "layoutControlItem11";
			this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem11.Text = "å®¡æ ¸æ è¯";
			this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem11.TextVisible = false;
			//
			// layoutControlItem12
			//
			this.layoutControlItem12.Control = this.txt_isFinish;
			this.layoutControlItem12.Location = new System.Drawing.Point(542, 64);
			this.layoutControlItem12.Name = "layoutControlItem12";
			this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem12.Text = "å®ç»æ è¯";
			this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem12.TextVisible = false;
			//
			// tabMx
			//
			@@ -1177,85 +1257,6 @@
			this.picCheckBox.TabStop = false;
			this.picCheckBox.Visible = false;
			//
			// layoutControlItem16
			//
			this.layoutControlItem16.Control = this.btnSelect;
			this.layoutControlItem16.Location = new System.Drawing.Point(0, 128);
			this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
			this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
			this.layoutControlItem16.Name = "layoutControlItem16";
			this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
			this.layoutControlItem16.Text = "éè´§æç»";
			this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem16.TextVisible = false;
			//
			// layoutControlItem4
			//
			this.layoutControlItem4.Control = this.txt_suppId;
			this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
			this.layoutControlItem4.Name = "layoutControlItem4";
			this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem4.Text = "éä¾åºå";
			this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
			//
			// layoutControlItem7
			//
			this.layoutControlItem7.Control = this.txt_remark;
			this.layoutControlItem7.Location = new System.Drawing.Point(271, 96);
			this.layoutControlItem7.Name = "layoutControlItem7";
			this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
			this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
			this.layoutControlItem7.Text = "éè´§å¤æ³¨";
			this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
			//
			// layoutControlItem11
			//
			this.layoutControlItem11.Control = this.txt_status;
			this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
			this.layoutControlItem11.Name = "layoutControlItem11";
			this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem11.Text = "å®¡æ ¸æ è¯";
			this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem11.TextVisible = false;
			//
			// layoutControlItem12
			//
			this.layoutControlItem12.Control = this.txt_isFinish;
			this.layoutControlItem12.Location = new System.Drawing.Point(542, 64);
			this.layoutControlItem12.Name = "layoutControlItem12";
			this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem12.Text = "å®ç»æ è¯";
			this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem12.TextVisible = false;
			//
			// txt_guid
			//
			this.txt_guid.Location = new System.Drawing.Point(942, 148);
			this.txt_guid.Name = "txt_guid";
			this.txt_guid.Size = new System.Drawing.Size(172, 24);
			this.txt_guid.StyleController = this.layoutMx1;
			this.txt_guid.TabIndex = 532;
			//
			// layoutControlItem17
			//
			this.layoutControlItem17.Control = this.txt_guid;
			this.layoutControlItem17.Location = new System.Drawing.Point(828, 136);
			this.layoutControlItem17.Name = "layoutControlItem17";
			this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
			this.layoutControlItem17.Text = "ä¸»é®Guid";
			this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
			//
			// Frm_MesCgthSq
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			@@ -1296,6 +1297,9 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
			@@ -1305,9 +1309,13 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
			this.tabMx.ResumeLayout(false);
			this.tabMxPage1.ResumeLayout(false);
			@@ -1315,13 +1323,6 @@
			((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
			this.ResumeLayout(false);

			}

			@@ -62,7 +62,7 @@
			Gs.DevApp.ToolBox.MsgHelper.ShowError("è¯·åéæ©ä¾åºåï¼");
			return;
			}
			var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId(), (txt_isOut.Checked == true ? 1 : 0).ToString());
			var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId());
			//èµå¼ç»æç»è¡¨
			frm.UpdateParent += (ss, ee) =>
			{

			@@ -58,6 +58,7 @@
			this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
			@@ -74,6 +75,8 @@
			this.txt_remark = new DevExpress.XtraEditors.TextEdit();
			this.txt_status = new DevExpress.XtraEditors.CheckEdit();
			this.txt_guid = new DevExpress.XtraEditors.TextEdit();
			this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
			this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
			this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			@@ -85,8 +88,6 @@
			this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
			this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem();
			this.tabMx = new DevExpress.XtraTab.XtraTabControl();
			this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.gcMx1 = new DevExpress.XtraGrid.GridControl();
			@@ -106,6 +107,8 @@
			this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
			this.gcMx2 = new DevExpress.XtraGrid.GridControl();
			this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
			@@ -120,8 +123,17 @@
			this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.txt_sqdNo = new DevExpress.XtraEditors.TextEdit();
			this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
			this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
			this.lab_createBy = new DevExpress.XtraLayout.LayoutControlItem();
			this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
			this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -152,6 +164,8 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
			@@ -163,8 +177,6 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
			this.tabMx.SuspendLayout();
			this.tabMxPage2.SuspendLayout();
			@@ -175,6 +187,12 @@
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
			this.SuspendLayout();
			//
			// toolBarMenu1
			@@ -265,7 +283,9 @@
			this.gridColumn4,
			this.gv_checkDate,
			this.gv_reason,
			this.gv_fmrmode});
			this.gv_fmrmode,
			this.gridColumn7,
			this.gridColumn18});
			this.gridView1.GridControl = this.gcMain1;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			@@ -453,6 +473,16 @@
			this.gv_fmrmode.VisibleIndex = 14;
			this.gv_fmrmode.Width = 94;
			//
			// gridColumn7
			//
			this.gridColumn7.Caption = "åæ®ç±»å";
			this.gridColumn7.FieldName = "outType";
			this.gridColumn7.MinWidth = 25;
			this.gridColumn7.Name = "gridColumn7";
			this.gridColumn7.Visible = true;
			this.gridColumn7.VisibleIndex = 15;
			this.gridColumn7.Width = 94;
			//
			// pageBar1
			//
			this.pageBar1.CurrentPage = 1;
			@@ -506,6 +536,9 @@
			this.layoutMx1.Controls.Add(this.txt_remark);
			this.layoutMx1.Controls.Add(this.txt_status);
			this.layoutMx1.Controls.Add(this.txt_guid);
			this.layoutMx1.Controls.Add(this.txt_sqdNo);
			this.layoutMx1.Controls.Add(this.txt_createBy);
			this.layoutMx1.Controls.Add(this.txt_createDate);
			this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
			this.lb_guid,
			@@ -609,10 +642,11 @@
			//
			this.txt_fType.Location = new System.Drawing.Point(283, 12);
			this.txt_fType.Name = "txt_fType";
			this.txt_fType.Properties.Caption = "å§å¤";
			this.txt_fType.Properties.Caption = "å§å¤æ è¯";
			this.txt_fType.Size = new System.Drawing.Size(267, 24);
			this.txt_fType.StyleController = this.layoutMx1;
			this.txt_fType.TabIndex = 525;
			this.txt_fType.Tag = "readOnly";
			//
			// txt_remark
			//
			@@ -620,7 +654,7 @@
			this.txt_remark.Name = "txt_remark";
			this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_remark.Properties.Appearance.Options.UseFont = true;
			this.txt_remark.Size = new System.Drawing.Size(195, 28);
			this.txt_remark.Size = new System.Drawing.Size(466, 28);
			this.txt_remark.StyleController = this.layoutMx1;
			this.txt_remark.TabIndex = 235;
			//
			@@ -641,6 +675,29 @@
			this.txt_guid.StyleController = this.layoutMx1;
			this.txt_guid.TabIndex = 528;
			//
			// lb_guid
			//
			this.lb_guid.Control = this.txt_guid;
			this.lb_guid.Location = new System.Drawing.Point(542, 96);
			this.lb_guid.Name = "lb_guid";
			this.lb_guid.OptionsTableLayoutItem.ColumnIndex = 2;
			this.lb_guid.OptionsTableLayoutItem.RowIndex = 3;
			this.lb_guid.Size = new System.Drawing.Size(271, 32);
			this.lb_guid.Text = "ä¸»é®Guid";
			this.lb_guid.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem12
			//
			this.layoutControlItem12.Control = this.lbGuid;
			this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
			this.layoutControlItem12.Name = "layoutControlItem12";
			this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem12.Text = "lbGuid";
			this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem12.TextVisible = false;
			//
			// Root
			//
			this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			@@ -655,7 +712,10 @@
			this.layoutControlItem8,
			this.layoutControlItem9,
			this.layoutControlItem10,
			this.layoutControlItem11});
			this.layoutControlItem11,
			this.layoutControlItem13,
			this.lab_createBy,
			this.layoutControlItem15});
			this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
			this.Root.Name = "Root";
			columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
			@@ -754,8 +814,9 @@
			this.layoutControlItem8.Control = this.txt_remark;
			this.layoutControlItem8.Location = new System.Drawing.Point(0, 96);
			this.layoutControlItem8.Name = "layoutControlItem8";
			this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
			this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem8.Size = new System.Drawing.Size(542, 32);
			this.layoutControlItem8.Text = "å¤æ³¨ä¿¡æ¯";
			this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
			//
			@@ -791,29 +852,6 @@
			this.layoutControlItem11.Text = "å®¡æ ¸æ è¯";
			this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem11.TextVisible = false;
			//
			// layoutControlItem12
			//
			this.layoutControlItem12.Control = this.lbGuid;
			this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
			this.layoutControlItem12.Name = "layoutControlItem12";
			this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem12.Text = "lbGuid";
			this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem12.TextVisible = false;
			//
			// lb_guid
			//
			this.lb_guid.Control = this.txt_guid;
			this.lb_guid.Location = new System.Drawing.Point(542, 96);
			this.lb_guid.Name = "lb_guid";
			this.lb_guid.OptionsTableLayoutItem.ColumnIndex = 2;
			this.lb_guid.OptionsTableLayoutItem.RowIndex = 3;
			this.lb_guid.Size = new System.Drawing.Size(271, 32);
			this.lb_guid.Text = "ä¸»é®Guid";
			this.lb_guid.TextSize = new System.Drawing.Size(60, 18);
			//
			// tabMx
			//
			@@ -862,7 +900,9 @@
			this.gvMx2remark,
			this.gvMx2ebelnK3id,
			this.gvMx2lineK3id,
			this.gvMx2itemOutId});
			this.gvMx2itemOutId,
			this.gridColumn14,
			this.gridColumn15});
			this.gvMx1.GridControl = this.gcMx1;
			this.gvMx1.Name = "gvMx1";
			this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
			@@ -1053,6 +1093,26 @@
			this.gvMx2itemOutId.Tag = "query_a.item_out_id";
			this.gvMx2itemOutId.Width = 94;
			//
			// gridColumn14
			//
			this.gridColumn14.Caption = "åå»ºäºº";
			this.gridColumn14.FieldName = "createBy";
			this.gridColumn14.MinWidth = 25;
			this.gridColumn14.Name = "gridColumn14";
			this.gridColumn14.Visible = true;
			this.gridColumn14.VisibleIndex = 12;
			this.gridColumn14.Width = 94;
			//
			// gridColumn15
			//
			this.gridColumn15.Caption = "åå»ºæ¶é´";
			this.gridColumn15.FieldName = "createDate";
			this.gridColumn15.MinWidth = 25;
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 13;
			this.gridColumn15.Width = 94;
			//
			// xtraTabPage3
			//
			this.xtraTabPage3.Controls.Add(this.gcMx2);
			@@ -1084,7 +1144,9 @@
			this.gvMx1depotCode,
			this.gvMx1depotSectionCode,
			this.gvMx1ebelnK3id,
			this.gvMx1lineK3id});
			this.gvMx1lineK3id,
			this.gridColumn16,
			this.gridColumn17});
			this.gvMx2.GridControl = this.gcMx2;
			this.gvMx2.Name = "gvMx2";
			this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
			@@ -1215,6 +1277,26 @@
			this.gvMx1lineK3id.VisibleIndex = 9;
			this.gvMx1lineK3id.Width = 94;
			//
			// gridColumn16
			//
			this.gridColumn16.Caption = "åå»ºäºº";
			this.gridColumn16.FieldName = "createBy";
			this.gridColumn16.MinWidth = 25;
			this.gridColumn16.Name = "gridColumn16";
			this.gridColumn16.Visible = true;
			this.gridColumn16.VisibleIndex = 10;
			this.gridColumn16.Width = 94;
			//
			// gridColumn17
			//
			this.gridColumn17.Caption = "åå»ºæ¶é´";
			this.gridColumn17.FieldName = "createDate";
			this.gridColumn17.MinWidth = 25;
			this.gridColumn17.Name = "gridColumn17";
			this.gridColumn17.Visible = true;
			this.gridColumn17.VisibleIndex = 11;
			this.gridColumn17.Width = 94;
			//
			// picCheckBox
			//
			this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
			@@ -1233,6 +1315,72 @@
			this.layoutControlItem4.Name = "layoutControlItem4";
			this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
			this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
			//
			// gridColumn18
			//
			this.gridColumn18.Caption = "ç³è¯·åå·";
			this.gridColumn18.FieldName = "sqdNo";
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Visible = true;
			this.gridColumn18.VisibleIndex = 16;
			this.gridColumn18.Width = 94;
			//
			// txt_sqdNo
			//
			this.txt_sqdNo.Location = new System.Drawing.Point(626, 76);
			this.txt_sqdNo.Name = "txt_sqdNo";
			this.txt_sqdNo.Size = new System.Drawing.Size(195, 24);
			this.txt_sqdNo.StyleController = this.layoutMx1;
			this.txt_sqdNo.TabIndex = 529;
			//
			// layoutControlItem13
			//
			this.layoutControlItem13.Control = this.txt_sqdNo;
			this.layoutControlItem13.Location = new System.Drawing.Point(542, 64);
			this.layoutControlItem13.Name = "layoutControlItem13";
			this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem13.Text = "ç³è¯·åå·";
			this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
			//
			// txt_createBy
			//
			this.txt_createBy.Location = new System.Drawing.Point(626, 12);
			this.txt_createBy.Name = "txt_createBy";
			this.txt_createBy.Size = new System.Drawing.Size(195, 24);
			this.txt_createBy.StyleController = this.layoutMx1;
			this.txt_createBy.TabIndex = 530;
			//
			// lab_createBy
			//
			this.lab_createBy.Control = this.txt_createBy;
			this.lab_createBy.Location = new System.Drawing.Point(542, 0);
			this.lab_createBy.Name = "lab_createBy";
			this.lab_createBy.OptionsTableLayoutItem.ColumnIndex = 2;
			this.lab_createBy.Size = new System.Drawing.Size(271, 32);
			this.lab_createBy.Text = "åå»ºäºº";
			this.lab_createBy.TextSize = new System.Drawing.Size(60, 18);
			//
			// txt_createDate
			//
			this.txt_createDate.Location = new System.Drawing.Point(626, 44);
			this.txt_createDate.Name = "txt_createDate";
			this.txt_createDate.Size = new System.Drawing.Size(195, 24);
			this.txt_createDate.StyleController = this.layoutMx1;
			this.txt_createDate.TabIndex = 531;
			//
			// layoutControlItem15
			//
			this.layoutControlItem15.Control = this.txt_createDate;
			this.layoutControlItem15.Location = new System.Drawing.Point(542, 32);
			this.layoutControlItem15.Name = "layoutControlItem15";
			this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem15.Text = "åå»ºæ¶é´";
			this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
			//
			// Frm_MesCgthSqDj
			//
			@@ -1274,6 +1422,8 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
			@@ -1285,8 +1435,6 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
			this.tabMx.ResumeLayout(false);
			this.tabMxPage2.ResumeLayout(false);
			@@ -1297,6 +1445,12 @@
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
			this.ResumeLayout(false);

			}
			@@ -1386,5 +1540,17 @@
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
			private DevExpress.XtraEditors.TextEdit txt_guid;
			private DevExpress.XtraLayout.LayoutControlItem lb_guid;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
			private DevExpress.XtraEditors.TextEdit txt_sqdNo;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
			private DevExpress.XtraEditors.TextEdit txt_createBy;
			private DevExpress.XtraEditors.TextEdit txt_createDate;
			private DevExpress.XtraLayout.LayoutControlItem lab_createBy;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
			}
			}

			@@ -558,19 +558,33 @@
			};
			try
			{
			var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
			var dd = UtilityHelper.ReturnToList(strReturn);
			var dt = dd.rtnData;
			var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			foreach (var a in _job["rtnData"]["list"])
			{
			array.Add(a);
			}
			DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
			gcMx2.BindingContext = new BindingContext();
			gcMx2.DataSource = dt;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			JArray array1 = new JArray();
			foreach (var a in _job["rtnData"]["list2"])
			{
			array1.Add(a);
			}
			DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
			gcMx3.BindingContext = new BindingContext();
			gcMx3.DataSource = dt1;
			gcMx3.ForceInitialize();
			gvMx3.BestFitColumns();
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("æç¤ºï¼" + ex.Message);
			}

			}

			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)

			@@ -34,6 +34,7 @@
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
			{
			@@ -412,9 +413,9 @@
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMx3.BindingContext = new BindingContext();
			gcMx3.DataSource = dt;
			gcMx3.ForceInitialize();
			gcMx4.BindingContext = new BindingContext();
			gcMx4.DataSource = dt;
			gcMx4.ForceInitialize();
			}
			else
			{
			@@ -439,13 +440,28 @@
			};
			try
			{
			var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
			var dd = UtilityHelper.ReturnToList(strReturn);
			var dt = dd.rtnData;
			var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			foreach (var a in _job["rtnData"]["list"])
			{
			array.Add(a);
			}
			DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
			gcMx2.BindingContext = new BindingContext();
			gcMx2.DataSource = dt;
			gcMx2.ForceInitialize();
			gvMx2.BestFitColumns();
			JArray array1 = new JArray();
			foreach (var a in _job["rtnData"]["list2"])
			{
			array1.Add(a);
			}
			DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
			gcMx4.BindingContext = new BindingContext();
			gcMx4.DataSource = dt1;
			gcMx4.ForceInitialize();
			gvMx4.BestFitColumns();
			}
			catch (Exception ex)
			{
			@@ -454,12 +470,12 @@
			}
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx3.FocusedRowHandle;
			var rowhandle = gvMx4.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			if (e.Button.Index == 0)
			{
			var dr = gvMx3.GetDataRow(rowhandle);
			var dr = gvMx4.GetDataRow(rowhandle);
			var mxGuid = dr["guid"].ToString();
			if (!MsgHelper.AskQuestion("ä½ éæ©äº1æ¡æ°æ®ï¼ç¡®å®å é¤åï¼"))
			return;
			@@ -471,7 +487,7 @@
			strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
			JsonConvert.SerializeObject(lst));
			var _rtn = UtilityHelper.ReturnToDynamic(strJson);
			if (_rtn.rtnCode > 0) gvMx3.DeleteRow(rowhandle);
			if (_rtn.rtnCode > 0) gvMx4.DeleteRow(rowhandle);
			MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg);
			}
			catch (Exception ex)
			@@ -482,14 +498,14 @@
			}
			private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx3.FocusedRowHandle;
			var rowhandle = gvMx4.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			if (e.Button.Index == 0)
			{
			try
			{
			var dr = gvMx3.GetDataRow(rowhandle);
			var dr = gvMx4.GetDataRow(rowhandle);
			var urlPath = dr["urlPath"].ToString();
			Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
			frm.ShowDialog();
			@@ -503,14 +519,14 @@

			private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			var rowhandle = gvMx3.FocusedRowHandle;
			var rowhandle = gvMx4.FocusedRowHandle;
			if (rowhandle < 0)
			return;
			if (e.Button.Index == 0)
			{
			try
			{
			var dr = gvMx3.GetDataRow(rowhandle);
			var dr = gvMx4.GetDataRow(rowhandle);
			var urlPath = dr["urlPath"].ToString();
			using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
			{

			@@ -142,13 +142,13 @@
			gcMx1.DataSource = dt;
			gcMx1.ForceInitialize();
			gvMx1.BestFitColumns();
			gvMx1.Columns["guid"].Visible = false;
			gvMx1.Columns["parentGuid"].Visible = false;
			}
			else
			{
			Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			}
			gvMx1.Columns["guid"].Visible = false;
			gvMx1.Columns["parentGuid"].Visible = false;
			}
			else
			ToolBox.MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg);

			@@ -138,6 +138,8 @@
			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			@@ -1031,6 +1033,8 @@
			this.gridColumn7,
			this.gvMx1memo,
			this.gridColumn10,
			this.gridColumn12,
			this.gridColumn13,
			this.gvBtnAlawys,
			this.gvMxDel});
			this.gvMx1.GridControl = this.gcMx1;
			@@ -1344,7 +1348,7 @@
			this.gvBtnAlawys.MinWidth = 80;
			this.gvBtnAlawys.Name = "gvBtnAlawys";
			this.gvBtnAlawys.Visible = true;
			this.gvBtnAlawys.VisibleIndex = 17;
			this.gvBtnAlawys.VisibleIndex = 19;
			this.gvBtnAlawys.Width = 80;
			//
			// repositoryItemButtonEdit2
			@@ -1358,6 +1362,26 @@
			this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
			this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
			//
			// gridColumn12
			//
			this.gridColumn12.Caption = "élææ¶é´";
			this.gridColumn12.FieldName = "returnDate";
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 17;
			this.gridColumn12.Width = 94;
			//
			// gridColumn13
			//
			this.gridColumn13.Caption = "éæäºº";
			this.gridColumn13.FieldName = "returnBy";
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 18;
			this.gridColumn13.Width = 94;
			//
			// gvMxDel
			//
			this.gvMxDel.Caption = "ç§»åº";
			@@ -1365,7 +1389,7 @@
			this.gvMxDel.MinWidth = 80;
			this.gvMxDel.Name = "gvMxDel";
			this.gvMxDel.Visible = true;
			this.gvMxDel.VisibleIndex = 18;
			this.gvMxDel.VisibleIndex = 20;
			this.gvMxDel.Width = 80;
			//
			// repositoryItemButtonEdit1
			@@ -1554,5 +1578,7 @@
			private DevExpress.XtraEditors.TextEdit txt_guid;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
			}
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,91 @@
			ï»¿namespace Gs.DevApp.DevFrm.Sys
			{
			partial class EasyRptEdt
			{
			/// <summary>
			/// Required designer variable.
			/// </summary>
			private System.ComponentModel.IContainer components = null;

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

			#region Windows Form Designer generated code

			/// <summary>
			/// Required method for Designer support - do not modify
			/// the contents of this method with the code editor.
			/// </summary>
			private void InitializeComponent()
			{
			this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
			((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
			this.splitMx1.Panel1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
			this.splitMx1.SuspendLayout();
			this.SuspendLayout();
			//
			// splitMx1
			//
			this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.splitMx1.Horizontal = false;
			this.splitMx1.Location = new System.Drawing.Point(0, 0);
			this.splitMx1.Name = "splitMx1";
			//
			// splitMx1.Panel1
			//
			this.splitMx1.Panel1.Controls.Add(this.flowLayoutPanel1);
			this.splitMx1.Panel1.Text = "Panel1";
			//
			// splitMx1.Panel2
			//
			this.splitMx1.Panel2.Text = "Panel2";
			this.splitMx1.Size = new System.Drawing.Size(918, 623);
			this.splitMx1.SplitterPosition = 593;
			this.splitMx1.TabIndex = 0;
			//
			// flowLayoutPanel1
			//
			this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
			this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
			this.flowLayoutPanel1.Name = "flowLayoutPanel1";
			this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(100);
			this.flowLayoutPanel1.Size = new System.Drawing.Size(918, 593);
			this.flowLayoutPanel1.TabIndex = 1;
			//
			// EasyRptEdt
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
			this.ClientSize = new System.Drawing.Size(918, 623);
			this.Controls.Add(this.splitMx1);
			this.Name = "EasyRptEdt";
			this.Text = "EasyRptEdt";
			((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
			this.splitMx1.Panel1.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
			this.splitMx1.ResumeLayout(false);
			this.ResumeLayout(false);

			}

			#endregion

			private DevExpress.XtraEditors.SplitContainerControl splitMx1;
			private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
			}
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,57 @@
			ï»¿using DevExpress.XtraEditors;
			using Gs.DevApp.Entity;
			using Gs.DevApp.ToolBox;
			using Newtonsoft.Json;
			using System;
			using System.Collections.Generic;
			using System.ComponentModel;
			using System.Data;
			using System.Drawing;
			using System.Linq;
			using System.Text;
			using System.Threading.Tasks;
			using System.Windows.Forms;

			namespace Gs.DevApp.DevFrm.Sys
			{
			public partial class EasyRptEdt : DevExpress.XtraEditors.XtraForm
			{
			public EasyRptEdt()
			{
			InitializeComponent();
			GetList();
			}

			private void GetList()
			{
			var _obj = new
			{

			};
			var strReturn = "";
			try
			{
			strReturn = UtilityHelper.HttpPost("", "Report/GetTemplateList",
			JsonConvert.SerializeObject(_obj));
			ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
			DataTable dt = dd.rtnData;
			foreach (DataRow row in dt.Rows)
			{
			SimpleButton btn = new DevExpress.XtraEditors.SimpleButton();
			btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32;
			btn.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
			btn.Name = Guid.NewGuid().ToString();
			btn.Size = new System.Drawing.Size(150, 150);
			btn.TabIndex = 1;
			btn.Text = row["reportName"].ToString()+"(" + row["reportType"].ToString() + ")";
			btn.Margin = new System.Windows.Forms.Padding(20);
			this.flowLayoutPanel1.Controls.Add(btn);
			}
			}
			catch (Exception ex)
			{
			MsgHelper.Warning("æç¤ºï¼" + ex.Message);
			}
			}
			}
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,120 @@
			ï»¿<?xml version="1.0" encoding="utf-8"?>
			<root>
			<!--
			Microsoft ResX Schema

			Version 2.0

			The primary goals of this format is to allow a simple XML format
			that is mostly human readable. The generation and parsing of the
			various data types are done through the TypeConverter classes
			associated with the data types.

			Example:

			... ado.net/XML headers & schema ...
			<resheader name="resmimetype">text/microsoft-resx</resheader>
			<resheader name="version">2.0</resheader>
			<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
			<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
			<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
			<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
			<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
			<value>[base64 mime encoded serialized .NET Framework object]</value>
			</data>
			<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
			<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
			<comment>This is a comment</comment>
			</data>

			There are any number of "resheader" rows that contain simple
			name/value pairs.

			Each data row contains a name, and value. The row also contains a
			type or mimetype. Type corresponds to a .NET class that support
			text/value conversion through the TypeConverter architecture.
			Classes that don't support this are serialized and stored with the
			mimetype set.

			The mimetype is used for serialized objects, and tells the
			ResXResourceReader how to depersist the object. This is currently not
			extensible. For a given mimetype the value must be set accordingly:

			Note - application/x-microsoft.net.object.binary.base64 is the format
			that the ResXResourceWriter will generate, however the reader can
			read any of the formats listed below.

			mimetype: application/x-microsoft.net.object.binary.base64
			value : The object must be serialized with
			: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
			: and then encoded with base64 encoding.

			mimetype: application/x-microsoft.net.object.soap.base64
			value : The object must be serialized with
			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
			: and then encoded with base64 encoding.

			mimetype: application/x-microsoft.net.object.bytearray.base64
			value : The object must be serialized into a byte array
			: using a System.ComponentModel.TypeConverter
			: and then encoded with base64 encoding.
			-->
			<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
			<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
			<xsd:element name="root" msdata:IsDataSet="true">
			<xsd:complexType>
			<xsd:choice maxOccurs="unbounded">
			<xsd:element name="metadata">
			<xsd:complexType>
			<xsd:sequence>
			<xsd:element name="value" type="xsd:string" minOccurs="0" />
			</xsd:sequence>
			<xsd:attribute name="name" use="required" type="xsd:string" />
			<xsd:attribute name="type" type="xsd:string" />
			<xsd:attribute name="mimetype" type="xsd:string" />
			<xsd:attribute ref="xml:space" />
			</xsd:complexType>
			</xsd:element>
			<xsd:element name="assembly">
			<xsd:complexType>
			<xsd:attribute name="alias" type="xsd:string" />
			<xsd:attribute name="name" type="xsd:string" />
			</xsd:complexType>
			</xsd:element>
			<xsd:element name="data">
			<xsd:complexType>
			<xsd:sequence>
			<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
			<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
			</xsd:sequence>
			<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
			<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
			<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
			<xsd:attribute ref="xml:space" />
			</xsd:complexType>
			</xsd:element>
			<xsd:element name="resheader">
			<xsd:complexType>
			<xsd:sequence>
			<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
			</xsd:sequence>
			<xsd:attribute name="name" type="xsd:string" use="required" />
			</xsd:complexType>
			</xsd:element>
			</xsd:choice>
			</xsd:complexType>
			</xsd:element>
			</xsd:schema>
			<resheader name="resmimetype">
			<value>text/microsoft-resx</value>
			</resheader>
			<resheader name="version">
			<value>2.0</value>
			</resheader>
			<resheader name="reader">
			<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
			</resheader>
			<resheader name="writer">
			<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
			</resheader>
			</root>

			@@ -365,9 +365,6 @@
			</Compile>
			<Compile Include="DevFrm\QC\Models\MesDefectCode.cs" />
			<Compile Include="DevFrm\QC\Models\MesDefectType.cs" />
			<Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
			<Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
			<Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
			<Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
			<Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
			<Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
			@@ -417,6 +414,12 @@
			</Compile>
			<Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.Designer.cs">
			<DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
			</Compile>
			<Compile Include="DevFrm\Sys\EasyRptEdt.cs">
			<SubType>Form</SubType>
			</Compile>
			<Compile Include="DevFrm\Sys\EasyRptEdt.Designer.cs">
			<DependentUpon>EasyRptEdt.cs</DependentUpon>
			</Compile>
			<Compile Include="DevFrm\User\ViewRole.cs">
			<SubType>Form</SubType>
			@@ -1150,6 +1153,9 @@
			<EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNotice.resx">
			<DependentUpon>Frm_SalesReturnNotice.cs</DependentUpon>
			</EmbeddedResource>
			<EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
			<DependentUpon>EasyRptEdt.cs</DependentUpon>
			</EmbeddedResource>
			<EmbeddedResource Include="DevFrm\User\ViewRole.resx">
			<DependentUpon>ViewRole.cs</DependentUpon>
			</EmbeddedResource>
			@@ -1643,6 +1649,10 @@
			<None Include="Resources\upload_16x16.png" />
			<None Include="Resources\editname_32x321.png" />
			<None Include="Resources\refresh_16x16.png" />
			<None Include="Resources\dafualtfax_32x32.png" />
			<None Include="Resources\defaultprinter_32x32.png" />
			<None Include="Resources\printarea_32x32.png" />
			<None Include="Resources\defaultprinter.svg" />
			<Content Include="Resources\user_16x16.png" />
			</ItemGroup>
			<ItemGroup />

			@@ -38,7 +38,7 @@
			/// </summary>
			private static void _startLogin()
			{
			//Application.Run(new XtraForm1());
			//Application.Run(new Gs.DevApp.TestForm.test());
			//return;
			CefSettings settings = new CefSettings();
			settings.Locale = "zh-CN";

			@@ -623,6 +623,36 @@
			/// <summary>
			/// æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
			/// </summary>
			internal static System.Drawing.Bitmap dafualtfax_32x32 {
			get {
			object obj = ResourceManager.GetObject("dafualtfax_32x32", resourceCulture);
			return ((System.Drawing.Bitmap)(obj));
			}
			}

			/// <summary>
			/// æ¥æ¾ DevExpress.Utils.Svg.SvgImage ç±»åçæ¬å°åèµæºã
			/// </summary>
			internal static DevExpress.Utils.Svg.SvgImage defaultprinter {
			get {
			object obj = ResourceManager.GetObject("defaultprinter", resourceCulture);
			return ((DevExpress.Utils.Svg.SvgImage)(obj));
			}
			}

			/// <summary>
			/// æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
			/// </summary>
			internal static System.Drawing.Bitmap defaultprinter_32x32 {
			get {
			object obj = ResourceManager.GetObject("defaultprinter_32x32", resourceCulture);
			return ((System.Drawing.Bitmap)(obj));
			}
			}

			/// <summary>
			/// æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
			/// </summary>
			internal static System.Drawing.Bitmap deletelist2_16x16 {
			get {
			object obj = ResourceManager.GetObject("deletelist2_16x16", resourceCulture);
			@@ -1373,6 +1403,16 @@
			/// <summary>
			/// æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
			/// </summary>
			internal static System.Drawing.Bitmap printarea_32x32 {
			get {
			object obj = ResourceManager.GetObject("printarea_32x32", resourceCulture);
			return ((System.Drawing.Bitmap)(obj));
			}
			}

			/// <summary>
			/// æ¥æ¾ System.Drawing.Bitmap ç±»åçæ¬å°åèµæºã
			/// </summary>
			internal static System.Drawing.Bitmap printernetwork_16x16 {
			get {
			object obj = ResourceManager.GetObject("printernetwork_16x16", resourceCulture);

			@@ -1,14 +1,15 @@
			DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
			DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,18 @@
			ï»¿<?xml version='1.0' encoding='UTF-8'?>
			<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
			<style type="text/css">
			.Black{fill:#727272;}
			.Yellow{fill:#FFB115;}
			.Blue{fill:#1177D7;}
			.Red{fill:#D11C1C;}
			.White{fill:#FFFFFF;}
			.Green{fill:#039C23;}
			.st0{fill:#727272;}
			.st1{opacity:0.5;}
			.st2{opacity:0.75;}
			</style>
			<g id="DefaultPrinter">
			<path d="M8,16H6V6h8v2H8V16z M26,18v8c0,1.1-0.9,2-2,2h-4v4H6v-4H2c-1.1,0-2-0.9-2-2V16c0-1.1,0.9-2,2-2h2v3 c0,0.6,0.4,1,1,1H26z M18,22H8v8h10V22z" class="Black" />
			<path d="M31,0H17c-0.5,0-1,0.5-1,1v14c0,0.5,0.5,1,1,1h14c0.5,0,1-0.5,1-1V1C32,0.5,31.5,0,31,0z M30,5l-8,8l-4-4V6 l4,4l8-8V5z" class="Green" />
			</g>
			</svg>

			@@ -409,7 +409,13 @@
			if (colType is CheckEdit)
			{
			var txt = colType as CheckEdit;
			if (txt != null)
			if (_isRead(txt.Tag))
			{
			txt.ReadOnly = true;
			}
			else
			txt.ReadOnly = isEdt;
			if (txt != null) {
			switch (strVal)
			{
			case "True":
			@@ -425,8 +431,8 @@
			txt.Checked = false;
			break;
			}
			}

			txt.ReadOnly = isEdt;
			continue;
			}
			//åé
			@@ -452,6 +458,7 @@
			txt.Enabled = !isEdt;
			continue;
			}

			//æ¶é´
			if (colType is DateTimePicker)
			{
			@@ -797,7 +804,6 @@
			else
			txt.ReadOnly = isEdt;
			continue;

			}
			//èªå®ä¹ä»åº
			if (ctrl is UcLookCk)

			@@ -382,9 +382,9 @@
			//
			// btnIn
			//
			this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
			this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
			this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
			this.btnIn.Location = new System.Drawing.Point(2, 2);
			this.btnIn.Location = new System.Drawing.Point(1028, 2);
			this.btnIn.Name = "btnIn";
			this.btnIn.Size = new System.Drawing.Size(94, 39);
			this.btnIn.TabIndex = 4;
			@@ -393,8 +393,8 @@
			// pageBar1
			//
			this.pageBar1.CurrentPage = 1;
			this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
			this.pageBar1.Location = new System.Drawing.Point(138, 2);
			this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
			this.pageBar1.Location = new System.Drawing.Point(2, 2);
			this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
			this.pageBar1.Name = "pageBar1";
			this.pageBar1.RecordCount = 0;

			@@ -28,11 +28,14 @@
			/// </summary>
			private void InitializeComponent()
			{
			this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
			this.label1 = new System.Windows.Forms.Label();
			this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
			this.gcMain = new DevExpress.XtraGrid.GridControl();
			this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -44,30 +47,58 @@
			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
			this.btnIn = new DevExpress.XtraEditors.SimpleButton();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
			this.panelControl3.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
			this.panelControl1.SuspendLayout();
			this.SuspendLayout();
			//
			// panelControl3
			//
			this.panelControl3.Controls.Add(this.label1);
			this.panelControl3.Controls.Add(this.radioGroup1);
			this.panelControl3.Dock = System.Windows.Forms.DockStyle.Top;
			this.panelControl3.Location = new System.Drawing.Point(0, 0);
			this.panelControl3.Name = "panelControl3";
			this.panelControl3.Size = new System.Drawing.Size(1128, 38);
			this.panelControl3.TabIndex = 7;
			//
			// label1
			//
			this.label1.AutoSize = true;
			this.label1.Location = new System.Drawing.Point(54, 11);
			this.label1.Name = "label1";
			this.label1.Size = new System.Drawing.Size(128, 18);
			this.label1.TabIndex = 1;
			this.label1.Text = "éæ©éè´åç±»åï¼";
			//
			// radioGroup1
			//
			this.radioGroup1.EditValue = ((short)(0));
			this.radioGroup1.Location = new System.Drawing.Point(189, 4);
			this.radioGroup1.Name = "radioGroup1";
			this.radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
			new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(0)), "éè´"),
			new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(1)), "å§å¤")});
			this.radioGroup1.Size = new System.Drawing.Size(197, 34);
			this.radioGroup1.TabIndex = 0;
			//
			// gcMain
			//
			this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
			this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gcMain.Location = new System.Drawing.Point(0, 0);
			this.gcMain.Location = new System.Drawing.Point(0, 38);
			this.gcMain.MainView = this.gridView1;
			this.gcMain.Name = "gcMain";
			this.gcMain.Size = new System.Drawing.Size(1126, 607);
			this.gcMain.TabIndex = 1;
			this.gcMain.Size = new System.Drawing.Size(1128, 601);
			this.gcMain.TabIndex = 8;
			this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
			this.gridView1});
			//
			@@ -80,7 +111,6 @@
			this.gridView1.ColumnPanelRowHeight = 50;
			this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gv_guid,
			this.gv_chk,
			this.gridColumn3,
			this.gridColumn4,
			this.gv_billNo,
			@@ -93,11 +123,14 @@
			this.gv_purchaseUnit,
			this.gridColumn10,
			this.gridColumn2,
			this.gridColumn1});
			this.gridColumn1,
			this.gridColumn8});
			this.gridView1.GridControl = this.gcMain;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			this.gridView1.OptionsFind.ShowSearchNavButtons = false;
			this.gridView1.OptionsSelection.MultiSelect = true;
			this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
			this.gridView1.OptionsView.ShowAutoFilterRow = true;
			this.gridView1.OptionsView.ShowGroupPanel = false;
			//
			@@ -114,18 +147,6 @@
			this.gv_guid.Tag = "query_a.guid";
			this.gv_guid.Width = 94;
			//
			// gv_chk
			//
			this.gv_chk.Caption = "éæ©";
			this.gv_chk.FieldName = "gvChk";
			this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
			this.gv_chk.MaxWidth = 50;
			this.gv_chk.MinWidth = 50;
			this.gv_chk.Name = "gv_chk";
			this.gv_chk.Visible = true;
			this.gv_chk.VisibleIndex = 0;
			this.gv_chk.Width = 50;
			//
			// gridColumn3
			//
			this.gridColumn3.Caption = "å§å¤æ è¯";
			@@ -137,6 +158,16 @@
			this.gridColumn3.Visible = true;
			this.gridColumn3.VisibleIndex = 1;
			this.gridColumn3.Width = 50;
			//
			// gridColumn4
			//
			this.gridColumn4.Caption = "å¥åºåå·";
			this.gridColumn4.FieldName = "invBillNo";
			this.gridColumn4.MinWidth = 25;
			this.gridColumn4.Name = "gridColumn4";
			this.gridColumn4.Visible = true;
			this.gridColumn4.VisibleIndex = 2;
			this.gridColumn4.Width = 94;
			//
			// gv_billNo
			//
			@@ -270,40 +301,21 @@
			this.gridColumn1.OptionsColumn.ReadOnly = true;
			this.gridColumn1.Width = 94;
			//
			// xtraTabControl1
			//
			this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
			this.xtraTabControl1.Name = "xtraTabControl1";
			this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
			this.xtraTabControl1.Size = new System.Drawing.Size(1128, 682);
			this.xtraTabControl1.TabIndex = 3;
			this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
			this.xtraTabPage1});
			//
			// xtraTabPage1
			//
			this.xtraTabPage1.Controls.Add(this.gcMain);
			this.xtraTabPage1.Controls.Add(this.panelControl1);
			this.xtraTabPage1.Name = "xtraTabPage1";
			this.xtraTabPage1.Size = new System.Drawing.Size(1126, 650);
			this.xtraTabPage1.Text = "è¯·éæ©ééè¦éè´§çæç»";
			//
			// panelControl1
			//
			this.panelControl1.Controls.Add(this.btnIn);
			this.panelControl1.Controls.Add(this.pageBar1);
			this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
			this.panelControl1.Location = new System.Drawing.Point(0, 607);
			this.panelControl1.Location = new System.Drawing.Point(0, 639);
			this.panelControl1.Name = "panelControl1";
			this.panelControl1.Size = new System.Drawing.Size(1126, 43);
			this.panelControl1.TabIndex = 4;
			this.panelControl1.Size = new System.Drawing.Size(1128, 43);
			this.panelControl1.TabIndex = 9;
			//
			// btnIn
			//
			this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
			this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
			this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
			this.btnIn.Location = new System.Drawing.Point(2, 2);
			this.btnIn.Location = new System.Drawing.Point(1032, 2);
			this.btnIn.Name = "btnIn";
			this.btnIn.Size = new System.Drawing.Size(94, 39);
			this.btnIn.TabIndex = 4;
			@@ -312,8 +324,8 @@
			// pageBar1
			//
			this.pageBar1.CurrentPage = 1;
			this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
			this.pageBar1.Location = new System.Drawing.Point(140, 2);
			this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
			this.pageBar1.Location = new System.Drawing.Point(2, 2);
			this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
			this.pageBar1.Name = "pageBar1";
			this.pageBar1.RecordCount = 0;
			@@ -321,22 +333,24 @@
			this.pageBar1.TabIndex = 3;
			this.pageBar1.TotalPages = 0;
			//
			// gridColumn4
			// gridColumn8
			//
			this.gridColumn4.Caption = "å¥åºåå·";
			this.gridColumn4.FieldName = "invBillNo";
			this.gridColumn4.MinWidth = 25;
			this.gridColumn4.Name = "gridColumn4";
			this.gridColumn4.Visible = true;
			this.gridColumn4.VisibleIndex = 2;
			this.gridColumn4.Width = 94;
			this.gridColumn8.Caption = "åæ®ç±»å";
			this.gridColumn8.FieldName = "inType";
			this.gridColumn8.MinWidth = 25;
			this.gridColumn8.Name = "gridColumn8";
			this.gridColumn8.Visible = true;
			this.gridColumn8.VisibleIndex = 12;
			this.gridColumn8.Width = 94;
			//
			// SelectMesCgthSq
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
			this.ClientSize = new System.Drawing.Size(1128, 682);
			this.Controls.Add(this.xtraTabControl1);
			this.Controls.Add(this.gcMain);
			this.Controls.Add(this.panelControl1);
			this.Controls.Add(this.panelControl3);
			this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
			this.MaximizeBox = false;
			this.MinimizeBox = false;
			@@ -344,38 +358,41 @@
			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
			this.Text = "éæ©éè´§æç»";
			this.TopMost = true;
			((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit();
			this.panelControl3.ResumeLayout(false);
			this.panelControl3.PerformLayout();
			((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
			this.xtraTabControl1.ResumeLayout(false);
			this.xtraTabPage1.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
			this.panelControl1.ResumeLayout(false);
			this.ResumeLayout(false);

			}
			#endregion

			private DevExpress.XtraEditors.PanelControl panelControl3;
			private System.Windows.Forms.Label label1;
			private DevExpress.XtraEditors.RadioGroup radioGroup1;
			private DevExpress.XtraGrid.GridControl gcMain;
			private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
			private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
			private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
			private UserControls.Data.UcPageBar pageBar1;
			private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
			private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
			private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
			private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
			private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
			private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
			private DevExpress.XtraEditors.PanelControl panelControl1;
			private DevExpress.XtraEditors.SimpleButton btnIn;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
			private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
			private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
			private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
			private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
			private DevExpress.XtraEditors.PanelControl panelControl1;
			private DevExpress.XtraEditors.SimpleButton btnIn;
			private UserControls.Data.UcPageBar pageBar1;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
			}
			}

			@@ -21,19 +21,18 @@
			private readonly string _webServiceName = "MesCgthSqManager/";
			private string suppId = "";
			private string receiveOrgId = "";
			private string isWw = "";
			/// <summary>
			///
			/// </summary>
			/// <param name="_suppId">ä¾åºåç¼å· </param>
			/// <param name="_receiveOrgId">ç»ç»ç¼å·</param>
			/// <param name="_isWw">2ä¸ºå§å¤ï¼1ä¸ºéè´</param>
			public SelectMesCgthSq(string _suppId, string _receiveOrgId, string _isWw)
			public SelectMesCgthSq(string _suppId, string _receiveOrgId)
			{
			InitializeComponent();
			radioGroup1.SelectedIndex = 0;
			this.suppId = _suppId;
			this.receiveOrgId = _receiveOrgId;
			this.isWw = _isWw;
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
			{
			@@ -43,19 +42,20 @@
			btnIn.Click += (s, e) =>
			{
			var list = new List<string>();
			for (var i = 0; i < gridView1.DataRowCount; i++)
			int[] rows = this.gridView1.GetSelectedRows();//åè·åéæ©è¡çè¡å·
			DataTable dt = this.gcMain.DataSource as DataTable;//å¾å°GridControlçæ°æ®æº
			foreach (int idx in rows)
			{
			var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
			if (checkBox == "Checked")
			{
			var _guid = gridView1.GetRowCellValue(i, "guid")
			.ToString();
			string _guid = dt.Rows[idx]["guid"].ToString();
			list.Add(_guid);
			}
			}
			UpdateParent?.Invoke(this,
			new UpdateParentEventArgs { StringList = list });
			Close();
			};
			radioGroup1.SelectedIndexChanged += (s, e) =>
			{
			getPageList(1, UtilityHelper.GetPageSize());
			};
			}

			@@ -86,7 +86,8 @@
			everyPageSize = pageSize,
			sortName = "",
			keyWhere = "",
			inIsWw = this.isWw,
			// inIsWw = this.isWw,
			inIsWw = (radioGroup1.SelectedIndex),//0æ¯éè´ï¼1æ¯å§å¤
			inSupId = this.suppId,
			inReceiveOrgId = this.receiveOrgId,
			};