From 87521e2df5a87b5e06216a34953cc50e57ed95a1 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 23 十月 2024 16:37:07 +0800
Subject: [PATCH] 增加用户控件

---
 /dev/null                                               |   57 -
 DevApp/Gs.DevApp/UserControl/SelectCgMx.resx            |  120 +++
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs  |   90 +-
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs           |   14 
 DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs           |    1 
 DevApp/Gs.DevApp/UserControl/SelectCgMx.cs              |  100 +++
 DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs          |   87 ++
 DevApp/Gs.DevApp/UserControl/UcLookSupplier.resx        |  120 +++
 DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs |  115 +++
 DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs     | 1171 ++++++++++++++++++++++++++++++++++++
 10 files changed, 1,786 insertions(+), 89 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
new file mode 100644
index 0000000..119e0db
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -0,0 +1,1171 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+    partial class SelectCgMx
+    {
+
+        /// <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.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_pricingUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_pricingQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_deliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_earliestDeliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_latestDeliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_demandOrg = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_receivingOrg = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_settlementOrg = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_isGift = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_outsourcingOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_batchNumber = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_businessClose = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_businessFreeze = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_freezer = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_freezeTime = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_businessTerminate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_terminator = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_terminateTime = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_totalReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_totalStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remainingStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_totalReturnedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_returnableReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_returnableStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_sourceDocumentType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_demandTrackingId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_planTrackingId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_changeFlag = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_demandSource = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_demandDocumentLineId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_purchaseOrderLineNumber = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_demand = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_receiving = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_settlement = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_cgb014 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_company = 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();
+            ((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();
+            // 
+            // 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.MainView = this.gridView1;
+            this.gcMain.Name = "gcMain";
+            this.gcMain.Size = new System.Drawing.Size(1126, 607);
+            this.gcMain.TabIndex = 1;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_chk,
+            this.gv_guid,
+            this.gv_billNo,
+            this.gv_salesOrderId,
+            this.gv_orderLineId,
+            this.gv_itemId,
+            this.gv_purchaseUnit,
+            this.gv_purchaseQty,
+            this.gv_inventoryUnit,
+            this.gv_pricingUnit,
+            this.gv_pricingQty,
+            this.gv_deliveryDate,
+            this.gv_earliestDeliveryDate,
+            this.gv_latestDeliveryDate,
+            this.gv_demandOrg,
+            this.gv_receivingOrg,
+            this.gv_settlementOrg,
+            this.gv_isGift,
+            this.gv_remarks,
+            this.gv_supplierItemCode,
+            this.gv_supplierItemName,
+            this.gv_outsourcingOrderId,
+            this.gv_batchNumber,
+            this.gv_businessClose,
+            this.gv_businessFreeze,
+            this.gv_freezer,
+            this.gv_freezeTime,
+            this.gv_businessTerminate,
+            this.gv_terminator,
+            this.gv_terminateTime,
+            this.gv_totalReceivedQty,
+            this.gv_remainingReceivedQty,
+            this.gv_totalStoredQty,
+            this.gv_remainingStoredQty,
+            this.gv_totalReturnedQty,
+            this.gv_returnableReceivedQty,
+            this.gv_returnableStoredQty,
+            this.gv_sourceDocumentType,
+            this.gv_sourceDocumentId,
+            this.gv_demandTrackingId,
+            this.gv_planTrackingId,
+            this.gv_changeFlag,
+            this.gv_demandSource,
+            this.gv_demandDocumentId,
+            this.gv_demandDocumentLineId,
+            this.gv_ebelnK3id,
+            this.gv_remark1,
+            this.gv_remark2,
+            this.gv_remark3,
+            this.gv_remark4,
+            this.gv_remark5,
+            this.gv_id,
+            this.gv_erpId,
+            this.gv_purchaseOrderLineNumber,
+            this.gv_demand,
+            this.gv_receiving,
+            this.gv_settlement,
+            this.gv_cgb014,
+            this.gv_factory,
+            this.gv_company});
+            this.gridView1.GridControl = this.gcMain;
+            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_chk
+            // 
+            this.gv_chk.Caption = "gridColumn1";
+            this.gv_chk.FieldName = "gvChk";
+            this.gv_chk.MinWidth = 60;
+            this.gv_chk.Name = "gv_chk";
+            this.gv_chk.Visible = true;
+            this.gv_chk.VisibleIndex = 0;
+            this.gv_chk.Width = 94;
+            // 
+            // gv_guid
+            // 
+            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_guid.AppearanceCell.Options.UseFont = true;
+            this.gv_guid.Caption = "涓婚敭 ";
+            this.gv_guid.FieldName = "guid";
+            this.gv_guid.MinWidth = 50;
+            this.gv_guid.Name = "gv_guid";
+            this.gv_guid.OptionsColumn.AllowEdit = false;
+            this.gv_guid.Tag = "query_a.guid";
+            this.gv_guid.Visible = true;
+            this.gv_guid.VisibleIndex = 1;
+            this.gv_guid.Width = 94;
+            // 
+            // gv_billNo
+            // 
+            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_billNo.AppearanceCell.Options.UseFont = true;
+            this.gv_billNo.Caption = "閲囪喘鍗曞彿 ";
+            this.gv_billNo.FieldName = "billNo";
+            this.gv_billNo.MinWidth = 50;
+            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 = 2;
+            this.gv_billNo.Width = 94;
+            // 
+            // gv_salesOrderId
+            // 
+            this.gv_salesOrderId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
+            this.gv_salesOrderId.Caption = "閿�鍞鍗曞彿 ";
+            this.gv_salesOrderId.FieldName = "salesOrderId";
+            this.gv_salesOrderId.MinWidth = 50;
+            this.gv_salesOrderId.Name = "gv_salesOrderId";
+            this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
+            this.gv_salesOrderId.Tag = "query_a.SALES_ORDER_ID";
+            this.gv_salesOrderId.Visible = true;
+            this.gv_salesOrderId.VisibleIndex = 3;
+            this.gv_salesOrderId.Width = 94;
+            // 
+            // gv_orderLineId
+            // 
+            this.gv_orderLineId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
+            this.gv_orderLineId.Caption = "閲囪喘璁㈠崟琛屽彿 ";
+            this.gv_orderLineId.FieldName = "orderLineId";
+            this.gv_orderLineId.MinWidth = 50;
+            this.gv_orderLineId.Name = "gv_orderLineId";
+            this.gv_orderLineId.OptionsColumn.AllowEdit = false;
+            this.gv_orderLineId.Tag = "query_a.ORDER_LINE_ID";
+            this.gv_orderLineId.Visible = true;
+            this.gv_orderLineId.VisibleIndex = 4;
+            this.gv_orderLineId.Width = 94;
+            // 
+            // gv_itemId
+            // 
+            this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_itemId.AppearanceCell.Options.UseFont = true;
+            this.gv_itemId.Caption = "鐗╂枡缂栫爜 ";
+            this.gv_itemId.FieldName = "itemId";
+            this.gv_itemId.MinWidth = 50;
+            this.gv_itemId.Name = "gv_itemId";
+            this.gv_itemId.OptionsColumn.AllowEdit = false;
+            this.gv_itemId.Tag = "query_a.ITEM_ID";
+            this.gv_itemId.Visible = true;
+            this.gv_itemId.VisibleIndex = 5;
+            this.gv_itemId.Width = 94;
+            // 
+            // gv_purchaseUnit
+            // 
+            this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
+            this.gv_purchaseUnit.Caption = "閲囪喘鍗曚綅 ";
+            this.gv_purchaseUnit.FieldName = "purchaseUnit";
+            this.gv_purchaseUnit.MinWidth = 50;
+            this.gv_purchaseUnit.Name = "gv_purchaseUnit";
+            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
+            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
+            this.gv_purchaseUnit.Visible = true;
+            this.gv_purchaseUnit.VisibleIndex = 6;
+            this.gv_purchaseUnit.Width = 94;
+            // 
+            // gv_purchaseQty
+            // 
+            this.gv_purchaseQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_purchaseQty.AppearanceCell.Options.UseFont = true;
+            this.gv_purchaseQty.Caption = "閲囪喘鏁伴噺 ";
+            this.gv_purchaseQty.FieldName = "purchaseQty";
+            this.gv_purchaseQty.MinWidth = 50;
+            this.gv_purchaseQty.Name = "gv_purchaseQty";
+            this.gv_purchaseQty.OptionsColumn.AllowEdit = false;
+            this.gv_purchaseQty.Tag = "query_a.PURCHASE_QTY";
+            this.gv_purchaseQty.Visible = true;
+            this.gv_purchaseQty.VisibleIndex = 7;
+            this.gv_purchaseQty.Width = 94;
+            // 
+            // gv_inventoryUnit
+            // 
+            this.gv_inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
+            this.gv_inventoryUnit.Caption = "搴撳瓨鍗曚綅 ";
+            this.gv_inventoryUnit.FieldName = "inventoryUnit";
+            this.gv_inventoryUnit.MinWidth = 50;
+            this.gv_inventoryUnit.Name = "gv_inventoryUnit";
+            this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
+            this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
+            this.gv_inventoryUnit.Visible = true;
+            this.gv_inventoryUnit.VisibleIndex = 8;
+            this.gv_inventoryUnit.Width = 94;
+            // 
+            // gv_pricingUnit
+            // 
+            this.gv_pricingUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_pricingUnit.AppearanceCell.Options.UseFont = true;
+            this.gv_pricingUnit.Caption = "璁′环鍗曚綅 ";
+            this.gv_pricingUnit.FieldName = "pricingUnit";
+            this.gv_pricingUnit.MinWidth = 50;
+            this.gv_pricingUnit.Name = "gv_pricingUnit";
+            this.gv_pricingUnit.OptionsColumn.AllowEdit = false;
+            this.gv_pricingUnit.Tag = "query_a.PRICING_UNIT";
+            this.gv_pricingUnit.Visible = true;
+            this.gv_pricingUnit.VisibleIndex = 9;
+            this.gv_pricingUnit.Width = 94;
+            // 
+            // gv_pricingQty
+            // 
+            this.gv_pricingQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_pricingQty.AppearanceCell.Options.UseFont = true;
+            this.gv_pricingQty.Caption = "璁′环鏁伴噺 ";
+            this.gv_pricingQty.FieldName = "pricingQty";
+            this.gv_pricingQty.MinWidth = 50;
+            this.gv_pricingQty.Name = "gv_pricingQty";
+            this.gv_pricingQty.OptionsColumn.AllowEdit = false;
+            this.gv_pricingQty.Tag = "query_a.PRICING_QTY";
+            this.gv_pricingQty.Visible = true;
+            this.gv_pricingQty.VisibleIndex = 10;
+            this.gv_pricingQty.Width = 94;
+            // 
+            // gv_deliveryDate
+            // 
+            this.gv_deliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_deliveryDate.AppearanceCell.Options.UseFont = true;
+            this.gv_deliveryDate.Caption = "浜よ揣鏃ユ湡 ";
+            this.gv_deliveryDate.FieldName = "deliveryDate";
+            this.gv_deliveryDate.MinWidth = 50;
+            this.gv_deliveryDate.Name = "gv_deliveryDate";
+            this.gv_deliveryDate.OptionsColumn.AllowEdit = false;
+            this.gv_deliveryDate.Tag = "query_a.DELIVERY_DATE";
+            this.gv_deliveryDate.Visible = true;
+            this.gv_deliveryDate.VisibleIndex = 11;
+            this.gv_deliveryDate.Width = 94;
+            // 
+            // gv_earliestDeliveryDate
+            // 
+            this.gv_earliestDeliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_earliestDeliveryDate.AppearanceCell.Options.UseFont = true;
+            this.gv_earliestDeliveryDate.Caption = "鏈�鏃╀氦璐ф棩鏈� ";
+            this.gv_earliestDeliveryDate.FieldName = "earliestDeliveryDate";
+            this.gv_earliestDeliveryDate.MinWidth = 50;
+            this.gv_earliestDeliveryDate.Name = "gv_earliestDeliveryDate";
+            this.gv_earliestDeliveryDate.OptionsColumn.AllowEdit = false;
+            this.gv_earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
+            this.gv_earliestDeliveryDate.Visible = true;
+            this.gv_earliestDeliveryDate.VisibleIndex = 12;
+            this.gv_earliestDeliveryDate.Width = 94;
+            // 
+            // gv_latestDeliveryDate
+            // 
+            this.gv_latestDeliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_latestDeliveryDate.AppearanceCell.Options.UseFont = true;
+            this.gv_latestDeliveryDate.Caption = "鏈�鏅氫氦璐ф棩鏈� ";
+            this.gv_latestDeliveryDate.FieldName = "latestDeliveryDate";
+            this.gv_latestDeliveryDate.MinWidth = 50;
+            this.gv_latestDeliveryDate.Name = "gv_latestDeliveryDate";
+            this.gv_latestDeliveryDate.OptionsColumn.AllowEdit = false;
+            this.gv_latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
+            this.gv_latestDeliveryDate.Visible = true;
+            this.gv_latestDeliveryDate.VisibleIndex = 13;
+            this.gv_latestDeliveryDate.Width = 94;
+            // 
+            // gv_demandOrg
+            // 
+            this.gv_demandOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_demandOrg.AppearanceCell.Options.UseFont = true;
+            this.gv_demandOrg.Caption = "闇�姹傜粍缁� ";
+            this.gv_demandOrg.FieldName = "demandOrg";
+            this.gv_demandOrg.MinWidth = 50;
+            this.gv_demandOrg.Name = "gv_demandOrg";
+            this.gv_demandOrg.OptionsColumn.AllowEdit = false;
+            this.gv_demandOrg.Tag = "query_a.DEMAND_ORG";
+            this.gv_demandOrg.Visible = true;
+            this.gv_demandOrg.VisibleIndex = 14;
+            this.gv_demandOrg.Width = 94;
+            // 
+            // gv_receivingOrg
+            // 
+            this.gv_receivingOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_receivingOrg.AppearanceCell.Options.UseFont = true;
+            this.gv_receivingOrg.Caption = "鏀舵枡缁勭粐 ";
+            this.gv_receivingOrg.FieldName = "receivingOrg";
+            this.gv_receivingOrg.MinWidth = 50;
+            this.gv_receivingOrg.Name = "gv_receivingOrg";
+            this.gv_receivingOrg.OptionsColumn.AllowEdit = false;
+            this.gv_receivingOrg.Tag = "query_a.RECEIVING_ORG";
+            this.gv_receivingOrg.Visible = true;
+            this.gv_receivingOrg.VisibleIndex = 15;
+            this.gv_receivingOrg.Width = 94;
+            // 
+            // gv_settlementOrg
+            // 
+            this.gv_settlementOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_settlementOrg.AppearanceCell.Options.UseFont = true;
+            this.gv_settlementOrg.Caption = "缁撶畻缁勭粐 ";
+            this.gv_settlementOrg.FieldName = "settlementOrg";
+            this.gv_settlementOrg.MinWidth = 50;
+            this.gv_settlementOrg.Name = "gv_settlementOrg";
+            this.gv_settlementOrg.OptionsColumn.AllowEdit = false;
+            this.gv_settlementOrg.Tag = "query_a.SETTLEMENT_ORG";
+            this.gv_settlementOrg.Visible = true;
+            this.gv_settlementOrg.VisibleIndex = 16;
+            this.gv_settlementOrg.Width = 94;
+            // 
+            // gv_isGift
+            // 
+            this.gv_isGift.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_isGift.AppearanceCell.Options.UseFont = true;
+            this.gv_isGift.Caption = "鏄惁璧犲搧 ";
+            this.gv_isGift.FieldName = "isGift";
+            this.gv_isGift.MinWidth = 50;
+            this.gv_isGift.Name = "gv_isGift";
+            this.gv_isGift.OptionsColumn.AllowEdit = false;
+            this.gv_isGift.Tag = "query_a.IS_GIFT";
+            this.gv_isGift.Visible = true;
+            this.gv_isGift.VisibleIndex = 17;
+            this.gv_isGift.Width = 94;
+            // 
+            // gv_remarks
+            // 
+            this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remarks.AppearanceCell.Options.UseFont = true;
+            this.gv_remarks.Caption = "澶囨敞 ";
+            this.gv_remarks.FieldName = "remarks";
+            this.gv_remarks.MinWidth = 50;
+            this.gv_remarks.Name = "gv_remarks";
+            this.gv_remarks.OptionsColumn.AllowEdit = false;
+            this.gv_remarks.Tag = "query_a.REMARKS";
+            this.gv_remarks.Visible = true;
+            this.gv_remarks.VisibleIndex = 18;
+            this.gv_remarks.Width = 94;
+            // 
+            // gv_supplierItemCode
+            // 
+            this.gv_supplierItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
+            this.gv_supplierItemCode.Caption = "渚涘簲鍟嗙墿鏂欑紪鐮� ";
+            this.gv_supplierItemCode.FieldName = "supplierItemCode";
+            this.gv_supplierItemCode.MinWidth = 50;
+            this.gv_supplierItemCode.Name = "gv_supplierItemCode";
+            this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
+            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
+            this.gv_supplierItemCode.Visible = true;
+            this.gv_supplierItemCode.VisibleIndex = 19;
+            this.gv_supplierItemCode.Width = 94;
+            // 
+            // gv_supplierItemName
+            // 
+            this.gv_supplierItemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
+            this.gv_supplierItemName.Caption = "渚涘簲鍟嗙墿鏂欏悕绉� ";
+            this.gv_supplierItemName.FieldName = "supplierItemName";
+            this.gv_supplierItemName.MinWidth = 50;
+            this.gv_supplierItemName.Name = "gv_supplierItemName";
+            this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
+            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
+            this.gv_supplierItemName.Visible = true;
+            this.gv_supplierItemName.VisibleIndex = 20;
+            this.gv_supplierItemName.Width = 94;
+            // 
+            // gv_outsourcingOrderId
+            // 
+            this.gv_outsourcingOrderId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_outsourcingOrderId.AppearanceCell.Options.UseFont = true;
+            this.gv_outsourcingOrderId.Caption = "濮斿璁㈠崟鍙� ";
+            this.gv_outsourcingOrderId.FieldName = "outsourcingOrderId";
+            this.gv_outsourcingOrderId.MinWidth = 50;
+            this.gv_outsourcingOrderId.Name = "gv_outsourcingOrderId";
+            this.gv_outsourcingOrderId.OptionsColumn.AllowEdit = false;
+            this.gv_outsourcingOrderId.Tag = "query_a.OUTSOURCING_ORDER_ID";
+            this.gv_outsourcingOrderId.Visible = true;
+            this.gv_outsourcingOrderId.VisibleIndex = 21;
+            this.gv_outsourcingOrderId.Width = 94;
+            // 
+            // gv_batchNumber
+            // 
+            this.gv_batchNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_batchNumber.AppearanceCell.Options.UseFont = true;
+            this.gv_batchNumber.Caption = "鎵规鍙� ";
+            this.gv_batchNumber.FieldName = "batchNumber";
+            this.gv_batchNumber.MinWidth = 50;
+            this.gv_batchNumber.Name = "gv_batchNumber";
+            this.gv_batchNumber.OptionsColumn.AllowEdit = false;
+            this.gv_batchNumber.Tag = "query_a.BATCH_NUMBER";
+            this.gv_batchNumber.Visible = true;
+            this.gv_batchNumber.VisibleIndex = 22;
+            this.gv_batchNumber.Width = 94;
+            // 
+            // gv_businessClose
+            // 
+            this.gv_businessClose.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_businessClose.AppearanceCell.Options.UseFont = true;
+            this.gv_businessClose.Caption = "涓氬姟鍏抽棴鏍囪瘑 ";
+            this.gv_businessClose.FieldName = "businessClose";
+            this.gv_businessClose.MinWidth = 50;
+            this.gv_businessClose.Name = "gv_businessClose";
+            this.gv_businessClose.OptionsColumn.AllowEdit = false;
+            this.gv_businessClose.Tag = "query_a.BUSINESS_CLOSE";
+            this.gv_businessClose.Visible = true;
+            this.gv_businessClose.VisibleIndex = 23;
+            this.gv_businessClose.Width = 94;
+            // 
+            // gv_businessFreeze
+            // 
+            this.gv_businessFreeze.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_businessFreeze.AppearanceCell.Options.UseFont = true;
+            this.gv_businessFreeze.Caption = "涓氬姟鍐荤粨鏍囪瘑 ";
+            this.gv_businessFreeze.FieldName = "businessFreeze";
+            this.gv_businessFreeze.MinWidth = 50;
+            this.gv_businessFreeze.Name = "gv_businessFreeze";
+            this.gv_businessFreeze.OptionsColumn.AllowEdit = false;
+            this.gv_businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
+            this.gv_businessFreeze.Visible = true;
+            this.gv_businessFreeze.VisibleIndex = 24;
+            this.gv_businessFreeze.Width = 94;
+            // 
+            // gv_freezer
+            // 
+            this.gv_freezer.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_freezer.AppearanceCell.Options.UseFont = true;
+            this.gv_freezer.Caption = "鍐荤粨浜� ";
+            this.gv_freezer.FieldName = "freezer";
+            this.gv_freezer.MinWidth = 50;
+            this.gv_freezer.Name = "gv_freezer";
+            this.gv_freezer.OptionsColumn.AllowEdit = false;
+            this.gv_freezer.Tag = "query_a.FREEZER";
+            this.gv_freezer.Visible = true;
+            this.gv_freezer.VisibleIndex = 25;
+            this.gv_freezer.Width = 94;
+            // 
+            // gv_freezeTime
+            // 
+            this.gv_freezeTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_freezeTime.AppearanceCell.Options.UseFont = true;
+            this.gv_freezeTime.Caption = "鍐荤粨鏃堕棿 ";
+            this.gv_freezeTime.FieldName = "freezeTime";
+            this.gv_freezeTime.MinWidth = 50;
+            this.gv_freezeTime.Name = "gv_freezeTime";
+            this.gv_freezeTime.OptionsColumn.AllowEdit = false;
+            this.gv_freezeTime.Tag = "query_a.FREEZE_TIME";
+            this.gv_freezeTime.Visible = true;
+            this.gv_freezeTime.VisibleIndex = 26;
+            this.gv_freezeTime.Width = 94;
+            // 
+            // gv_businessTerminate
+            // 
+            this.gv_businessTerminate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_businessTerminate.AppearanceCell.Options.UseFont = true;
+            this.gv_businessTerminate.Caption = "涓氬姟缁堟鏍囪瘑 ";
+            this.gv_businessTerminate.FieldName = "businessTerminate";
+            this.gv_businessTerminate.MinWidth = 50;
+            this.gv_businessTerminate.Name = "gv_businessTerminate";
+            this.gv_businessTerminate.OptionsColumn.AllowEdit = false;
+            this.gv_businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
+            this.gv_businessTerminate.Visible = true;
+            this.gv_businessTerminate.VisibleIndex = 27;
+            this.gv_businessTerminate.Width = 94;
+            // 
+            // gv_terminator
+            // 
+            this.gv_terminator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_terminator.AppearanceCell.Options.UseFont = true;
+            this.gv_terminator.Caption = "缁堟浜� ";
+            this.gv_terminator.FieldName = "terminator";
+            this.gv_terminator.MinWidth = 50;
+            this.gv_terminator.Name = "gv_terminator";
+            this.gv_terminator.OptionsColumn.AllowEdit = false;
+            this.gv_terminator.Tag = "query_a.TERMINATOR";
+            this.gv_terminator.Visible = true;
+            this.gv_terminator.VisibleIndex = 28;
+            this.gv_terminator.Width = 94;
+            // 
+            // gv_terminateTime
+            // 
+            this.gv_terminateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_terminateTime.AppearanceCell.Options.UseFont = true;
+            this.gv_terminateTime.Caption = "缁堟鏃堕棿 ";
+            this.gv_terminateTime.FieldName = "terminateTime";
+            this.gv_terminateTime.MinWidth = 50;
+            this.gv_terminateTime.Name = "gv_terminateTime";
+            this.gv_terminateTime.OptionsColumn.AllowEdit = false;
+            this.gv_terminateTime.Tag = "query_a.TERMINATE_TIME";
+            this.gv_terminateTime.Visible = true;
+            this.gv_terminateTime.VisibleIndex = 29;
+            this.gv_terminateTime.Width = 94;
+            // 
+            // gv_totalReceivedQty
+            // 
+            this.gv_totalReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_totalReceivedQty.AppearanceCell.Options.UseFont = true;
+            this.gv_totalReceivedQty.Caption = "鎬诲凡鏀舵暟閲� ";
+            this.gv_totalReceivedQty.FieldName = "totalReceivedQty";
+            this.gv_totalReceivedQty.MinWidth = 50;
+            this.gv_totalReceivedQty.Name = "gv_totalReceivedQty";
+            this.gv_totalReceivedQty.OptionsColumn.AllowEdit = false;
+            this.gv_totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
+            this.gv_totalReceivedQty.Visible = true;
+            this.gv_totalReceivedQty.VisibleIndex = 30;
+            this.gv_totalReceivedQty.Width = 94;
+            // 
+            // gv_remainingReceivedQty
+            // 
+            this.gv_remainingReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remainingReceivedQty.AppearanceCell.Options.UseFont = true;
+            this.gv_remainingReceivedQty.Caption = "鍓╀綑鏀惰揣鏁伴噺 ";
+            this.gv_remainingReceivedQty.FieldName = "remainingReceivedQty";
+            this.gv_remainingReceivedQty.MinWidth = 50;
+            this.gv_remainingReceivedQty.Name = "gv_remainingReceivedQty";
+            this.gv_remainingReceivedQty.OptionsColumn.AllowEdit = false;
+            this.gv_remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
+            this.gv_remainingReceivedQty.Visible = true;
+            this.gv_remainingReceivedQty.VisibleIndex = 31;
+            this.gv_remainingReceivedQty.Width = 94;
+            // 
+            // gv_totalStoredQty
+            // 
+            this.gv_totalStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_totalStoredQty.AppearanceCell.Options.UseFont = true;
+            this.gv_totalStoredQty.Caption = "鎬诲凡鍏ュ簱鏁伴噺 ";
+            this.gv_totalStoredQty.FieldName = "totalStoredQty";
+            this.gv_totalStoredQty.MinWidth = 50;
+            this.gv_totalStoredQty.Name = "gv_totalStoredQty";
+            this.gv_totalStoredQty.OptionsColumn.AllowEdit = false;
+            this.gv_totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
+            this.gv_totalStoredQty.Visible = true;
+            this.gv_totalStoredQty.VisibleIndex = 32;
+            this.gv_totalStoredQty.Width = 94;
+            // 
+            // gv_remainingStoredQty
+            // 
+            this.gv_remainingStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remainingStoredQty.AppearanceCell.Options.UseFont = true;
+            this.gv_remainingStoredQty.Caption = "鍓╀綑鍏ュ簱鏁伴噺 ";
+            this.gv_remainingStoredQty.FieldName = "remainingStoredQty";
+            this.gv_remainingStoredQty.MinWidth = 50;
+            this.gv_remainingStoredQty.Name = "gv_remainingStoredQty";
+            this.gv_remainingStoredQty.OptionsColumn.AllowEdit = false;
+            this.gv_remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
+            this.gv_remainingStoredQty.Visible = true;
+            this.gv_remainingStoredQty.VisibleIndex = 33;
+            this.gv_remainingStoredQty.Width = 94;
+            // 
+            // gv_totalReturnedQty
+            // 
+            this.gv_totalReturnedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_totalReturnedQty.AppearanceCell.Options.UseFont = true;
+            this.gv_totalReturnedQty.Caption = "鎬婚��璐ф暟閲� ";
+            this.gv_totalReturnedQty.FieldName = "totalReturnedQty";
+            this.gv_totalReturnedQty.MinWidth = 50;
+            this.gv_totalReturnedQty.Name = "gv_totalReturnedQty";
+            this.gv_totalReturnedQty.OptionsColumn.AllowEdit = false;
+            this.gv_totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
+            this.gv_totalReturnedQty.Visible = true;
+            this.gv_totalReturnedQty.VisibleIndex = 34;
+            this.gv_totalReturnedQty.Width = 94;
+            // 
+            // gv_returnableReceivedQty
+            // 
+            this.gv_returnableReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_returnableReceivedQty.AppearanceCell.Options.UseFont = true;
+            this.gv_returnableReceivedQty.Caption = "鍙��鏀惰揣鏁伴噺 ";
+            this.gv_returnableReceivedQty.FieldName = "returnableReceivedQty";
+            this.gv_returnableReceivedQty.MinWidth = 50;
+            this.gv_returnableReceivedQty.Name = "gv_returnableReceivedQty";
+            this.gv_returnableReceivedQty.OptionsColumn.AllowEdit = false;
+            this.gv_returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
+            this.gv_returnableReceivedQty.Visible = true;
+            this.gv_returnableReceivedQty.VisibleIndex = 35;
+            this.gv_returnableReceivedQty.Width = 94;
+            // 
+            // gv_returnableStoredQty
+            // 
+            this.gv_returnableStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_returnableStoredQty.AppearanceCell.Options.UseFont = true;
+            this.gv_returnableStoredQty.Caption = "鍙��鍏ュ簱鏁伴噺 ";
+            this.gv_returnableStoredQty.FieldName = "returnableStoredQty";
+            this.gv_returnableStoredQty.MinWidth = 50;
+            this.gv_returnableStoredQty.Name = "gv_returnableStoredQty";
+            this.gv_returnableStoredQty.OptionsColumn.AllowEdit = false;
+            this.gv_returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
+            this.gv_returnableStoredQty.Visible = true;
+            this.gv_returnableStoredQty.VisibleIndex = 36;
+            this.gv_returnableStoredQty.Width = 94;
+            // 
+            // gv_sourceDocumentType
+            // 
+            this.gv_sourceDocumentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_sourceDocumentType.AppearanceCell.Options.UseFont = true;
+            this.gv_sourceDocumentType.Caption = "鏉ユ簮鍗曟嵁绫诲瀷 ";
+            this.gv_sourceDocumentType.FieldName = "sourceDocumentType";
+            this.gv_sourceDocumentType.MinWidth = 50;
+            this.gv_sourceDocumentType.Name = "gv_sourceDocumentType";
+            this.gv_sourceDocumentType.OptionsColumn.AllowEdit = false;
+            this.gv_sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
+            this.gv_sourceDocumentType.Visible = true;
+            this.gv_sourceDocumentType.VisibleIndex = 37;
+            this.gv_sourceDocumentType.Width = 94;
+            // 
+            // gv_sourceDocumentId
+            // 
+            this.gv_sourceDocumentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_sourceDocumentId.AppearanceCell.Options.UseFont = true;
+            this.gv_sourceDocumentId.Caption = "鏉ユ簮鍗曟嵁鍙� ";
+            this.gv_sourceDocumentId.FieldName = "sourceDocumentId";
+            this.gv_sourceDocumentId.MinWidth = 50;
+            this.gv_sourceDocumentId.Name = "gv_sourceDocumentId";
+            this.gv_sourceDocumentId.OptionsColumn.AllowEdit = false;
+            this.gv_sourceDocumentId.Tag = "query_a.SOURCE_DOCUMENT_ID";
+            this.gv_sourceDocumentId.Visible = true;
+            this.gv_sourceDocumentId.VisibleIndex = 38;
+            this.gv_sourceDocumentId.Width = 94;
+            // 
+            // gv_demandTrackingId
+            // 
+            this.gv_demandTrackingId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_demandTrackingId.AppearanceCell.Options.UseFont = true;
+            this.gv_demandTrackingId.Caption = "闇�姹傝窡韪彿 ";
+            this.gv_demandTrackingId.FieldName = "demandTrackingId";
+            this.gv_demandTrackingId.MinWidth = 50;
+            this.gv_demandTrackingId.Name = "gv_demandTrackingId";
+            this.gv_demandTrackingId.OptionsColumn.AllowEdit = false;
+            this.gv_demandTrackingId.Tag = "query_a.DEMAND_TRACKING_ID";
+            this.gv_demandTrackingId.Visible = true;
+            this.gv_demandTrackingId.VisibleIndex = 39;
+            this.gv_demandTrackingId.Width = 94;
+            // 
+            // gv_planTrackingId
+            // 
+            this.gv_planTrackingId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_planTrackingId.AppearanceCell.Options.UseFont = true;
+            this.gv_planTrackingId.Caption = "璁″垝璺熻釜鍙� ";
+            this.gv_planTrackingId.FieldName = "planTrackingId";
+            this.gv_planTrackingId.MinWidth = 50;
+            this.gv_planTrackingId.Name = "gv_planTrackingId";
+            this.gv_planTrackingId.OptionsColumn.AllowEdit = false;
+            this.gv_planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
+            this.gv_planTrackingId.Visible = true;
+            this.gv_planTrackingId.VisibleIndex = 40;
+            this.gv_planTrackingId.Width = 94;
+            // 
+            // gv_changeFlag
+            // 
+            this.gv_changeFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_changeFlag.AppearanceCell.Options.UseFont = true;
+            this.gv_changeFlag.Caption = "鍙樻洿鏍囪瘑 ";
+            this.gv_changeFlag.FieldName = "changeFlag";
+            this.gv_changeFlag.MinWidth = 50;
+            this.gv_changeFlag.Name = "gv_changeFlag";
+            this.gv_changeFlag.OptionsColumn.AllowEdit = false;
+            this.gv_changeFlag.Tag = "query_a.CHANGE_FLAG";
+            this.gv_changeFlag.Visible = true;
+            this.gv_changeFlag.VisibleIndex = 41;
+            this.gv_changeFlag.Width = 94;
+            // 
+            // gv_demandSource
+            // 
+            this.gv_demandSource.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_demandSource.AppearanceCell.Options.UseFont = true;
+            this.gv_demandSource.Caption = "闇�姹傛潵婧� ";
+            this.gv_demandSource.FieldName = "demandSource";
+            this.gv_demandSource.MinWidth = 50;
+            this.gv_demandSource.Name = "gv_demandSource";
+            this.gv_demandSource.OptionsColumn.AllowEdit = false;
+            this.gv_demandSource.Tag = "query_a.DEMAND_SOURCE";
+            this.gv_demandSource.Visible = true;
+            this.gv_demandSource.VisibleIndex = 42;
+            this.gv_demandSource.Width = 94;
+            // 
+            // gv_demandDocumentId
+            // 
+            this.gv_demandDocumentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_demandDocumentId.AppearanceCell.Options.UseFont = true;
+            this.gv_demandDocumentId.Caption = "闇�姹傚崟鎹彿 ";
+            this.gv_demandDocumentId.FieldName = "demandDocumentId";
+            this.gv_demandDocumentId.MinWidth = 50;
+            this.gv_demandDocumentId.Name = "gv_demandDocumentId";
+            this.gv_demandDocumentId.OptionsColumn.AllowEdit = false;
+            this.gv_demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
+            this.gv_demandDocumentId.Visible = true;
+            this.gv_demandDocumentId.VisibleIndex = 43;
+            this.gv_demandDocumentId.Width = 94;
+            // 
+            // gv_demandDocumentLineId
+            // 
+            this.gv_demandDocumentLineId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_demandDocumentLineId.AppearanceCell.Options.UseFont = true;
+            this.gv_demandDocumentLineId.Caption = "闇�姹傚崟鎹鍙� ";
+            this.gv_demandDocumentLineId.FieldName = "demandDocumentLineId";
+            this.gv_demandDocumentLineId.MinWidth = 50;
+            this.gv_demandDocumentLineId.Name = "gv_demandDocumentLineId";
+            this.gv_demandDocumentLineId.OptionsColumn.AllowEdit = false;
+            this.gv_demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
+            this.gv_demandDocumentLineId.Visible = true;
+            this.gv_demandDocumentLineId.VisibleIndex = 44;
+            this.gv_demandDocumentLineId.Width = 94;
+            // 
+            // gv_ebelnK3id
+            // 
+            this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
+            this.gv_ebelnK3id.Caption = "閲囪喘璁㈠崟琛屽彿锛圞3绯荤粺锛� ";
+            this.gv_ebelnK3id.FieldName = "ebelnK3id";
+            this.gv_ebelnK3id.MinWidth = 50;
+            this.gv_ebelnK3id.Name = "gv_ebelnK3id";
+            this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
+            this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
+            this.gv_ebelnK3id.Visible = true;
+            this.gv_ebelnK3id.VisibleIndex = 45;
+            this.gv_ebelnK3id.Width = 94;
+            // 
+            // gv_remark1
+            // 
+            this.gv_remark1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remark1.AppearanceCell.Options.UseFont = true;
+            this.gv_remark1.Caption = "澶囨敞1 ";
+            this.gv_remark1.FieldName = "remark1";
+            this.gv_remark1.MinWidth = 50;
+            this.gv_remark1.Name = "gv_remark1";
+            this.gv_remark1.OptionsColumn.AllowEdit = false;
+            this.gv_remark1.Tag = "query_a.REMARK1";
+            this.gv_remark1.Visible = true;
+            this.gv_remark1.VisibleIndex = 46;
+            this.gv_remark1.Width = 94;
+            // 
+            // gv_remark2
+            // 
+            this.gv_remark2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remark2.AppearanceCell.Options.UseFont = true;
+            this.gv_remark2.Caption = "澶囨敞2 ";
+            this.gv_remark2.FieldName = "remark2";
+            this.gv_remark2.MinWidth = 50;
+            this.gv_remark2.Name = "gv_remark2";
+            this.gv_remark2.OptionsColumn.AllowEdit = false;
+            this.gv_remark2.Tag = "query_a.REMARK2";
+            this.gv_remark2.Visible = true;
+            this.gv_remark2.VisibleIndex = 47;
+            this.gv_remark2.Width = 94;
+            // 
+            // gv_remark3
+            // 
+            this.gv_remark3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remark3.AppearanceCell.Options.UseFont = true;
+            this.gv_remark3.Caption = "澶囨敞3 ";
+            this.gv_remark3.FieldName = "remark3";
+            this.gv_remark3.MinWidth = 50;
+            this.gv_remark3.Name = "gv_remark3";
+            this.gv_remark3.OptionsColumn.AllowEdit = false;
+            this.gv_remark3.Tag = "query_a.REMARK3";
+            this.gv_remark3.Visible = true;
+            this.gv_remark3.VisibleIndex = 48;
+            this.gv_remark3.Width = 94;
+            // 
+            // gv_remark4
+            // 
+            this.gv_remark4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remark4.AppearanceCell.Options.UseFont = true;
+            this.gv_remark4.Caption = "澶囨敞4 ";
+            this.gv_remark4.FieldName = "remark4";
+            this.gv_remark4.MinWidth = 50;
+            this.gv_remark4.Name = "gv_remark4";
+            this.gv_remark4.OptionsColumn.AllowEdit = false;
+            this.gv_remark4.Tag = "query_a.REMARK4";
+            this.gv_remark4.Visible = true;
+            this.gv_remark4.VisibleIndex = 49;
+            this.gv_remark4.Width = 94;
+            // 
+            // gv_remark5
+            // 
+            this.gv_remark5.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remark5.AppearanceCell.Options.UseFont = true;
+            this.gv_remark5.Caption = "澶囨敞5 ";
+            this.gv_remark5.FieldName = "remark5";
+            this.gv_remark5.MinWidth = 50;
+            this.gv_remark5.Name = "gv_remark5";
+            this.gv_remark5.OptionsColumn.AllowEdit = false;
+            this.gv_remark5.Tag = "query_a.REMARK5";
+            this.gv_remark5.Visible = true;
+            this.gv_remark5.VisibleIndex = 50;
+            this.gv_remark5.Width = 94;
+            // 
+            // gv_id
+            // 
+            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_id.AppearanceCell.Options.UseFont = true;
+            this.gv_id.Caption = "涓婚敭ID ";
+            this.gv_id.FieldName = "id";
+            this.gv_id.MinWidth = 50;
+            this.gv_id.Name = "gv_id";
+            this.gv_id.OptionsColumn.AllowEdit = false;
+            this.gv_id.Tag = "query_a.ID";
+            this.gv_id.Visible = true;
+            this.gv_id.VisibleIndex = 51;
+            this.gv_id.Width = 94;
+            // 
+            // gv_erpId
+            // 
+            this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_erpId.AppearanceCell.Options.UseFont = true;
+            this.gv_erpId.Caption = "ERP绯荤粺涓殑ID ";
+            this.gv_erpId.FieldName = "erpId";
+            this.gv_erpId.MinWidth = 50;
+            this.gv_erpId.Name = "gv_erpId";
+            this.gv_erpId.OptionsColumn.AllowEdit = false;
+            this.gv_erpId.Tag = "query_a.ERP_ID";
+            this.gv_erpId.Visible = true;
+            this.gv_erpId.VisibleIndex = 52;
+            this.gv_erpId.Width = 94;
+            // 
+            // gv_purchaseOrderLineNumber
+            // 
+            this.gv_purchaseOrderLineNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_purchaseOrderLineNumber.AppearanceCell.Options.UseFont = true;
+            this.gv_purchaseOrderLineNumber.Caption = "閲囪喘璁㈠崟琛屽彿 ";
+            this.gv_purchaseOrderLineNumber.FieldName = "purchaseOrderLineNumber";
+            this.gv_purchaseOrderLineNumber.MinWidth = 50;
+            this.gv_purchaseOrderLineNumber.Name = "gv_purchaseOrderLineNumber";
+            this.gv_purchaseOrderLineNumber.OptionsColumn.AllowEdit = false;
+            this.gv_purchaseOrderLineNumber.Tag = "query_a.PURCHASE_ORDER_LINE_NUMBER";
+            this.gv_purchaseOrderLineNumber.Visible = true;
+            this.gv_purchaseOrderLineNumber.VisibleIndex = 53;
+            this.gv_purchaseOrderLineNumber.Width = 94;
+            // 
+            // gv_demand
+            // 
+            this.gv_demand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_demand.AppearanceCell.Options.UseFont = true;
+            this.gv_demand.Caption = "闇�姹傜粍缁囷紙鎵╁睍锛� ";
+            this.gv_demand.FieldName = "demand";
+            this.gv_demand.MinWidth = 50;
+            this.gv_demand.Name = "gv_demand";
+            this.gv_demand.OptionsColumn.AllowEdit = false;
+            this.gv_demand.Tag = "query_a.DEMAND";
+            this.gv_demand.Visible = true;
+            this.gv_demand.VisibleIndex = 54;
+            this.gv_demand.Width = 94;
+            // 
+            // gv_receiving
+            // 
+            this.gv_receiving.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_receiving.AppearanceCell.Options.UseFont = true;
+            this.gv_receiving.Caption = "鏀舵枡缁勭粐锛堟墿灞曪級 ";
+            this.gv_receiving.FieldName = "receiving";
+            this.gv_receiving.MinWidth = 50;
+            this.gv_receiving.Name = "gv_receiving";
+            this.gv_receiving.OptionsColumn.AllowEdit = false;
+            this.gv_receiving.Tag = "query_a.RECEIVING";
+            this.gv_receiving.Visible = true;
+            this.gv_receiving.VisibleIndex = 55;
+            this.gv_receiving.Width = 94;
+            // 
+            // gv_settlement
+            // 
+            this.gv_settlement.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_settlement.AppearanceCell.Options.UseFont = true;
+            this.gv_settlement.Caption = "缁撶畻缁勭粐锛堟墿灞曪級 ";
+            this.gv_settlement.FieldName = "settlement";
+            this.gv_settlement.MinWidth = 50;
+            this.gv_settlement.Name = "gv_settlement";
+            this.gv_settlement.OptionsColumn.AllowEdit = false;
+            this.gv_settlement.Tag = "query_a.SETTLEMENT";
+            this.gv_settlement.Visible = true;
+            this.gv_settlement.VisibleIndex = 56;
+            this.gv_settlement.Width = 94;
+            // 
+            // gv_cgb014
+            // 
+            this.gv_cgb014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_cgb014.AppearanceCell.Options.UseFont = true;
+            this.gv_cgb014.Caption = "棰勭暀瀛楁CGB014 ";
+            this.gv_cgb014.FieldName = "cgb014";
+            this.gv_cgb014.MinWidth = 50;
+            this.gv_cgb014.Name = "gv_cgb014";
+            this.gv_cgb014.OptionsColumn.AllowEdit = false;
+            this.gv_cgb014.Tag = "query_a.CGB014";
+            this.gv_cgb014.Visible = true;
+            this.gv_cgb014.VisibleIndex = 57;
+            this.gv_cgb014.Width = 94;
+            // 
+            // gv_factory
+            // 
+            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_factory.AppearanceCell.Options.UseFont = true;
+            this.gv_factory.Caption = "宸ュ巶 ";
+            this.gv_factory.FieldName = "factory";
+            this.gv_factory.MinWidth = 50;
+            this.gv_factory.Name = "gv_factory";
+            this.gv_factory.OptionsColumn.AllowEdit = false;
+            this.gv_factory.Tag = "query_a.FACTORY";
+            this.gv_factory.Visible = true;
+            this.gv_factory.VisibleIndex = 58;
+            this.gv_factory.Width = 94;
+            // 
+            // gv_company
+            // 
+            this.gv_company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_company.AppearanceCell.Options.UseFont = true;
+            this.gv_company.Caption = "鍏徃缂栧彿 ";
+            this.gv_company.FieldName = "company";
+            this.gv_company.MinWidth = 50;
+            this.gv_company.Name = "gv_company";
+            this.gv_company.OptionsColumn.AllowEdit = false;
+            this.gv_company.Tag = "query_a.COMPANY";
+            this.gv_company.Visible = true;
+            this.gv_company.VisibleIndex = 59;
+            this.gv_company.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.Name = "panelControl1";
+            this.panelControl1.Size = new System.Drawing.Size(1126, 43);
+            this.panelControl1.TabIndex = 4;
+            // 
+            // btnIn
+            // 
+            this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
+            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+            this.btnIn.Location = new System.Drawing.Point(2, 2);
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Size = new System.Drawing.Size(94, 39);
+            this.btnIn.TabIndex = 4;
+            this.btnIn.Text = "纭畾瀵煎叆";
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pageBar1.Location = new System.Drawing.Point(140, 2);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.RowsCount = 50;
+            this.pageBar1.Size = new System.Drawing.Size(984, 39);
+            this.pageBar1.TabIndex = 3;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // SelectCgMx
+            // 
+            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.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "SelectCgMx";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏";
+            ((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.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_company;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_cgb014;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_settlement;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_receiving;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_demand;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseOrderLineNumber;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark5;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark4;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark3;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark2;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentLineId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_demandSource;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_changeFlag;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_planTrackingId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_demandTrackingId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentType;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_returnableStoredQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_returnableReceivedQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_totalReturnedQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remainingStoredQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_totalStoredQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remainingReceivedQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_totalReceivedQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_terminateTime;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_terminator;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_businessTerminate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_freezeTime;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_freezer;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_businessFreeze;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_businessClose;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_batchNumber;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_outsourcingOrderId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_isGift;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_settlementOrg;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_receivingOrg;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_demandOrg;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_latestDeliveryDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_earliestDeliveryDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_deliveryDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_pricingQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_pricingUnit;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryUnit;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
+        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;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
new file mode 100644
index 0000000..f7a97b9
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -0,0 +1,100 @@
+锘縰sing 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.UserControl
+{
+    public partial class SelectCgMx : DevExpress.XtraEditors.XtraForm
+    {
+        /// <summary>
+        /// 鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+        string _webServiceName = "MesRohInDataManager/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public SelectCgMx()
+        {
+            InitializeComponent();
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+            getPageList(1, UtilityHelper.GetPageSize());
+            gridView1.IndicatorWidth = 50;
+            gridView1.CustomDrawRowIndicator += (s, e) =>
+            {
+                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+                {
+                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
+                }
+            };
+            btnIn.Click += (s, e) =>
+            {
+                List<string> list = new List<string>();
+                for (int i = 0; i < gridView1.DataRowCount; i++)
+                {
+                    var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
+                    if (checkBox == "Checked")
+                    {
+                        string _guid = gridView1.GetRowCellValue(i, "guid").ToString();
+                        list.Add(_guid);
+                    }
+                }
+                UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list });
+                this.Close();
+            };
+        }
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage, pageSize);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage, int pageSize)
+        {
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            foreach (FilterEntity itm in _filterList)
+            {
+                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+            }
+            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                DataTable dt = dd.rtnData.list;
+                gcMain.BindingContext = new BindingContext();
+                gcMain.DataSource = dt;
+                gcMain.ForceInitialize();
+                int dddd = dd.rtnData.pages;//鎬婚〉
+                pageBar1.TotalPages = dddd;
+                pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+                pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+                pageBar1.setTxt();
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.resx b/DevApp/Gs.DevApp/UserControl/SelectCgMx.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.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>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs b/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
index 2ac1088..a152a48 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
@@ -28,6 +28,7 @@
             var _obj = new
             {
                 rptParameter = this._rptParameter,
+                // rptData = null,鍒濆鏃朵笉鐢ㄨ璁℃ā鏉�
             };
             try
             {
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
new file mode 100644
index 0000000..ff03b1d
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
@@ -0,0 +1,115 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+    partial class UcLookSupplier
+    {
+        /// <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 Component 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.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // lookSearchSupplier
+            // 
+            this.lookSearchSupplier.Location = new System.Drawing.Point(3, 3);
+            this.lookSearchSupplier.Name = "lookSearchSupplier";
+            this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
+            this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
+            this.lookSearchSupplier.Size = new System.Drawing.Size(207, 28);
+            this.lookSearchSupplier.TabIndex = 7;
+            // 
+            // searchLookUpEdit1View
+            // 
+            this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn1,
+            this.gridColumn4});
+            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "渚涘簲鍟嗙紪鍙�";
+            this.gridColumn2.FieldName = "suppNo";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 0;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "渚涘簲鍟嗗悕绉�";
+            this.gridColumn3.FieldName = "suppName";
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 1;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "id";
+            this.gridColumn1.FieldName = "id";
+            this.gridColumn1.Name = "gridColumn1";
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "guid";
+            this.gridColumn4.FieldName = "guid";
+            this.gridColumn4.Name = "gridColumn4";
+            // 
+            // UcLookSupplier
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.lookSearchSupplier);
+            this.Name = "UcLookSupplier";
+            this.Size = new System.Drawing.Size(228, 37);
+            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier;
+        private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+    }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
new file mode 100644
index 0000000..2823fff
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -0,0 +1,87 @@
+锘縰sing 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.UserControl
+{
+    public partial class UcLookSupplier : DevExpress.XtraEditors.XtraUserControl
+    {
+        /// <summary>
+        /// 鏀瑰彉浜嬩欢
+        /// </summary>
+        public event EventHandler EditChanged;
+
+        public UcLookSupplier()
+        {
+            InitializeComponent();
+            this.lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged;
+            getSuppler();
+        }
+        private void LookSearchSupplier_EditValueChanged(object sender, EventArgs e)
+        {
+            ////浣跨敤灞炴��
+            //string daID = this.lookSearchSupplier.EditValue.ToString();
+            //string xm = this.lookSearchSupplier.Text.Trim();
+            ////浣跨敤鏂规硶
+            //DataRowView row = this.lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+            //if (row != null)
+            //{
+            //    xm = row["guid"].ToString();
+            //}
+            if (EditChanged != null)
+            {
+                EditChanged(this, e);
+            }
+        }
+        private void getSuppler()
+        {
+            PageQueryModel pgq = new PageQueryModel(1, 999999, "supp_no", "asc", "", " and fforbidstatus='A'");
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                string strReturn = UtilityHelper.HttpPost("", "MesSupplierManager/GetListPage", json);
+                ReturnModel<PageListModel> rtn = UtilityHelper.ReturnToTablePage(strReturn);
+                DataTable dt = rtn.rtnData.list;
+                lookSearchSupplier.Properties.DataSource = dt;
+                lookSearchSupplier.Properties.DisplayMember = "suppName";
+                lookSearchSupplier.Properties.ValueMember = "id";
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍙栨帶浠剁殑鍊�
+        /// </summary>
+        /// <return>Object</return>
+        public string[] GetValue()
+        {
+
+            //object v = null;
+            //v = this.lookSearchSupplier.EditValue == null || this.lookSearchSupplier.EditValue == DBNull.Value ? string.Empty : this.lookSearchSupplier.EditValue.ToString();
+            //return v;
+            string id = this.lookSearchSupplier.EditValue.ToString();
+            string name = this.lookSearchSupplier.Text.Trim();
+            string code = "";
+            DataRowView row = this.lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+            if (row != null)
+            {
+                code = row["suppNo"].ToString();
+            }
+            string[] _ary = { id, name,code };
+            return _ary;
+        }
+    }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.resx b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.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>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index bd97e56..ebf6582 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -46,14 +46,16 @@
             this.btnFchk = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnPrint = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnHb = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnOut = new DevExpress.XtraBars.BarLargeButtonItem();
-            this.btnIn = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnKG = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnQuery = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnIn = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnOut = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnRole = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnReport = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnDesign = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnJianYan = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnFjianYan = new DevExpress.XtraBars.BarLargeButtonItem();
             this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
@@ -107,9 +109,11 @@
             this.btnRole,
             this.btnReport,
             this.btnQuery,
-            this.btnDesign});
+            this.btnDesign,
+            this.btnJianYan,
+            this.btnFjianYan});
             this.barManager1.MainMenu = this.bar2;
