t
lu
2024-10-22 0137d44c9e5b1dd76b208644a1b1484da0a1a1ab
t
已修改22个文件
已添加1个文件
563 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/User.resx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs 178 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj.user 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowRptWizard.Designer.cs 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 112 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -1091,11 +1091,10 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -900,11 +900,10 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(930, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
@@ -198,11 +198,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1139, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = "xls_holiday";
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -574,11 +574,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(938, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -1377,7 +1377,7 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1160, 80);
            this.toolBarMenu1.TabIndex = 0;
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
@@ -499,11 +499,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(914, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -773,11 +773,10 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(972, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = "XlsInMesUnit";
            this.toolBarMenu1.xlsOutView = "XlsOutMesUnit";
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -597,11 +597,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1283, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -803,11 +803,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1003, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -893,11 +893,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(992, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -203,11 +203,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(949, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -82,11 +82,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(772, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // xtraTabControl1
            // 
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -378,7 +378,7 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            // 
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
@@ -88,11 +88,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(794, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // xtraTabControl1
            // 
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -74,11 +74,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1237, 80);
            this.toolBarMenu1.TabIndex = 5;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // xtraTabControl1
            // 
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -31,17 +31,17 @@
        {
            DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
            DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(User));
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
            this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
@@ -124,11 +124,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = "RptUserRole";
            this.toolBarMenu1.rptParameter = "rpt_User{}";
            this.toolBarMenu1.Size = new System.Drawing.Size(738, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // gcMain
            // 
@@ -301,12 +301,12 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            serializableAppearanceObject1.Font = new System.Drawing.Font("Tahoma", 10F);
            serializableAppearanceObject1.Options.UseFont = true;
            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
            editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            serializableAppearanceObject17.Font = new System.Drawing.Font("Tahoma", 10F);
            serializableAppearanceObject17.Options.UseFont = true;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "设置角色", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "设置角色", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -327,10 +327,10 @@
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions6.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions6.Image")));
            editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "重置密码", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "重置密码", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
DevApp/Gs.DevApp/DevFrm/User/User.resx
@@ -118,7 +118,7 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="editorButtonImageOptions2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACp0RVh0VGl0
        bGUAQ29udGFjdDtDYXJkO0luZm87RGV0YWlsO1BlcnNvbjtFZGl04bGTWAAAAtlJREFUOE+Nk1lIVFEA
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -1110,11 +1110,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -75,7 +75,6 @@
            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -254,7 +253,7 @@
            this.gvMx1purchaseOrderLineNumber.Name = "gvMx1purchaseOrderLineNumber";
            this.gvMx1purchaseOrderLineNumber.Tag = "query_a.PURCHASE_ORDER_LINE_NUMBER";
            this.gvMx1purchaseOrderLineNumber.Visible = true;
            this.gvMx1purchaseOrderLineNumber.VisibleIndex = 47;
            this.gvMx1purchaseOrderLineNumber.VisibleIndex = 45;
            this.gvMx1purchaseOrderLineNumber.Width = 94;
            // 
            // gvMx1erpId
@@ -267,7 +266,7 @@
            this.gvMx1erpId.Name = "gvMx1erpId";
            this.gvMx1erpId.Tag = "query_a.ERP_ID";
            this.gvMx1erpId.Visible = true;
            this.gvMx1erpId.VisibleIndex = 46;
            this.gvMx1erpId.VisibleIndex = 44;
            this.gvMx1erpId.Width = 94;
            // 
            // gvMx1id
@@ -280,7 +279,7 @@
            this.gvMx1id.Name = "gvMx1id";
            this.gvMx1id.Tag = "query_a.ID";
            this.gvMx1id.Visible = true;
            this.gvMx1id.VisibleIndex = 45;
            this.gvMx1id.VisibleIndex = 43;
            this.gvMx1id.Width = 94;
            // 
            // gvMx1ebelnK3id
@@ -293,7 +292,7 @@
            this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
            this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gvMx1ebelnK3id.Visible = true;
            this.gvMx1ebelnK3id.VisibleIndex = 44;
            this.gvMx1ebelnK3id.VisibleIndex = 42;
            this.gvMx1ebelnK3id.Width = 94;
            // 
            // gvMx1demandDocumentLineId
@@ -306,7 +305,7 @@
            this.gvMx1demandDocumentLineId.Name = "gvMx1demandDocumentLineId";
            this.gvMx1demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
            this.gvMx1demandDocumentLineId.Visible = true;
            this.gvMx1demandDocumentLineId.VisibleIndex = 43;
            this.gvMx1demandDocumentLineId.VisibleIndex = 41;
            this.gvMx1demandDocumentLineId.Width = 94;
            // 
            // gvMx1demandDocumentId
@@ -319,7 +318,7 @@
            this.gvMx1demandDocumentId.Name = "gvMx1demandDocumentId";
            this.gvMx1demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
            this.gvMx1demandDocumentId.Visible = true;
            this.gvMx1demandDocumentId.VisibleIndex = 42;
            this.gvMx1demandDocumentId.VisibleIndex = 40;
            this.gvMx1demandDocumentId.Width = 94;
            // 
            // gvMx1demandSource
@@ -332,7 +331,7 @@
            this.gvMx1demandSource.Name = "gvMx1demandSource";
            this.gvMx1demandSource.Tag = "query_a.DEMAND_SOURCE";
            this.gvMx1demandSource.Visible = true;
            this.gvMx1demandSource.VisibleIndex = 41;
            this.gvMx1demandSource.VisibleIndex = 39;
            this.gvMx1demandSource.Width = 94;
            // 
            // gvMx1changeFlag
@@ -345,7 +344,7 @@
            this.gvMx1changeFlag.Name = "gvMx1changeFlag";
            this.gvMx1changeFlag.Tag = "query_a.CHANGE_FLAG";
            this.gvMx1changeFlag.Visible = true;
            this.gvMx1changeFlag.VisibleIndex = 40;
            this.gvMx1changeFlag.VisibleIndex = 38;
            this.gvMx1changeFlag.Width = 94;
            // 
            // gvMx1planTrackingId
@@ -358,7 +357,7 @@
            this.gvMx1planTrackingId.Name = "gvMx1planTrackingId";
            this.gvMx1planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
            this.gvMx1planTrackingId.Visible = true;
            this.gvMx1planTrackingId.VisibleIndex = 39;
            this.gvMx1planTrackingId.VisibleIndex = 37;
            this.gvMx1planTrackingId.Width = 94;
            // 
            // gvMx1demandTrackingId
@@ -371,7 +370,7 @@
            this.gvMx1demandTrackingId.Name = "gvMx1demandTrackingId";
            this.gvMx1demandTrackingId.Tag = "query_a.DEMAND_TRACKING_ID";
            this.gvMx1demandTrackingId.Visible = true;
            this.gvMx1demandTrackingId.VisibleIndex = 38;
            this.gvMx1demandTrackingId.VisibleIndex = 36;
            this.gvMx1demandTrackingId.Width = 94;
            // 
            // gvMx1sourceDocumentId
@@ -384,7 +383,7 @@
            this.gvMx1sourceDocumentId.Name = "gvMx1sourceDocumentId";
            this.gvMx1sourceDocumentId.Tag = "query_a.SOURCE_DOCUMENT_ID";
            this.gvMx1sourceDocumentId.Visible = true;
            this.gvMx1sourceDocumentId.VisibleIndex = 37;
            this.gvMx1sourceDocumentId.VisibleIndex = 35;
            this.gvMx1sourceDocumentId.Width = 94;
            // 
            // gvMx1sourceDocumentType
@@ -397,7 +396,7 @@
            this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType";
            this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
            this.gvMx1sourceDocumentType.Visible = true;
            this.gvMx1sourceDocumentType.VisibleIndex = 36;
            this.gvMx1sourceDocumentType.VisibleIndex = 34;
            this.gvMx1sourceDocumentType.Width = 94;
            // 
            // gvMx1returnableStoredQty
@@ -410,7 +409,7 @@
            this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
            this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
            this.gvMx1returnableStoredQty.Visible = true;
            this.gvMx1returnableStoredQty.VisibleIndex = 35;
            this.gvMx1returnableStoredQty.VisibleIndex = 33;
            this.gvMx1returnableStoredQty.Width = 94;
            // 
            // gvMx1returnableReceivedQty
@@ -423,7 +422,7 @@
            this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
            this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
            this.gvMx1returnableReceivedQty.Visible = true;
            this.gvMx1returnableReceivedQty.VisibleIndex = 34;
            this.gvMx1returnableReceivedQty.VisibleIndex = 32;
            this.gvMx1returnableReceivedQty.Width = 94;
            // 
            // gvMx1totalReturnedQty
@@ -436,7 +435,7 @@
            this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
            this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
            this.gvMx1totalReturnedQty.Visible = true;
            this.gvMx1totalReturnedQty.VisibleIndex = 33;
            this.gvMx1totalReturnedQty.VisibleIndex = 31;
            this.gvMx1totalReturnedQty.Width = 94;
            // 
            // gvMx1remainingStoredQty
@@ -449,7 +448,7 @@
            this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
            this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
            this.gvMx1remainingStoredQty.Visible = true;
            this.gvMx1remainingStoredQty.VisibleIndex = 32;
            this.gvMx1remainingStoredQty.VisibleIndex = 30;
            this.gvMx1remainingStoredQty.Width = 94;
            // 
            // gvMx1totalStoredQty
@@ -462,7 +461,7 @@
            this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
            this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
            this.gvMx1totalStoredQty.Visible = true;
            this.gvMx1totalStoredQty.VisibleIndex = 31;
            this.gvMx1totalStoredQty.VisibleIndex = 29;
            this.gvMx1totalStoredQty.Width = 94;
            // 
            // gvMx1remainingReceivedQty
@@ -475,7 +474,7 @@
            this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty";
            this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
            this.gvMx1remainingReceivedQty.Visible = true;
            this.gvMx1remainingReceivedQty.VisibleIndex = 30;
            this.gvMx1remainingReceivedQty.VisibleIndex = 28;
            this.gvMx1remainingReceivedQty.Width = 94;
            // 
            // gvMx1totalReceivedQty
@@ -488,7 +487,7 @@
            this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
            this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
            this.gvMx1totalReceivedQty.Visible = true;
            this.gvMx1totalReceivedQty.VisibleIndex = 29;
            this.gvMx1totalReceivedQty.VisibleIndex = 27;
            this.gvMx1totalReceivedQty.Width = 94;
            // 
            // gvMx1terminateTime
@@ -501,7 +500,7 @@
            this.gvMx1terminateTime.Name = "gvMx1terminateTime";
            this.gvMx1terminateTime.Tag = "query_a.TERMINATE_TIME";
            this.gvMx1terminateTime.Visible = true;
            this.gvMx1terminateTime.VisibleIndex = 28;
            this.gvMx1terminateTime.VisibleIndex = 26;
            this.gvMx1terminateTime.Width = 94;
            // 
            // gvMx1terminator
@@ -514,7 +513,7 @@
            this.gvMx1terminator.Name = "gvMx1terminator";
            this.gvMx1terminator.Tag = "query_a.TERMINATOR";
            this.gvMx1terminator.Visible = true;
            this.gvMx1terminator.VisibleIndex = 27;
            this.gvMx1terminator.VisibleIndex = 25;
            this.gvMx1terminator.Width = 94;
            // 
            // gvMx1businessTerminate
@@ -527,7 +526,7 @@
            this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
            this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
            this.gvMx1businessTerminate.Visible = true;
            this.gvMx1businessTerminate.VisibleIndex = 26;
            this.gvMx1businessTerminate.VisibleIndex = 24;
            this.gvMx1businessTerminate.Width = 94;
            // 
            // gvMx1freezeTime
@@ -540,7 +539,7 @@
            this.gvMx1freezeTime.Name = "gvMx1freezeTime";
            this.gvMx1freezeTime.Tag = "query_a.FREEZE_TIME";
            this.gvMx1freezeTime.Visible = true;
            this.gvMx1freezeTime.VisibleIndex = 25;
            this.gvMx1freezeTime.VisibleIndex = 23;
            this.gvMx1freezeTime.Width = 94;
            // 
            // gvMx1freezer
@@ -553,7 +552,7 @@
            this.gvMx1freezer.Name = "gvMx1freezer";
            this.gvMx1freezer.Tag = "query_a.FREEZER";
            this.gvMx1freezer.Visible = true;
            this.gvMx1freezer.VisibleIndex = 24;
            this.gvMx1freezer.VisibleIndex = 22;
            this.gvMx1freezer.Width = 94;
            // 
            // gvMx1businessFreeze
@@ -566,7 +565,7 @@
            this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
            this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
            this.gvMx1businessFreeze.Visible = true;
            this.gvMx1businessFreeze.VisibleIndex = 23;
            this.gvMx1businessFreeze.VisibleIndex = 21;
            this.gvMx1businessFreeze.Width = 94;
            // 
            // gvMx1businessClose
@@ -579,7 +578,7 @@
            this.gvMx1businessClose.Name = "gvMx1businessClose";
            this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
            this.gvMx1businessClose.Visible = true;
            this.gvMx1businessClose.VisibleIndex = 22;
            this.gvMx1businessClose.VisibleIndex = 20;
            this.gvMx1businessClose.Width = 94;
            // 
            // gvMx1batchNumber
@@ -592,7 +591,7 @@
            this.gvMx1batchNumber.Name = "gvMx1batchNumber";
            this.gvMx1batchNumber.Tag = "query_a.BATCH_NUMBER";
            this.gvMx1batchNumber.Visible = true;
            this.gvMx1batchNumber.VisibleIndex = 21;
            this.gvMx1batchNumber.VisibleIndex = 19;
            this.gvMx1batchNumber.Width = 94;
            // 
            // gvMx1outsourcingOrderId
@@ -605,7 +604,7 @@
            this.gvMx1outsourcingOrderId.Name = "gvMx1outsourcingOrderId";
            this.gvMx1outsourcingOrderId.Tag = "query_a.OUTSOURCING_ORDER_ID";
            this.gvMx1outsourcingOrderId.Visible = true;
            this.gvMx1outsourcingOrderId.VisibleIndex = 20;
            this.gvMx1outsourcingOrderId.VisibleIndex = 18;
            this.gvMx1outsourcingOrderId.Width = 94;
            // 
            // gvMx1supplierItemName
@@ -618,7 +617,7 @@
            this.gvMx1supplierItemName.Name = "gvMx1supplierItemName";
            this.gvMx1supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gvMx1supplierItemName.Visible = true;
            this.gvMx1supplierItemName.VisibleIndex = 19;
            this.gvMx1supplierItemName.VisibleIndex = 17;
            this.gvMx1supplierItemName.Width = 94;
            // 
            // gvMx1supplierItemCode
@@ -631,7 +630,7 @@
            this.gvMx1supplierItemCode.Name = "gvMx1supplierItemCode";
            this.gvMx1supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
            this.gvMx1supplierItemCode.Visible = true;
            this.gvMx1supplierItemCode.VisibleIndex = 18;
            this.gvMx1supplierItemCode.VisibleIndex = 16;
            this.gvMx1supplierItemCode.Width = 94;
            // 
            // gvMx1remarks
@@ -644,7 +643,7 @@
            this.gvMx1remarks.Name = "gvMx1remarks";
            this.gvMx1remarks.Tag = "query_a.REMARKS";
            this.gvMx1remarks.Visible = true;
            this.gvMx1remarks.VisibleIndex = 17;
            this.gvMx1remarks.VisibleIndex = 15;
            this.gvMx1remarks.Width = 94;
            // 
            // gvMx1isGift
@@ -657,7 +656,7 @@
            this.gvMx1isGift.Name = "gvMx1isGift";
            this.gvMx1isGift.Tag = "query_a.IS_GIFT";
            this.gvMx1isGift.Visible = true;
            this.gvMx1isGift.VisibleIndex = 16;
            this.gvMx1isGift.VisibleIndex = 14;
            this.gvMx1isGift.Width = 94;
            // 
            // gvMx1settlementOrg
@@ -670,7 +669,7 @@
            this.gvMx1settlementOrg.Name = "gvMx1settlementOrg";
            this.gvMx1settlementOrg.Tag = "query_a.SETTLEMENT_ORG";
            this.gvMx1settlementOrg.Visible = true;
            this.gvMx1settlementOrg.VisibleIndex = 15;
            this.gvMx1settlementOrg.VisibleIndex = 13;
            this.gvMx1settlementOrg.Width = 94;
            // 
            // gvMx1receivingOrg
@@ -683,7 +682,7 @@
            this.gvMx1receivingOrg.Name = "gvMx1receivingOrg";
            this.gvMx1receivingOrg.Tag = "query_a.RECEIVING_ORG";
            this.gvMx1receivingOrg.Visible = true;
            this.gvMx1receivingOrg.VisibleIndex = 14;
            this.gvMx1receivingOrg.VisibleIndex = 12;
            this.gvMx1receivingOrg.Width = 94;
            // 
            // gvMx1demandOrg
@@ -696,7 +695,7 @@
            this.gvMx1demandOrg.Name = "gvMx1demandOrg";
            this.gvMx1demandOrg.Tag = "query_a.DEMAND_ORG";
            this.gvMx1demandOrg.Visible = true;
            this.gvMx1demandOrg.VisibleIndex = 13;
            this.gvMx1demandOrg.VisibleIndex = 11;
            this.gvMx1demandOrg.Width = 94;
            // 
            // gvMx1latestDeliveryDate
@@ -709,7 +708,7 @@
            this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
            this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
            this.gvMx1latestDeliveryDate.Visible = true;
            this.gvMx1latestDeliveryDate.VisibleIndex = 12;
            this.gvMx1latestDeliveryDate.VisibleIndex = 10;
            this.gvMx1latestDeliveryDate.Width = 94;
            // 
            // gvMx1earliestDeliveryDate
@@ -722,7 +721,7 @@
            this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
            this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
            this.gvMx1earliestDeliveryDate.Visible = true;
            this.gvMx1earliestDeliveryDate.VisibleIndex = 11;
            this.gvMx1earliestDeliveryDate.VisibleIndex = 9;
            this.gvMx1earliestDeliveryDate.Width = 94;
            // 
            // gvMx1deliveryDate
@@ -735,7 +734,7 @@
            this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
            this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
            this.gvMx1deliveryDate.Visible = true;
            this.gvMx1deliveryDate.VisibleIndex = 10;
            this.gvMx1deliveryDate.VisibleIndex = 8;
            this.gvMx1deliveryDate.Width = 94;
            // 
            // gvMx1pricingQty
@@ -748,7 +747,7 @@
            this.gvMx1pricingQty.Name = "gvMx1pricingQty";
            this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
            this.gvMx1pricingQty.Visible = true;
            this.gvMx1pricingQty.VisibleIndex = 9;
            this.gvMx1pricingQty.VisibleIndex = 7;
            this.gvMx1pricingQty.Width = 94;
            // 
            // gvMx1pricingUnit
@@ -761,7 +760,7 @@
            this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
            this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
            this.gvMx1pricingUnit.Visible = true;
            this.gvMx1pricingUnit.VisibleIndex = 8;
            this.gvMx1pricingUnit.VisibleIndex = 6;
            this.gvMx1pricingUnit.Width = 94;
            // 
            // gvMx1inventoryUnit
@@ -774,7 +773,7 @@
            this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
            this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
            this.gvMx1inventoryUnit.Visible = true;
            this.gvMx1inventoryUnit.VisibleIndex = 7;
            this.gvMx1inventoryUnit.VisibleIndex = 5;
            this.gvMx1inventoryUnit.Width = 94;
            // 
            // gvMx1purchaseQty
@@ -787,7 +786,7 @@
            this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
            this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
            this.gvMx1purchaseQty.Visible = true;
            this.gvMx1purchaseQty.VisibleIndex = 6;
            this.gvMx1purchaseQty.VisibleIndex = 4;
            this.gvMx1purchaseQty.Width = 94;
            // 
            // gvMx1purchaseUnit
@@ -800,7 +799,7 @@
            this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
            this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gvMx1purchaseUnit.Visible = true;
            this.gvMx1purchaseUnit.VisibleIndex = 5;
            this.gvMx1purchaseUnit.VisibleIndex = 3;
            this.gvMx1purchaseUnit.Width = 94;
            // 
            // gvMx1itemId
@@ -813,7 +812,7 @@
            this.gvMx1itemId.Name = "gvMx1itemId";
            this.gvMx1itemId.Tag = "query_a.ITEM_ID";
            this.gvMx1itemId.Visible = true;
            this.gvMx1itemId.VisibleIndex = 4;
            this.gvMx1itemId.VisibleIndex = 2;
            this.gvMx1itemId.Width = 94;
            // 
            // gvMx1orderLineId
@@ -826,7 +825,7 @@
            this.gvMx1orderLineId.Name = "gvMx1orderLineId";
            this.gvMx1orderLineId.Tag = "query_a.ORDER_LINE_ID";
            this.gvMx1orderLineId.Visible = true;
            this.gvMx1orderLineId.VisibleIndex = 3;
            this.gvMx1orderLineId.VisibleIndex = 1;
            this.gvMx1orderLineId.Width = 94;
            // 
            // gvMx1salesOrderId
@@ -839,21 +838,8 @@
            this.gvMx1salesOrderId.Name = "gvMx1salesOrderId";
            this.gvMx1salesOrderId.Tag = "query_a.SALES_ORDER_ID";
            this.gvMx1salesOrderId.Visible = true;
            this.gvMx1salesOrderId.VisibleIndex = 2;
            this.gvMx1salesOrderId.VisibleIndex = 0;
            this.gvMx1salesOrderId.Width = 94;
            //
            // gvMx1billNo
            //
            this.gvMx1billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1billNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1billNo.Caption = "采购单号";
            this.gvMx1billNo.FieldName = "billNo";
            this.gvMx1billNo.MinWidth = 50;
            this.gvMx1billNo.Name = "gvMx1billNo";
            this.gvMx1billNo.Tag = "query_a.BILL_NO";
            this.gvMx1billNo.Visible = true;
            this.gvMx1billNo.VisibleIndex = 1;
            this.gvMx1billNo.Width = 94;
            // 
            // gvMx1guid
            // 
@@ -888,7 +874,6 @@
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1guid,
            this.gvMx1billNo,
            this.gvMx1salesOrderId,
            this.gvMx1orderLineId,
            this.gvMx1itemId,
@@ -1011,7 +996,7 @@
            this.gv_changereason.Tag = "query_a.CHANGEREASON";
            this.gv_changereason.Visible = true;
            this.gv_changereason.VisibleIndex = 32;
            this.gv_changereason.Width = 94;
            this.gv_changereason.Width = 50;
            // 
            // lb_checkFalg
            // 
@@ -1044,7 +1029,7 @@
            this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
            this.gv_checkFalg.Visible = true;
            this.gv_checkFalg.VisibleIndex = 31;
            this.gv_checkFalg.Width = 94;
            this.gv_checkFalg.Width = 50;
            // 
            // lb_checkBy
            // 
@@ -1077,7 +1062,7 @@
            this.gv_checkBy.Tag = "query_a.CHECK_BY";
            this.gv_checkBy.Visible = true;
            this.gv_checkBy.VisibleIndex = 30;
            this.gv_checkBy.Width = 94;
            this.gv_checkBy.Width = 50;
            // 
            // lb_checkDate
            // 
@@ -1110,7 +1095,7 @@
            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 29;
            this.gv_checkDate.Width = 94;
            this.gv_checkDate.Width = 50;
            // 
            // lb_ebelnK3id
            // 
@@ -1143,7 +1128,7 @@
            this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gv_ebelnK3id.Visible = true;
            this.gv_ebelnK3id.VisibleIndex = 28;
            this.gv_ebelnK3id.Width = 94;
            this.gv_ebelnK3id.Width = 50;
            // 
            // lb_erpCheckDate
            // 
@@ -1176,7 +1161,7 @@
            this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
            this.gv_erpCheckDate.Visible = true;
            this.gv_erpCheckDate.VisibleIndex = 27;
            this.gv_erpCheckDate.Width = 94;
            this.gv_erpCheckDate.Width = 50;
            // 
            // lb_erpCheckBy
            // 
@@ -1209,7 +1194,7 @@
            this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
            this.gv_erpCheckBy.Visible = true;
            this.gv_erpCheckBy.VisibleIndex = 26;
            this.gv_erpCheckBy.Width = 94;
            this.gv_erpCheckBy.Width = 50;
            // 
            // lb_lastupdateBy
            // 
@@ -1242,7 +1227,7 @@
            this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 25;
            this.gv_lastupdateBy.Width = 94;
            this.gv_lastupdateBy.Width = 50;
            // 
            // lb_lastupdateDate
            // 
@@ -1275,7 +1260,7 @@
            this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 24;
            this.gv_lastupdateDate.Width = 94;
            this.gv_lastupdateDate.Width = 50;
            // 
            // lb_createDate
            // 
@@ -1308,7 +1293,7 @@
            this.gv_createDate.Tag = "query_a.CREATE_DATE";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 23;
            this.gv_createDate.Width = 94;
            this.gv_createDate.Width = 50;
            // 
            // lb_createBy
            // 
@@ -1341,7 +1326,7 @@
            this.gv_createBy.Tag = "query_a.CREATE_BY";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 22;
            this.gv_createBy.Width = 94;
            this.gv_createBy.Width = 50;
            // 
            // lb_cancellationDate
            // 
@@ -1374,7 +1359,7 @@
            this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
            this.gv_cancellationDate.Visible = true;
            this.gv_cancellationDate.VisibleIndex = 21;
            this.gv_cancellationDate.Width = 94;
            this.gv_cancellationDate.Width = 50;
            // 
            // lb_cancellationPerson
            // 
@@ -1407,7 +1392,7 @@
            this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
            this.gv_cancellationPerson.Visible = true;
            this.gv_cancellationPerson.VisibleIndex = 20;
            this.gv_cancellationPerson.Width = 94;
            this.gv_cancellationPerson.Width = 50;
            // 
            // lb_cancellationStatus
            // 
@@ -1440,7 +1425,7 @@
            this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
            this.gv_cancellationStatus.Visible = true;
            this.gv_cancellationStatus.VisibleIndex = 19;
            this.gv_cancellationStatus.Width = 94;
            this.gv_cancellationStatus.Width = 50;
            // 
            // lb_fixtureMoldProcurement
            // 
@@ -1473,7 +1458,7 @@
            this.gv_fixtureMoldProcurement.Tag = "query_a.FIXTURE_MOLD_PROCUREMENT";
            this.gv_fixtureMoldProcurement.Visible = true;
            this.gv_fixtureMoldProcurement.VisibleIndex = 18;
            this.gv_fixtureMoldProcurement.Width = 94;
            this.gv_fixtureMoldProcurement.Width = 50;
            // 
            // lb_remarks
            // 
@@ -1506,7 +1491,7 @@
            this.gv_remarks.Tag = "query_a.REMARKS";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 17;
            this.gv_remarks.Width = 94;
            this.gv_remarks.Width = 50;
            // 
            // lb_transportMethod
            // 
@@ -1539,7 +1524,7 @@
            this.gv_transportMethod.Tag = "query_a.TRANSPORT_METHOD";
            this.gv_transportMethod.Visible = true;
            this.gv_transportMethod.VisibleIndex = 16;
            this.gv_transportMethod.Width = 94;
            this.gv_transportMethod.Width = 50;
            // 
            // lb_email
            // 
@@ -1572,7 +1557,7 @@
            this.gv_email.Tag = "query_a.EMAIL";
            this.gv_email.Visible = true;
            this.gv_email.VisibleIndex = 15;
            this.gv_email.Width = 94;
            this.gv_email.Width = 50;
            // 
            // lb_paymentParty
            // 
@@ -1605,7 +1590,7 @@
            this.gv_paymentParty.Tag = "query_a.PAYMENT_PARTY";
            this.gv_paymentParty.Visible = true;
            this.gv_paymentParty.VisibleIndex = 14;
            this.gv_paymentParty.Width = 94;
            this.gv_paymentParty.Width = 50;
            // 
            // lb_settlementParty
            // 
@@ -1638,7 +1623,7 @@
            this.gv_settlementParty.Tag = "query_a.SETTLEMENT_PARTY";
            this.gv_settlementParty.Visible = true;
            this.gv_settlementParty.VisibleIndex = 13;
            this.gv_settlementParty.Width = 94;
            this.gv_settlementParty.Width = 50;
            // 
            // lb_qualityReq
            // 
@@ -1671,7 +1656,7 @@
            this.gv_qualityReq.Tag = "query_a.QUALITY_REQ";
            this.gv_qualityReq.Visible = true;
            this.gv_qualityReq.VisibleIndex = 12;
            this.gv_qualityReq.Width = 94;
            this.gv_qualityReq.Width = 50;
            // 
            // lb_purchaser
            // 
@@ -1698,13 +1683,13 @@
            this.gv_purchaser.AppearanceCell.Options.UseFont = true;
            this.gv_purchaser.Caption = "采购员 ";
            this.gv_purchaser.FieldName = "purchaser";
            this.gv_purchaser.MinWidth = 50;
            this.gv_purchaser.MinWidth = 100;
            this.gv_purchaser.Name = "gv_purchaser";
            this.gv_purchaser.OptionsColumn.AllowEdit = false;
            this.gv_purchaser.Tag = "query_a.PURCHASER";
            this.gv_purchaser.Visible = true;
            this.gv_purchaser.VisibleIndex = 11;
            this.gv_purchaser.Width = 94;
            this.gv_purchaser.Width = 100;
            // 
            // lb_qtyAcceptance
            // 
@@ -1737,7 +1722,7 @@
            this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
            this.gv_qtyAcceptance.Visible = true;
            this.gv_qtyAcceptance.VisibleIndex = 10;
            this.gv_qtyAcceptance.Width = 94;
            this.gv_qtyAcceptance.Width = 50;
            // 
            // lb_purchaseGroup
            // 
@@ -1764,13 +1749,13 @@
            this.gv_purchaseGroup.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseGroup.Caption = "采购组 ";
            this.gv_purchaseGroup.FieldName = "purchaseGroup";
            this.gv_purchaseGroup.MinWidth = 50;
            this.gv_purchaseGroup.MinWidth = 110;
            this.gv_purchaseGroup.Name = "gv_purchaseGroup";
            this.gv_purchaseGroup.OptionsColumn.AllowEdit = false;
            this.gv_purchaseGroup.Tag = "query_a.PURCHASE_GROUP";
            this.gv_purchaseGroup.Visible = true;
            this.gv_purchaseGroup.VisibleIndex = 9;
            this.gv_purchaseGroup.Width = 94;
            this.gv_purchaseGroup.Width = 110;
            // 
            // lb_purchaseDept
            // 
@@ -1797,13 +1782,13 @@
            this.gv_purchaseDept.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseDept.Caption = "采购部门 ";
            this.gv_purchaseDept.FieldName = "purchaseDept";
            this.gv_purchaseDept.MinWidth = 50;
            this.gv_purchaseDept.MinWidth = 110;
            this.gv_purchaseDept.Name = "gv_purchaseDept";
            this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
            this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
            this.gv_purchaseDept.Visible = true;
            this.gv_purchaseDept.VisibleIndex = 8;
            this.gv_purchaseDept.Width = 94;
            this.gv_purchaseDept.Width = 110;
            // 
            // lb_purchaseOrg
            // 
@@ -1830,13 +1815,13 @@
            this.gv_purchaseOrg.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseOrg.Caption = "采购组织 ";
            this.gv_purchaseOrg.FieldName = "purchaseOrg";
            this.gv_purchaseOrg.MinWidth = 50;
            this.gv_purchaseOrg.MinWidth = 110;
            this.gv_purchaseOrg.Name = "gv_purchaseOrg";
            this.gv_purchaseOrg.OptionsColumn.AllowEdit = false;
            this.gv_purchaseOrg.Tag = "query_a.PURCHASE_ORG";
            this.gv_purchaseOrg.Visible = true;
            this.gv_purchaseOrg.VisibleIndex = 7;
            this.gv_purchaseOrg.Width = 94;
            this.gv_purchaseOrg.Width = 110;
            // 
            // lb_closeStatus
            // 
@@ -1929,13 +1914,13 @@
            this.gv_purchaseDate.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseDate.Caption = "采购日期 ";
            this.gv_purchaseDate.FieldName = "purchaseDate";
            this.gv_purchaseDate.MinWidth = 120;
            this.gv_purchaseDate.MinWidth = 200;
            this.gv_purchaseDate.Name = "gv_purchaseDate";
            this.gv_purchaseDate.OptionsColumn.AllowEdit = false;
            this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE";
            this.gv_purchaseDate.Visible = true;
            this.gv_purchaseDate.VisibleIndex = 4;
            this.gv_purchaseDate.Width = 120;
            this.gv_purchaseDate.Width = 200;
            // 
            // lb_businessType
            // 
@@ -2077,11 +2062,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptService = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutView = null;
            // 
            // gcMain
            // 
@@ -2149,7 +2134,7 @@
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 33;
            this.gv_factory.Width = 94;
            this.gv_factory.Width = 25;
            // 
            // xtraTabControl1
            // 
@@ -2420,7 +2405,6 @@
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1orderLineId;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderId;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1billNo;
 private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
 private DevExpress.XtraTab.XtraTabPage tabMxPage1;
 private DevExpress.XtraGrid.GridControl gcMx1;
DevApp/Gs.DevApp/Gs.DevApp.csproj.user
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectView>ShowAllFiles</ProjectView>
    <PublishUrlHistory>publish\</PublishUrlHistory>
    <InstallUrlHistory />
    <SupportUrlHistory />
    <UpdateUrlHistory />
    <BootstrapperUrlHistory />
    <ErrorReportUrlHistory />
    <FallbackCulture>zh-CN</FallbackCulture>
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
  </PropertyGroup>
</Project>
DevApp/Gs.DevApp/UserControl/ShowRptWizard.Designer.cs
@@ -31,13 +31,11 @@
            this.wizardControl1 = new DevExpress.XtraWizard.WizardControl();
            this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage();
            this.wizardPage1 = new DevExpress.XtraWizard.WizardPage();
            this.chkTable = new DevExpress.XtraEditors.CheckedListBoxControl();
            this.lbParameter = new DevExpress.XtraEditors.LabelControl();
            this.completionWizardPage1 = new DevExpress.XtraWizard.CompletionWizardPage();
            this.wizardPage2 = new DevExpress.XtraWizard.WizardPage();
            ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).BeginInit();
            this.wizardControl1.SuspendLayout();
            this.wizardPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.chkTable)).BeginInit();
            this.SuspendLayout();
            // 
            // wizardControl1
@@ -46,7 +44,6 @@
            this.wizardControl1.Controls.Add(this.welcomeWizardPage1);
            this.wizardControl1.Controls.Add(this.wizardPage1);
            this.wizardControl1.Controls.Add(this.completionWizardPage1);
            this.wizardControl1.Controls.Add(this.wizardPage2);
            this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.wizardControl1.FinishText = "&保存";
            this.wizardControl1.ImageOptions.ImageWidth = 247;
@@ -57,7 +54,6 @@
            this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] {
            this.welcomeWizardPage1,
            this.wizardPage1,
            this.wizardPage2,
            this.completionWizardPage1});
            this.wizardControl1.PreviousText = "< &上一步";
            this.wizardControl1.Size = new System.Drawing.Size(903, 598);
@@ -74,22 +70,22 @@
            // 
            // wizardPage1
            // 
            this.wizardPage1.Controls.Add(this.chkTable);
            this.wizardPage1.DescriptionText = "请选择相应的表,建议不要多选哦";
            this.wizardPage1.Controls.Add(this.lbParameter);
            this.wizardPage1.DescriptionText = "请选择相应的数据来源和参数";
            this.wizardPage1.Margin = new System.Windows.Forms.Padding(4);
            this.wizardPage1.Name = "wizardPage1";
            this.wizardPage1.Size = new System.Drawing.Size(863, 420);
            this.wizardPage1.Text = "第一步:选择表";
            // 
            // chkTable
            // lbParameter
            // 
            this.chkTable.CheckOnClick = true;
            this.chkTable.Dock = System.Windows.Forms.DockStyle.Fill;
            this.chkTable.Location = new System.Drawing.Point(0, 0);
            this.chkTable.MultiColumn = true;
            this.chkTable.Name = "chkTable";
            this.chkTable.Size = new System.Drawing.Size(863, 420);
            this.chkTable.TabIndex = 0;
            this.lbParameter.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
            this.lbParameter.Appearance.Options.UseFont = true;
            this.lbParameter.Location = new System.Drawing.Point(41, 61);
            this.lbParameter.Name = "lbParameter";
            this.lbParameter.Size = new System.Drawing.Size(118, 24);
            this.lbParameter.TabIndex = 0;
            this.lbParameter.Text = "labelControl1";
            // 
            // completionWizardPage1
            // 
@@ -98,14 +94,7 @@
            this.completionWizardPage1.Name = "completionWizardPage1";
            this.completionWizardPage1.ProceedText = "向导完成,请点击 ä¿å­˜";
            this.completionWizardPage1.Size = new System.Drawing.Size(616, 433);
            this.completionWizardPage1.Text = "第三步:保存";
            //
            // wizardPage2
            //
            this.wizardPage2.DescriptionText = "我们建议全部勾选";
            this.wizardPage2.Name = "wizardPage2";
            this.wizardPage2.Size = new System.Drawing.Size(863, 420);
            this.wizardPage2.Text = "第二步:勾选字段";
            this.completionWizardPage1.Text = "第二步:保存";
            // 
            // ShowRptWizard
            // 
@@ -124,7 +113,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit();
            this.wizardControl1.ResumeLayout(false);
            this.wizardPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.chkTable)).EndInit();
            this.wizardPage1.PerformLayout();
            this.ResumeLayout(false);
        }
