From 8d35329ba4acfdb702587eb9b624e320b37ecb4a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 21 六月 2025 17:09:25 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx        |  123 ++++
 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs | 1040 +++++++++++++++++++++++++++++++++++
 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs          |  569 +++++++++++++++++++
 3 files changed, 1,730 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
index 890e6fa..a0152c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
@@ -29,10 +29,1046 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark = 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();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_fabm = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_bz = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkBy = 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.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1mid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.txt_famc = new DevExpress.XtraEditors.TextEdit();
+            this.txt_bzqx = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fjxz = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yjrq = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((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.Panel2.SuspendLayout();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fabm.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_bz.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.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.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+            this.tabMx.SuspendLayout();
+            this.tabMxPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fjxz.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yjrq.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1126, 570);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn1,
+            this.gv_status,
+            this.gv_isFinish,
+            this.gv_isOut,
+            this.gv_billNo,
+            this.gv_lastUpdateUser,
+            this.gv_lastUpdateTime,
+            this.gv_checkUser,
+            this.gv_checkDate,
+            this.gv_returnMethod,
+            this.gv_returnType,
+            this.gv_depotId,
+            this.gv_suppId,
+            this.gv_remark,
+            this.gridColumn7});
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "閫�璐х粍缁�";
+            this.gridColumn1.FieldName = "receivingOrg";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Tag = "org.fnamber";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 0;
+            this.gridColumn1.Width = 250;
+            // 
+            // gv_status
+            // 
+            this.gv_status.AppearanceCell.Options.UseFont = true;
+            this.gv_status.Caption = "瀹℃牳鐘舵��";
+            this.gv_status.FieldName = "status";
+            this.gv_status.MaxWidth = 50;
+            this.gv_status.MinWidth = 50;
+            this.gv_status.Name = "gv_status";
+            this.gv_status.OptionsColumn.AllowEdit = false;
+            this.gv_status.Tag = "query_a.STATUS";
+            this.gv_status.Visible = true;
+            this.gv_status.VisibleIndex = 1;
+            this.gv_status.Width = 50;
+            // 
+            // gv_isFinish
+            // 
+            this.gv_isFinish.AppearanceCell.Options.UseFont = true;
+            this.gv_isFinish.Caption = "鏄惁瀹屾垚";
+            this.gv_isFinish.FieldName = "isFinish";
+            this.gv_isFinish.MaxWidth = 50;
+            this.gv_isFinish.MinWidth = 50;
+            this.gv_isFinish.Name = "gv_isFinish";
+            this.gv_isFinish.OptionsColumn.AllowEdit = false;
+            this.gv_isFinish.Tag = "query_a.IS_FINISH";
+            this.gv_isFinish.Width = 50;
+            // 
+            // gv_isOut
+            // 
+            this.gv_isOut.AppearanceCell.Options.UseFont = true;
+            this.gv_isOut.Caption = "濮斿鏍囪瘑";
+            this.gv_isOut.FieldName = "isOut";
+            this.gv_isOut.MaxWidth = 50;
+            this.gv_isOut.MinWidth = 50;
+            this.gv_isOut.Name = "gv_isOut";
+            this.gv_isOut.OptionsColumn.AllowEdit = false;
+            this.gv_isOut.Tag = "query_a.IS_OUT";
+            this.gv_isOut.Visible = true;
+            this.gv_isOut.VisibleIndex = 2;
+            this.gv_isOut.Width = 50;
+            // 
+            // gv_billNo
+            // 
+            this.gv_billNo.AppearanceCell.Options.UseFont = true;
+            this.gv_billNo.Caption = "鍗曟嵁缂栫爜";
+            this.gv_billNo.FieldName = "billNo";
+            this.gv_billNo.Name = "gv_billNo";
+            this.gv_billNo.OptionsColumn.AllowEdit = false;
+            this.gv_billNo.Tag = "query_a.BILL_NO";
+            this.gv_billNo.Visible = true;
+            this.gv_billNo.VisibleIndex = 3;
+            this.gv_billNo.Width = 120;
+            // 
+            // gv_lastUpdateUser
+            // 
+            this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
+            this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
+            this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
+            this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
+            this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
+            this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
+            this.gv_lastUpdateUser.Visible = true;
+            this.gv_lastUpdateUser.VisibleIndex = 4;
+            this.gv_lastUpdateUser.Width = 94;
+            // 
+            // gv_lastUpdateTime
+            // 
+            this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
+            this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
+            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
+            this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
+            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
+            this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
+            this.gv_lastUpdateTime.Visible = true;
+            this.gv_lastUpdateTime.VisibleIndex = 5;
+            this.gv_lastUpdateTime.Width = 180;
+            // 
+            // gv_checkUser
+            // 
+            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+            this.gv_checkUser.Caption = "瀹℃牳浜� ";
+            this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.Name = "gv_checkUser";
+            this.gv_checkUser.OptionsColumn.AllowEdit = false;
+            this.gv_checkUser.Tag = "query_a.CHECK_USER";
+            this.gv_checkUser.Visible = true;
+            this.gv_checkUser.VisibleIndex = 6;
+            this.gv_checkUser.Width = 94;
+            // 
+            // gv_checkDate
+            // 
+            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+            this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
+            this.gv_checkDate.FieldName = "checkDate";
+            this.gv_checkDate.Name = "gv_checkDate";
+            this.gv_checkDate.OptionsColumn.AllowEdit = false;
+            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
+            this.gv_checkDate.Visible = true;
+            this.gv_checkDate.VisibleIndex = 7;
+            this.gv_checkDate.Width = 94;
+            // 
+            // gv_returnMethod
+            // 
+            this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
+            this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
+            this.gv_returnMethod.FieldName = "returnMethod";
+            this.gv_returnMethod.Name = "gv_returnMethod";
+            this.gv_returnMethod.OptionsColumn.AllowEdit = false;
+            this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
+            this.gv_returnMethod.Visible = true;
+            this.gv_returnMethod.VisibleIndex = 8;
+            this.gv_returnMethod.Width = 94;
+            // 
+            // gv_returnType
+            // 
+            this.gv_returnType.AppearanceCell.Options.UseFont = true;
+            this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
+            this.gv_returnType.FieldName = "returnType";
+            this.gv_returnType.Name = "gv_returnType";
+            this.gv_returnType.OptionsColumn.AllowEdit = false;
+            this.gv_returnType.Tag = "query_a.RETURN_TYPE";
+            this.gv_returnType.Visible = true;
+            this.gv_returnType.VisibleIndex = 9;
+            this.gv_returnType.Width = 94;
+            // 
+            // gv_depotId
+            // 
+            this.gv_depotId.AppearanceCell.Options.UseFont = true;
+            this.gv_depotId.Caption = "浠撳簱";
+            this.gv_depotId.FieldName = "dptName";
+            this.gv_depotId.Name = "gv_depotId";
+            this.gv_depotId.OptionsColumn.AllowEdit = false;
+            this.gv_depotId.Tag = "query_a.DEPOT_ID";
+            this.gv_depotId.Visible = true;
+            this.gv_depotId.VisibleIndex = 10;
+            this.gv_depotId.Width = 94;
+            // 
+            // gv_suppId
+            // 
+            this.gv_suppId.AppearanceCell.Options.UseFont = true;
+            this.gv_suppId.Caption = "渚涘簲鍟�";
+            this.gv_suppId.FieldName = "supName";
+            this.gv_suppId.Name = "gv_suppId";
+            this.gv_suppId.OptionsColumn.AllowEdit = false;
+            this.gv_suppId.Tag = "query_a.SUPP_ID";
+            this.gv_suppId.Visible = true;
+            this.gv_suppId.VisibleIndex = 11;
+            this.gv_suppId.Width = 94;
+            // 
+            // gv_remark
+            // 
+            this.gv_remark.AppearanceCell.Options.UseFont = true;
+            this.gv_remark.Caption = "鐢宠澶囨敞";
+            this.gv_remark.FieldName = "remark";
+            this.gv_remark.Name = "gv_remark";
+            this.gv_remark.OptionsColumn.AllowEdit = false;
+            this.gv_remark.Tag = "query_a.REMARK";
+            this.gv_remark.Visible = true;
+            this.gv_remark.VisibleIndex = 12;
+            this.gv_remark.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "涓婚敭GUID";
+            this.gridColumn7.FieldName = "guid";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Width = 94;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Text = "鏁版嵁璇︽儏";
+            // 
+            // 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.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Controls.Add(this.tabMx);
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+            this.splitMx1.SplitterPosition = 111;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.txt_checkStatus);
+            this.layoutMx1.Controls.Add(this.btnSelect);
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_fabm);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_bz);
+            this.layoutMx1.Controls.Add(this.txt_checkBy);
+            this.layoutMx1.Controls.Add(this.txt_guid);
+            this.layoutMx1.Controls.Add(this.txt_famc);
+            this.layoutMx1.Controls.Add(this.txt_bzqx);
+            this.layoutMx1.Controls.Add(this.txt_fjxz);
+            this.layoutMx1.Controls.Add(this.txt_yjrq);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem17,
+            this.layoutControlItem13});
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 111);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            this.btnSelect.Location = new System.Drawing.Point(12, 74);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(116, 27);
+            this.btnSelect.StyleController = this.layoutMx1;
+            this.btnSelect.TabIndex = 525;
+            this.btnSelect.Text = "閫夋嫨鐗╂枡鏄庣粏";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(840, 114);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(274, 30);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_fabm
+            // 
+            this.txt_fabm.Location = new System.Drawing.Point(111, 12);
+            this.txt_fabm.Name = "txt_fabm";
+            this.txt_fabm.Properties.Appearance.Options.UseFont = true;
+            this.txt_fabm.Size = new System.Drawing.Size(168, 24);
+            this.txt_fabm.StyleController = this.layoutMx1;
+            this.txt_fabm.TabIndex = 211;
+            this.txt_fabm.Tag = "readonly";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(924, 43);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkDate.Size = new System.Drawing.Size(169, 24);
+            this.txt_checkDate.StyleController = this.layoutMx1;
+            this.txt_checkDate.TabIndex = 226;
+            this.txt_checkDate.Tag = "readonly";
+            // 
+            // txt_bz
+            // 
+            this.txt_bz.Location = new System.Drawing.Point(382, 74);
+            this.txt_bz.Name = "txt_bz";
+            this.txt_bz.Properties.Appearance.Options.UseFont = true;
+            this.txt_bz.Size = new System.Drawing.Size(439, 24);
+            this.txt_bz.StyleController = this.layoutMx1;
+            this.txt_bz.TabIndex = 252;
+            // 
+            // txt_checkBy
+            // 
+            this.txt_checkBy.Location = new System.Drawing.Point(924, 12);
+            this.txt_checkBy.Name = "txt_checkBy";
+            this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkBy.Size = new System.Drawing.Size(169, 24);
+            this.txt_checkBy.StyleController = this.layoutMx1;
+            this.txt_checkBy.TabIndex = 222;
+            this.txt_checkBy.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
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem9,
+            this.layoutControlItem10,
+            this.layoutControlItem6,
+            this.layoutControlItem1,
+            this.layoutControlItem3,
+            this.layoutControlItem5,
+            this.layoutControlItem2,
+            this.layoutControlItem4,
+            this.layoutControlItem16,
+            this.layoutControlItem7});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3});
+            this.Root.Size = new System.Drawing.Size(1105, 113);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_checkBy;
+            this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
+            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_checkDate;
+            this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // tabMx
+            // 
+            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Name = "tabMx";
+            this.tabMx.SelectedTabPage = this.tabMxPage1;
+            this.tabMx.Size = new System.Drawing.Size(1126, 447);
+            this.tabMx.TabIndex = 3;
+            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabMxPage1});
+            // 
+            // tabMxPage1
+            // 
+            this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Name = "tabMxPage1";
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 415);
+            this.tabMxPage1.Text = "鐢宠鏄庣粏";
+            // 
+            // gcMx1
+            // 
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Name = "gcMx1";
+            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
+            this.gcMx1.Size = new System.Drawing.Size(1124, 415);
+            this.gcMx1.TabIndex = 0;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
+            // 
+            // gvMx1
+            // 
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1id,
+            this.gvMx1mid,
+            this.gridColumn6,
+            this.gvMx1itemId,
+            this.gridColumn2,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gvMxDel});
+            this.gvMx1.GridControl = this.gcMx1;
+            this.gvMx1.Name = "gvMx1";
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx1id
+            // 
+            this.gvMx1id.AppearanceCell.Options.UseFont = true;
+            this.gvMx1id.Caption = "鏄庣粏GUID";
+            this.gvMx1id.FieldName = "id";
+            this.gvMx1id.MinWidth = 50;
+            this.gvMx1id.Name = "gvMx1id";
+            this.gvMx1id.Tag = "query_a.ID";
+            this.gvMx1id.Width = 94;
+            // 
+            // gvMx1mid
+            // 
+            this.gvMx1mid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1mid.Caption = "涓昏〃GUID";
+            this.gvMx1mid.FieldName = "mid";
+            this.gvMx1mid.MinWidth = 50;
+            this.gvMx1mid.Name = "gvMx1mid";
+            this.gvMx1mid.Tag = "query_a.MID";
+            this.gvMx1mid.Width = 94;
+            // 
+            // gvMx1itemId
+            // 
+            this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemId.Caption = "鐗╂枡ID";
+            this.gvMx1itemId.FieldName = "itemId";
+            this.gvMx1itemId.MinWidth = 50;
+            this.gvMx1itemId.Name = "gvMx1itemId";
+            this.gvMx1itemId.Tag = "query_a.ITEM_ID";
+            this.gvMx1itemId.Visible = true;
+            this.gvMx1itemId.VisibleIndex = 1;
+            this.gvMx1itemId.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn2.FieldName = "wlbm";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 2;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn5.FieldName = "wlmc";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 94;
+            // 
+            // gvMxDel
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 5;
+            this.gvMxDel.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(965, 64);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 8;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // txt_famc
+            // 
+            this.txt_famc.Location = new System.Drawing.Point(382, 12);
+            this.txt_famc.Name = "txt_famc";
+            this.txt_famc.Size = new System.Drawing.Size(168, 24);
+            this.txt_famc.StyleController = this.layoutMx1;
+            this.txt_famc.TabIndex = 533;
+            // 
+            // txt_bzqx
+            // 
+            this.txt_bzqx.Location = new System.Drawing.Point(382, 43);
+            this.txt_bzqx.Name = "txt_bzqx";
+            this.txt_bzqx.Size = new System.Drawing.Size(168, 24);
+            this.txt_bzqx.StyleController = this.layoutMx1;
+            this.txt_bzqx.TabIndex = 534;
+            // 
+            // txt_fjxz
+            // 
+            this.txt_fjxz.Location = new System.Drawing.Point(653, 43);
+            this.txt_fjxz.Name = "txt_fjxz";
+            this.txt_fjxz.Size = new System.Drawing.Size(168, 24);
+            this.txt_fjxz.StyleController = this.layoutMx1;
+            this.txt_fjxz.TabIndex = 535;
+            // 
+            // txt_yjrq
+            // 
+            this.txt_yjrq.Location = new System.Drawing.Point(111, 43);
+            this.txt_yjrq.Name = "txt_yjrq";
+            this.txt_yjrq.Size = new System.Drawing.Size(168, 24);
+            this.txt_yjrq.StyleController = this.layoutMx1;
+            this.txt_yjrq.TabIndex = 536;
+            // 
+            // txt_checkStatus
+            // 
+            this.txt_checkStatus.Location = new System.Drawing.Point(825, 74);
+            this.txt_checkStatus.Name = "txt_checkStatus";
+            this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_checkStatus.Size = new System.Drawing.Size(268, 24);
+            this.txt_checkStatus.StyleController = this.layoutMx1;
+            this.txt_checkStatus.TabIndex = 537;
+            this.txt_checkStatus.Tag = "readonly";
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_checkStatus;
+            this.layoutControlItem6.Location = new System.Drawing.Point(813, 62);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem6.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_fabm;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem1.Text = "鏂规缂栫爜";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_famc;
+            this.layoutControlItem3.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem3.Text = "鏂规鍚嶇О";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_yjrq;
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem5.Text = "棰勮鏃ユ湡(澶�)";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_bzqx;
+            this.layoutControlItem2.Location = new System.Drawing.Point(271, 31);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem2.Text = "璐ㄤ繚鏈熼檺(澶�)";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_fjxz;
+            this.layoutControlItem4.Location = new System.Drawing.Point(542, 31);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem4.Text = "澶嶆闄愬��(娆�)";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.btnSelect;
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
+            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 = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem16.Text = "閫�璐ф槑缁�";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem16.TextVisible = false;
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_bz;
+            this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+            this.layoutControlItem7.Text = "鏂规澶囨敞";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn3.FieldName = "wlgg";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 4;
+            this.gridColumn4.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "浣跨敤缁勭粐";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 0;
+            this.gridColumn6.Width = 94;
+            // 
+            // Frm_Cqfa
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Text = "Frm_Cqfa";
-        }
+            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Name = "Frm_Cqfa";
+            this.Text = "瓒呮湡妫�楠屾柟妗�";
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            this.splitMx1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fabm.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_bz.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.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.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+            this.tabMx.ResumeLayout(false);
+            this.tabMxPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fjxz.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yjrq.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            this.ResumeLayout(false);
 