-            this.barManager1.MaxItemId = 27;
+            this.barManager1.MaxItemId = 29;
             // 
             // bar2
             // 
@@ -135,7 +139,9 @@
             new DevExpress.XtraBars.LinkPersistInfo(this.btnOut),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnRole),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnReport),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnDesign)});
+            new DevExpress.XtraBars.LinkPersistInfo(this.btnDesign),
+            new DevExpress.XtraBars.LinkPersistInfo(this.btnJianYan),
+            new DevExpress.XtraBars.LinkPersistInfo(this.btnFjianYan)});
             this.bar2.OptionsBar.MultiLine = true;
             this.bar2.OptionsBar.UseWholeRow = true;
             this.bar2.Text = "Main menu";
@@ -252,29 +258,6 @@
             this.btnHb.Name = "btnHb";
             this.btnHb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
-            // btnOut
-            // 
-            this.btnOut.Caption = "瀵煎嚭";
-            this.btnOut.Description = "瀵煎嚭";
-            this.btnOut.Id = 12;
-            this.btnOut.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnOut.ImageOptions.Image")));
-            this.btnOut.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnOut.ImageOptions.LargeImage")));
-            this.btnOut.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.btnOut.ItemAppearance.Normal.Options.UseFont = true;
-            this.btnOut.Name = "btnOut";
-            this.btnOut.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
-            // btnIn
-            // 
-            this.btnIn.Caption = "瀵煎叆";
-            this.btnIn.Id = 17;
-            this.btnIn.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnIn.ImageOptions.Image")));
-            this.btnIn.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnIn.ImageOptions.LargeImage")));
-            this.btnIn.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.btnIn.ItemAppearance.Normal.Options.UseFont = true;
-            this.btnIn.Name = "btnIn";
-            this.btnIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            // 
             // btnLog
             // 
             this.btnLog.Caption = "鏃ュ織";