@@ -135,8 +124,6 @@
        private DevExpress.XtraWizard.WelcomeWizardPage welcomeWizardPage1;
        private DevExpress.XtraWizard.WizardPage wizardPage1;
        private DevExpress.XtraWizard.CompletionWizardPage completionWizardPage1;
        private DevExpress.XtraWizard.WizardPage wizardPage2;
        private DevExpress.XtraEditors.CheckedListBoxControl chkTable;
        private DevExpress.XtraEditors.LabelControl lbParameter;
    }
}
DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
@@ -14,10 +14,10 @@
    public partial class ShowRptWizard : DevExpress.XtraEditors.XtraForm
    {
        private string _reportType;
        public ShowRptWizard(string reportType)
        private string _rptParameter;
        public ShowRptWizard(string rptParameter)
        {
            _reportType = reportType;
            _rptParameter = rptParameter;
            InitializeComponent();
            wizardControl1.NextClick += WizardControl1_NextClick;
            wizardControl1.FinishClick += WizardControl1_FinishClick;
@@ -25,31 +25,9 @@
        private void WizardControl1_FinishClick(object sender, System.ComponentModel.CancelEventArgs e)
        {
            System.Text.StringBuilder sb = new System.Text.StringBuilder();
            foreach (DevExpress.XtraEditors.GroupControl ctrl in this.wizardPage2.Controls)
            {
                if (ctrl is GroupControl)
                {
                    GroupControl _grpBox = ctrl as GroupControl;
                    foreach (DevExpress.XtraEditors.CheckedListBoxControl _ckBox in _grpBox.Controls)
                    {
                        CheckedListBoxControl _kk = _ckBox as CheckedListBoxControl;
                        for (int i = 0; i < _ckBox.ItemCount; i++)
                        {
                            if (_ckBox.GetItemChecked(i))
                            {
                                if (sb.Length > 0)
                                    sb.Append(",");
                                sb.Append(_ckBox.GetItemValue(i).ToString());
                            }
                        }
                    }
                }
            }
            var _obj = new
            {
                rptType = _reportType,
                colDec = sb.ToString(),
                rptParameter = this._rptParameter,
            };
            try
            {
@@ -57,13 +35,17 @@
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    Gs.DevApp.DevFrm.Sys.EasyRptDesign frm = new Gs.DevApp.DevFrm.Sys.EasyRptDesign(this._reportType);
                    Gs.DevApp.DevFrm.Sys.EasyRptDesign frm = new Gs.DevApp.DevFrm.Sys.EasyRptDesign(this._rptParameter);
                    frm.Show();
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnData["outMsg"].ToString());
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message.ToString());
            }
        }