+        }
         #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraEditors.SimpleButton btnSelect;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.TextEdit txt_bz;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.TextEdit txt_checkBy;
+        private DevExpress.XtraEditors.TextEdit txt_fabm;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraTab.XtraTabControl tabMx;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraEditors.TextEdit txt_guid;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraEditors.TextEdit txt_famc;
+        private DevExpress.XtraEditors.TextEdit txt_bzqx;
+        private DevExpress.XtraEditors.TextEdit txt_fjxz;
+        private DevExpress.XtraEditors.TextEdit txt_yjrq;
+        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
index d6efb02..9ba2217 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
@@ -1,4 +1,8 @@
 锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -13,9 +17,574 @@
 {
     public partial class Frm_Cqfa : DevExpress.XtraEditors.XtraForm
     {
+        string _webServiceName = "MesCgthSqManager/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        string _ucGys = "";//渚涘簲鍟�
         public Frm_Cqfa()
         {
             InitializeComponent();
+            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips);
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+                getModel(value);
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            }, lbGuid);
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+            //閫夋嫨闇�瑕佺殑鏄庣粏
+            btnSelect.Click += (s, e) =>
+            {
+                //if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
+                //{
+                //    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紒");
+                //    return;
+                //}
+                //var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId());
+                ////璧嬪�肩粰鏄庣粏琛�
+                //frm.UpdateParent += (ss, ee) =>
+                //{
+                //    try
+                //    {
+                //        var lst = new List<string>();
+                //        lst = ee.StringList;
+                //        var _obj = lst;
+                //        var strReturn = UtilityHelper.HttpPost("",
+                //            _webServiceName + "SelectFormTo",
+                //            JsonConvert.SerializeObject(_obj));
+                //        var dt = UtilityHelper.ReturnToList(strReturn);
+                //        DataTable _newTable = dt.rtnData;
+                //        DataTable _oldTable = (DataTable)gcMx1.DataSource;
+                //        DataRow[] sourceRows = _newTable.Select();
+                //        for (int i = 0; i < sourceRows.Length; i++)
+                //        {
+                //            _oldTable.ImportRow(sourceRows[i]);
+                //        }
+                //        gcMx1.BindingContext = new BindingContext();
+                //        gcMx1.DataSource = _oldTable;
+                //        gcMx1.ForceInitialize();
+                //        gvMx1.BestFitColumns();
+                //        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+                //    }
+                //    catch (Exception ex)
+                //    {
+                //        MessageBox.Show(ex.Message);
+                //    }
+                //};
+                //frm.ShowDialog();
+            };
         }
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList(1);
+        }
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_fabm, gridView1, "billNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                mxGuid = Guid.Empty.ToString(),
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "DeleteModelOrMx",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 0)
+                    { }
+                    else
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList(this.pageBar1.CurrentPage);
+                }
+
+                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim());
+            else
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
+            }
+        }
+        /// <summary>
+        /// 淇敼浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.currentAction = "edit";
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_fabm, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            else
+            {
+                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                gvList.Add(gvMx1);
+                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+            }
+        }
+        /// <summary>
+        /// 鏂板浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+        {
+            lbGuid.Text = "";
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+            List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+            gridViews.Add(gvMx1);
+            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
+            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+            //澧炲姞鏃讹紝榛樿缁勭粐
+            string deftOrg = UtilityHelper.GetFirstOrg(txt_thOrgId);
+
+        }
+        /// <summary>
+        /// 淇濆瓨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.isSetBtn = false;
+            string _famc = txt_famc.Text.Trim();
+            string _yjrq = txt_yjrq.Text.Trim();
+            string _bzqx = txt_bzqx.Text.Trim();
+            string _fjxz = txt_fjxz.Text.Trim();
+            string _bz = txt_bz.Text.Trim();
+            if (string.IsNullOrEmpty(_famc))
+            {
+                MsgHelper.ShowError("鍚嶇О涓嶈兘涓虹┖锛�");
+                txt_famc.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_yjrq))
+            {
+                MsgHelper.ShowError("棰勮鏃ユ湡涓嶈兘涓虹┖锛�");
+                txt_yjrq.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_bzqx))
+            {
+                MsgHelper.ShowError("淇濊川鏈熼檺涓嶈兘涓虹┖锛�");
+                txt_bzqx.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_fjxz))
+            {
+                MsgHelper.ShowError("澶嶆闄愬��(娆�)涓嶈兘涓虹┖锛�");
+                txt_fjxz.Focus();
+                return;
+            }
+            var _obj = new
+            {
+                guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
+                yjrq = int.Parse(_yjrq),
+                bzqx = int.Parse(_bzqx),
+                fjxz = int.Parse(_fjxz),
+                famc = _famc.Trim(),
+                bz = _bz.Trim(),
+                list = new List<dynamic>(),
+            };
+            gvMx1.CloseEditor();
+            gvMx1.PostEditor();
+            gvMx1.UpdateCurrentRow();
+            if (gvMx1.DataRowCount <= 0)
+            {
+                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+                return;
+            }
+            for (var i = 0; i < gvMx1.DataRowCount; i++)
+            {
+                var row = gvMx1.GetDataRow(i);
+                if (row != null)
+                {
+                    Guid _guid = UtilityHelper.ToGuid(row["id"].ToString());
+                    string _msl = row["sqNum"].ToString();
+                    if (string.IsNullOrEmpty(_msl))
+                    {
+                        MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    string _depotId = row["depotId"].ToString();
+                    if (string.IsNullOrEmpty(_depotId))
+                    {
+                        MsgHelper.ShowError("浠撳簱涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    _obj.list.Add(new
+                    {
+                        Guid = _guid,
+                        AboutGuid = UtilityHelper.ToGuid(row["rkmxGuid"].ToString()),
+                        Quantity = decimal.Parse(row["sqNum"].ToString()),
+                        Bz = row["remark"].ToString(),
+                        DepotId = row["depotId"].ToString(),
+                    });
+                }
+            }
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "EditModel",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                    lbGuid.Text = _rtn.rtnData.outGuid;
+                    txt_fabm.Text = _rtn.rtnData.outNo;
+                    toolBarMenu1.isSetBtn = true;
+                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                    gvList.Add(gvMx1);
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+                }
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
+        /// 璇诲彇瀹炰綋
+        /// </summary>
+        /// <param name="strGuid"></param>
+        private void getModel(string strGuid)
+        {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    _ucGys = dy.suppId;
+                    lbGuid.Text = strGuid;
+                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                    gvList.Add(gvMx1);
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+                    _ucGys = "";
+                    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());
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMx1.BindingContext = new BindingContext();
+                        gcMx1.DataSource = dt;
+                        gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+                    }
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            };
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fabm, gridView1, "billNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                inFieldValue = _inFieldValue,
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "EditModelSubmit",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鏄庣粏
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            gvMx1.CloseEditor();
+            gvMx1.PostEditor();
+            gvMx1.UpdateCurrentRow();
+            var rowhandle = gvMx1.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gvMx1.GetDataRow(rowhandle);
+                var mxGuid = dr["id"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                    return;
+                if (string.IsNullOrEmpty(mxGuid))
+                {
+                    gvMx1.DeleteRow(rowhandle);
+                    return;
+                }
+                var _obj = new
+                {
+                    guid = lbGuid.Text.Trim(),
+                    mxGuid = mxGuid,
+                };
+                try
+                {
+                    var strJson = UtilityHelper.HttpPost("",
+                       _webServiceName + "DeleteModelOrMx",
+                       JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+                    }
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx
@@ -0,0 +1,123 @@
+锘�<?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>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file

--
Gitblit v1.9.3