@@ -301,6 +284,29 @@
             this.btnQuery.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.zoom100_32x32;
             this.btnQuery.Name = "btnQuery";
             this.btnQuery.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnIn
+            // 
+            this.btnIn.Caption = "瀵煎叆";
+            this.btnIn.Id = 17;
+            this.btnIn.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnIn.ImageOptions.Image")));
+            this.btnIn.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnIn.ImageOptions.LargeImage")));
+            this.btnIn.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.btnIn.ItemAppearance.Normal.Options.UseFont = true;
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnOut
+            // 
+            this.btnOut.Caption = "瀵煎嚭";
+            this.btnOut.Description = "瀵煎嚭";
+            this.btnOut.Id = 12;
+            this.btnOut.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnOut.ImageOptions.Image")));
+            this.btnOut.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnOut.ImageOptions.LargeImage")));
+            this.btnOut.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.btnOut.ItemAppearance.Normal.Options.UseFont = true;
+            this.btnOut.Name = "btnOut";
+            this.btnOut.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
             // btnRole
             // 
@@ -329,13 +335,31 @@
             this.btnDesign.Name = "btnDesign";
             this.btnDesign.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
+            // btnJianYan
+            // 
+            this.btnJianYan.Caption = "鎻愪氦妫�楠�";
+            this.btnJianYan.Id = 27;
+            this.btnJianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x16;
+            this.btnJianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x32;
+            this.btnJianYan.Name = "btnJianYan";
+            this.btnJianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
+            // btnFjianYan
+            // 
+            this.btnFjianYan.Caption = "鎾ゅ洖妫�楠�";
+            this.btnFjianYan.Id = 28;
+            this.btnFjianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.radiobuttons_16x16;
+            this.btnFjianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.radiobuttons_32x32;
+            this.btnFjianYan.Name = "btnFjianYan";
+            this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
             // barDockControlTop
             // 
             this.barDockControlTop.CausesValidation = false;
             this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
             this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
             this.barDockControlTop.Manager = this.barManager1;