@@ -71,87 +53,10 @@
        {
            if (this.wizardControl1.SelectedPage == this.welcomeWizardPage1)
            {
                _getTable();
                return;
            }
            if (this.wizardControl1.SelectedPage == this.wizardPage1)
            {
                _getZiDuan();
                this.lbParameter.Text = "该报表使用了如下参数:" + _rptParameter;
                return;
            }
        }
        private void _getTable()
        {
            chkTable.Items.Clear();
            var _obj = new
            {
            };
            string strReturn = "";
            try
            {
                strReturn = UtilityHelper.HttpPost("", "Report/GetTableList", JsonConvert.SerializeObject(_obj));
                ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
                DataTable dt = dd.rtnData;
                chkTable.DisplayMember = "tableDesc";
                chkTable.ValueMember = "tableName";
                chkTable.DataSource = dt;
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void _getZiDuan()
        {
            this.wizardPage2.Controls.Clear();
            System.Text.StringBuilder sb = new System.Text.StringBuilder();
            for (int i = 0; i < chkTable.ItemCount; i++)
            {
                if (chkTable.GetItemChecked(i))
                {
                    if (sb.Length > 0)
                        sb.Append(",");
                    sb.Append(chkTable.GetItemValue(i).ToString());
                }
            }
            var _obj = new
            {
                tablesName = sb.ToString(),
            };
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Report/GetZiDuanList", JsonConvert.SerializeObject(_obj));
                JObject _job = JObject.Parse(strReturn);
                string rtnCode = _job["rtnCode"].ToString();
                if (int.Parse(rtnCode) > 0)
                {
                    var _table = _job["rtnData"];
                    foreach (var _col in _table)
                    {
                        DevExpress.XtraEditors.GroupControl grp = new DevExpress.XtraEditors.GroupControl();
                        grp.Size = new System.Drawing.Size(259, 420);
                        grp.Text = _col["tableName"].ToString();
                        grp.Dock = System.Windows.Forms.DockStyle.Left;
                        // grp.TabIndex = 0;
                        DevExpress.XtraEditors.CheckedListBoxControl chkZiDuan = new DevExpress.XtraEditors.CheckedListBoxControl();
                        chkZiDuan.CheckOnClick = true;
                        chkZiDuan.Dock = System.Windows.Forms.DockStyle.Fill;
                        var _tbCol = _col["colList"];
                        foreach (var _ccccc in _tbCol)
                        {
                            string _t = _ccccc["ziDuanName"].ToString();
                            chkZiDuan.Items.Add(_t);
                        }
                        grp.Controls.Add(chkZiDuan);
                        this.wizardPage2.Controls.Add(grp);
                    }
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -96,22 +96,22 @@
        public List<string> actions { get; }
        /// <summary>
        /// æŠ¥è¡¨ç±»åž‹ï¼Œåœ¨æ•°æ®åº“中要唯一,否则会保存不了报表设计
        /// æŠ¥è¡¨ï¼Œåœ¨æ•°æ®åº“中要唯一,如:存储过程名{入参1名|入参值,入参2名|入参值}
        /// </summary>
        public string rptService { get; set; }
        public string rptParameter { get; set; }
        /// <summary>
        /// å¯¼å‡ºæœåŠ¡å
        /// å¯¼å‡ºï¼Œè§†å›¾å,如:视图名{入参1名|入参值,入参2名|入参值}
        /// </summary>
        public string xlsOutView { get; set; }
        public string xlsOutParameter { get; set; }
        /// <summary>
        /// å¯¼å…¥æœåŠ¡å
        /// å¯¼å…¥
        /// </summary>
        public string xlsInService { get; set; }
        /// <summary>
        /// å®¡æ ¸å‚æ•°,形如:MES_HOLIDAY,check_date,check_status,check_by
        /// å®¡æ ¸å‚æ•°,表名,字段名,如:MES_HOLIDAY,check_date,check_status,check_by
        /// </summary>
        public string chkParameter { get; set; }
        #endregion
@@ -271,81 +271,82 @@
        private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (string.IsNullOrEmpty(this.xlsOutView))
            {
                ToolBox.MsgHelper.ShowError("没有指定导出服务,请联系开发人员获取支持!");
                return;
            }
            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
            {
                folderBrowserDialog.Description = "选择导出文件的保存路径";
                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
                if (dialogResult == DialogResult.OK)
                {
                    string _folder = folderBrowserDialog.SelectedPath;
                    var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutView);
                    try
                    {
                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                        if (_rtn.rtnCode > 0)
                        {
                            string _file = _rtn.rtnData.fileUrl.ToString();
                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
                            using (WebClient client = new WebClient())
                            {
                                client.DownloadFile(_url, _folderName);
                            }
                            ToolBox.MsgHelper.ShowInformation("导出成功!");
                        }
                        else
                        {
                            ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                        }
                    }
                    catch (Exception ex)
                    {
                        ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                    }
                }
            }
            //if (string.IsNullOrEmpty(this.xlsOutView))
            //{
            //    ToolBox.MsgHelper.ShowError("没有指定导出服务,请联系开发人员获取支持!");
            //    return;
            //}
            //using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
            //{
            //    folderBrowserDialog.Description = "选择导出文件的保存路径";
            //    DialogResult dialogResult = folderBrowserDialog.ShowDialog();
            //    if (dialogResult == DialogResult.OK)
            //    {
            //        string _folder = folderBrowserDialog.SelectedPath;
            //        var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutView);
            //        try
            //        {
            //            string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
            //            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
            //            if (_rtn.rtnCode > 0)
            //            {
            //                string _file = _rtn.rtnData.fileUrl.ToString();
            //                string _folderName = _folder + "\\" + _file.Replace("down/", "");
            //                string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
            //                using (WebClient client = new WebClient())
            //                {
            //                    client.DownloadFile(_url, _folderName);
            //                }
            //                ToolBox.MsgHelper.ShowInformation("导出成功!");
            //            }
            //            else
            //            {
            //                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            //            }
            //        }
            //        catch (Exception ex)
            //        {
            //            ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            //        }
            //    }
            //}
        }
        private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (string.IsNullOrEmpty(this.rptService))
            if (string.IsNullOrEmpty(this.rptParameter))
            {
                ToolBox.MsgHelper.ShowError("没有指定报表类型,请联系开发人员获取支持!");
                ToolBox.MsgHelper.ShowError("没有指定报表参数,请联系技术开发人员!");
                return;
            }
            bool _bl = false;
            _bl = _ckRptService();
            if (_bl)
            {
                Gs.DevApp.DevFrm.Rpt.RptPreview frm = new Gs.DevApp.DevFrm.Rpt.RptPreview(this.rptService);
                Gs.DevApp.DevFrm.Rpt.RptPreview frm = new Gs.DevApp.DevFrm.Rpt.RptPreview(this.rptParameter);
                frm.Show();
                return;
            }
            ToolBox.MsgHelper.ShowError("还没有设计模板,请先设计模板!");
            ToolBox.MsgHelper.ShowError("没有设计模板,请先设计模板!");
            return;
        }
        private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (string.IsNullOrEmpty(this.rptService))
            if (string.IsNullOrEmpty(this.rptParameter))
            {
                ToolBox.MsgHelper.ShowError("没有指定报表类型,请联系开发人员获取支持!");
                ToolBox.MsgHelper.ShowError("没有指定报表参数,请联系技术开发人员!");
                return;
            }
            bool _bl = false;
            _bl = _ckRptService();
            //如果已经有模板了,直接打开
            //如果已经有模板了,直接打开设置模板
            if (_bl)
            {
                Gs.DevApp.DevFrm.Sys.EasyRptDesign frm = new Gs.DevApp.DevFrm.Sys.EasyRptDesign(this.rptService);
                Gs.DevApp.DevFrm.Sys.EasyRptDesign frm = new Gs.DevApp.DevFrm.Sys.EasyRptDesign(this.rptParameter);
                frm.Show();
                return;
            }
            //否则向导设计模板
            UserControl.ShowRptWizard rptWizard = new ShowRptWizard(this.rptService);
            UserControl.ShowRptWizard rptWizard = new ShowRptWizard(this.rptParameter);
            rptWizard.ShowDialog();
        }
@@ -596,7 +597,7 @@
            {
                var _obj = new
                {
                    reportType = this.rptService,
                    rptParameter = this.rptParameter,
                };
                string strJson = UtilityHelper.HttpPost("", "Report/GetTemplate", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
@@ -611,6 +612,7 @@
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                return true;
            }
            return false;
        }
    }
}