-            this.barDockControlTop.Size = new System.Drawing.Size(1293, 74);
+            this.barDockControlTop.Size = new System.Drawing.Size(1543, 74);
             // 
             // barDockControlBottom
             // 
@@ -343,13 +367,13 @@
             this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.barDockControlBottom.Location = new System.Drawing.Point(0, 77);
             this.barDockControlBottom.Manager = this.barManager1;
-            this.barDockControlBottom.Size = new System.Drawing.Size(1293, 0);
+            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
             // 
             // barDockControlRight
             // 
             this.barDockControlRight.CausesValidation = false;
             this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
-            this.barDockControlRight.Location = new System.Drawing.Point(1293, 74);
+            this.barDockControlRight.Location = new System.Drawing.Point(1543, 74);
             this.barDockControlRight.Manager = this.barManager1;
             this.barDockControlRight.Size = new System.Drawing.Size(0, 3);
             // 
@@ -362,7 +386,7 @@
             this.Controls.Add(this.barDockControlBottom);
             this.Controls.Add(this.barDockControlTop);
             this.Name = "UcToolBarMenu";
-            this.Size = new System.Drawing.Size(1293, 77);
+            this.Size = new System.Drawing.Size(1543, 77);
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -396,5 +420,7 @@
         private DevExpress.XtraBars.BarLargeButtonItem btnReport;
         private DevExpress.XtraBars.BarLargeButtonItem btnQuery;
         private DevExpress.XtraBars.BarLargeButtonItem btnDesign;
+        private DevExpress.XtraBars.BarLargeButtonItem btnJianYan;
+        private DevExpress.XtraBars.BarLargeButtonItem btnFjianYan;
     }
 }
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index f5e4051..e998fca 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -520,6 +520,7 @@
                       );
                         if (ld1 == true)
                         {
+
                             btnEsc.Visibility = btnSave.Visibility = btnLoad.Visibility = BarItemVisibility.Always;
                             btnAdd.Visibility = BarItemVisibility.Always;
                             _enabledList.Add(item.Name);
@@ -552,6 +553,19 @@
                             continue;
                         }
                     }
+                    ///鍏锋湁鑱斿姩鍏崇郴鐨勬寜閽�(鎻愪氦妫�楠�)锛�
+                    if (item.Caption == "鎻愪氦妫�楠�")
+                    {
+                        bool ld1 = dt.AsEnumerable().Any(row => row.Field<string>("name") == "鎻愪氦妫�楠�"
+                      );
+                        if (ld1 == true)
+                        {
+                            btnJianYan.Visibility = btnFjianYan.Visibility = btnLoad.Visibility = BarItemVisibility.Always;
+                            btnJianYan.Visibility = BarItemVisibility.Always;
+                            _enabledList.Add(item.Name);
+                            continue;
+                        }
+                    }
                     //鎸夐挳鏄惁鍦ㄦ潈闄愯〃涓�
                     bool exists = dt.AsEnumerable().Any(row => row.Field<string>("name") == item.Caption);
                     if (exists == true)
diff --git a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/report/Dictionary.frd b/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/report/Dictionary.frd
deleted file mode 100644
index 47ae511..0000000
--- a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/report/Dictionary.frd
+++ /dev/null
@@ -1,69 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Dictionary>
-  <TableDataSource Name="zb" ReferenceName="Data.zb" DataType="System.Int32" Enabled="true">
-    <Column Name="z1" DataType="System.String" PropName="Column"/>
-    <Column Name="z2" DataType="System.String" PropName="Column"/>
-    <Column Name="z3" DataType="System.String" PropName="Column"/>
-    <Column Name="z4" DataType="System.String" PropName="Column"/>
-    <Column Name="z5" DataType="System.String" PropName="Column"/>
-    <Column Name="z6" DataType="System.String" PropName="Column"/>
-    <Column Name="z7" DataType="System.String" PropName="Column"/>
-    <Column Name="z8" DataType="System.String" PropName="Column"/>
-    <Column Name="z9" DataType="System.String" PropName="Column"/>
-    <Column Name="z10" DataType="System.String" PropName="Column"/>
-    <Column Name="z11" DataType="System.String" PropName="Column"/>
-    <Column Name="z12" DataType="System.String" PropName="Column"/>
-    <Column Name="z13" DataType="System.String" PropName="Column"/>
-    <Column Name="z14" DataType="System.String" PropName="Column"/>
-    <Column Name="z15" DataType="System.String" PropName="Column"/>
-    <Column Name="z16" DataType="System.String" PropName="Column"/>
-    <Column Name="z17" DataType="System.String" PropName="Column"/>
-    <Column Name="z18" DataType="System.String" PropName="Column"/>
-    <Column Name="z19" DataType="System.String" PropName="Column"/>
-    <Column Name="z20" DataType="System.String" PropName="Column"/>
-  </TableDataSource>
-  <TableDataSource Name="mx1" ReferenceName="Data.mx1" DataType="System.Int32" Enabled="true">
-    <Column Name="m1" DataType="System.String" PropName="Column"/>
-    <Column Name="m2" DataType="System.String" PropName="Column"/>
-    <Column Name="m3" DataType="System.String" PropName="Column"/>
-    <Column Name="m4" DataType="System.String" PropName="Column"/>
-    <Column Name="m5" DataType="System.String" PropName="Column"/>
-    <Column Name="m6" DataType="System.String" PropName="Column"/>
-    <Column Name="m7" DataType="System.String" PropName="Column"/>
-    <Column Name="m8" DataType="System.String" PropName="Column"/>
-    <Column Name="m9" DataType="System.String" PropName="Column"/>
-    <Column Name="m10" DataType="System.String" PropName="Column"/>
-    <Column Name="m11" DataType="System.String" PropName="Column"/>
-    <Column Name="m12" DataType="System.String" PropName="Column"/>
-    <Column Name="m13" DataType="System.String" PropName="Column"/>
-    <Column Name="m14" DataType="System.String" PropName="Column"/>
-    <Column Name="m15" DataType="System.String" PropName="Column"/>
-    <Column Name="m16" DataType="System.String" PropName="Column"/>
-    <Column Name="m17" DataType="System.String" PropName="Column"/>
-    <Column Name="m18" DataType="System.String" PropName="Column"/>
-    <Column Name="m19" DataType="System.String" PropName="Column"/>
-    <Column Name="m20" DataType="System.String" PropName="Column"/>
-  </TableDataSource>
- <TableDataSource Name="mx2" ReferenceName="Data.mx2" DataType="System.Int32" Enabled="true">
-    <Column Name="m1" DataType="System.String" PropName="Column"/>
-    <Column Name="m2" DataType="System.String" PropName="Column"/>
-    <Column Name="m3" DataType="System.String" PropName="Column"/>
-    <Column Name="m4" DataType="System.String" PropName="Column"/>
-    <Column Name="m5" DataType="System.String" PropName="Column"/>
-    <Column Name="m6" DataType="System.String" PropName="Column"/>
-    <Column Name="m7" DataType="System.String" PropName="Column"/>
-    <Column Name="m8" DataType="System.String" PropName="Column"/>
-    <Column Name="m9" DataType="System.String" PropName="Column"/>
-    <Column Name="m10" DataType="System.String" PropName="Column"/>
-    <Column Name="m11" DataType="System.String" PropName="Column"/>
-    <Column Name="m12" DataType="System.String" PropName="Column"/>
-    <Column Name="m13" DataType="System.String" PropName="Column"/>
-    <Column Name="m14" DataType="System.String" PropName="Column"/>
-    <Column Name="m15" DataType="System.String" PropName="Column"/>
-    <Column Name="m16" DataType="System.String" PropName="Column"/>
-    <Column Name="m17" DataType="System.String" PropName="Column"/>
-    <Column Name="m18" DataType="System.String" PropName="Column"/>
-    <Column Name="m19" DataType="System.String" PropName="Column"/>
-    <Column Name="m20" DataType="System.String" PropName="Column"/>
-  </TableDataSource>
-</Dictionary>
diff --git a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/report/RptDemo.frx b/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/report/RptDemo.frx
deleted file mode 100644
index 044cb57..0000000
--- a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/report/RptDemo.frx
+++ /dev/null
@@ -1,57 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/10/2024 16:46:56" ReportInfo.Modified="10/07/2024 20:12:11" ReportInfo.CreatorVersion="2013.2.5.0">
-  <Dictionary>
-    <TableDataSource Name="Table1" ReferenceName="Data.Table1" DataType="System.Int32" Enabled="true">
-      <Column Name="z1" DataType="System.String" PropName="Column"/>
-      <Column Name="z2" DataType="System.String" PropName="Column"/>
-      <Column Name="z3" DataType="System.String" PropName="Column"/>
-      <Column Name="z4" DataType="System.String" PropName="Column"/>
-      <Column Name="z5" DataType="System.String" PropName="Column"/>
-      <Column Name="z6" DataType="System.String" PropName="Column"/>
-      <Column Name="z7" DataType="System.String" PropName="Column"/>
-      <Column Name="z8" DataType="System.String" PropName="Column"/>
-      <Column Name="z9" DataType="System.String" PropName="Column"/>
-      <Column Name="z10" DataType="System.String" PropName="Column"/>
-      <Column Name="z11" DataType="System.String" PropName="Column"/>
-      <Column Name="z12" DataType="System.String" PropName="Column"/>
-      <Column Name="z13" DataType="System.String" PropName="Column"/>
-      <Column Name="z14" DataType="System.String" PropName="Column"/>
-      <Column Name="z15" DataType="System.String" PropName="Column"/>
-      <Column Name="z16" DataType="System.String" PropName="Column"/>
-      <Column Name="z17" DataType="System.String" PropName="Column"/>
-      <Column Name="z18" DataType="System.String" PropName="Column"/>
-      <Column Name="z19" DataType="System.String" PropName="Column"/>
-      <Column Name="z20" DataType="System.String" PropName="Column"/>
-    </TableDataSource>
-    <TableDataSource Name="Table2" ReferenceName="Data.Table2" DataType="System.Int32" Enabled="true">
-      <Column Name="m1" DataType="System.String" PropName="Column"/>
-      <Column Name="m2" DataType="System.String" PropName="Column"/>
-      <Column Name="m3" DataType="System.String" PropName="Column"/>
-      <Column Name="m4" DataType="System.String" PropName="Column"/>
-      <Column Name="m5" DataType="System.String" PropName="Column"/>
-      <Column Name="m6" DataType="System.String" PropName="Column"/>
-      <Column Name="m7" DataType="System.String" PropName="Column"/>
-      <Column Name="m8" DataType="System.String" PropName="Column"/>
-      <Column Name="m9" DataType="System.String" PropName="Column"/>
-      <Column Name="m10" DataType="System.String" PropName="Column"/>
-      <Column Name="m11" DataType="System.String" PropName="Column"/>
-      <Column Name="m12" DataType="System.String" PropName="Column"/>
-      <Column Name="m13" DataType="System.String" PropName="Column"/>
-      <Column Name="m14" DataType="System.String" PropName="Column"/>
-      <Column Name="m15" DataType="System.String" PropName="Column"/>
-      <Column Name="m16" DataType="System.String" PropName="Column"/>
-      <Column Name="m17" DataType="System.String" PropName="Column"/>
-      <Column Name="m18" DataType="System.String" PropName="Column"/>
-      <Column Name="m19" DataType="System.String" PropName="Column"/>
-      <Column Name="m20" DataType="System.String" PropName="Column"/>
-    </TableDataSource>
-  </Dictionary>
-  <ReportPage Name="Page1" Guides="198.45,245.7">
-    <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="37.8">
-      <TextObject Name="Text9" Left="217.35" Top="9.45" Width="330.75" Height="18.9" Text="鎭枩浣狅紝鍙互寮�濮嬭璁℃姤琛ㄥ暒" HorzAlign="Center" Font="瀹嬩綋, 12pt, style=Bold"/>
-    </ReportTitleBand>
-    <PageHeaderBand Name="PageHeader1" Top="41.8" Width="718.2" Height="37.8"/>
-    <DataBand Name="Data1" Top="83.6" Width="718.2" Height="37.8" Border.Lines="All" DataSource="Table2"/>
-    <PageFooterBand Name="PageFooter1" Top="125.4" Width="718.2" Height="122.85"/>
-  </ReportPage>
-</Report>

--
Gitblit v1.9.3