diff --git a/插件库/Lskj.PubBillSpecial/BillModule.Designer.cs b/插件库/Lskj.PubBillSpecial/BillModule.Designer.cs index 1a91110..e259ece 100644 --- a/插件库/Lskj.PubBillSpecial/BillModule.Designer.cs +++ b/插件库/Lskj.PubBillSpecial/BillModule.Designer.cs @@ -28,19 +28,20 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.ssc_main = new DevExpress.XtraEditors.SplitContainerControl(); this.ssc_main_top = new DevExpress.XtraEditors.SplitContainerControl(); this.pl_main = new DevExpress.XtraEditors.PanelControl(); this.pl_main_center = new DevExpress.XtraEditors.PanelControl(); this.pl_main_center_detail = new DevExpress.XtraEditors.PanelControl(); this.gcMain = new Lskj.Control.GridControlEx(); - this.pl_Right = new DevExpress.XtraEditors.PanelControl(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.splitMainControl = new DevExpress.XtraEditors.SplitContainerControl(); + this.panel1 = new System.Windows.Forms.Panel(); this.pl_main_center_master = new DevExpress.XtraEditors.XtraScrollableControl(); this.pl_treeview_detault_search = new DevExpress.XtraEditors.PanelControl(); this.panelControl4 = new DevExpress.XtraEditors.PanelControl(); this.textEdit1 = new DevExpress.XtraEditors.TextEdit(); - this.barManager1 = new DevExpress.XtraBars.BarManager(); + this.barManager1 = new DevExpress.XtraBars.BarManager(this.components); this.barDockControl1 = new DevExpress.XtraBars.BarDockControl(); this.barDockControl2 = new DevExpress.XtraBars.BarDockControl(); this.barDockControl3 = new DevExpress.XtraBars.BarDockControl(); @@ -48,6 +49,9 @@ this.lceCombobox = new Lskj.Control.LabelComboxEdit(); this.panelControl3 = new DevExpress.XtraEditors.PanelControl(); this.btnTreeSearch = new DevExpress.XtraEditors.SimpleButton(); + this.pl_Right = new DevExpress.XtraEditors.PanelControl(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.ModuleGridEx = new Lskj.Control.ModuleGridEx(); this.pl_main_bottom = new DevExpress.XtraEditors.PanelControl(); this.btnPrint = new DevExpress.XtraEditors.SimpleButton(); this.pl_templete = new DevExpress.XtraEditors.PanelControl(); @@ -73,11 +77,11 @@ this.rdRed = new System.Windows.Forms.RadioButton(); this.pl_blue = new DevExpress.XtraEditors.PanelControl(); this.rdBlue = new System.Windows.Forms.RadioButton(); - this.pMprint = new DevExpress.XtraBars.PopupMenu(); - this.pmFP = new DevExpress.XtraBars.PopupMenu(); - this.pmBillExp = new DevExpress.XtraBars.PopupMenu(); - this.pmBill = new DevExpress.XtraBars.PopupMenu(); - this.pMenu = new DevExpress.XtraBars.PopupMenu(); + this.pMprint = new DevExpress.XtraBars.PopupMenu(this.components); + this.pmFP = new DevExpress.XtraBars.PopupMenu(this.components); + this.pmBillExp = new DevExpress.XtraBars.PopupMenu(this.components); + this.pmBill = new DevExpress.XtraBars.PopupMenu(this.components); + this.pMenu = new DevExpress.XtraBars.PopupMenu(this.components); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker(); ((System.ComponentModel.ISupportInitialize)(this.ssc_main)).BeginInit(); @@ -90,8 +94,9 @@ this.pl_main_center.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pl_main_center_detail)).BeginInit(); this.pl_main_center_detail.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pl_Right)).BeginInit(); - this.pl_Right.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitMainControl)).BeginInit(); + this.splitMainControl.SuspendLayout(); + this.panel1.SuspendLayout(); this.pl_main_center_master.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pl_treeview_detault_search)).BeginInit(); this.pl_treeview_detault_search.SuspendLayout(); @@ -101,6 +106,8 @@ ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit(); this.panelControl3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pl_Right)).BeginInit(); + this.pl_Right.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pl_main_bottom)).BeginInit(); this.pl_main_bottom.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pl_templete)).BeginInit(); @@ -183,8 +190,7 @@ this.pl_main_center.Appearance.Options.UseBackColor = true; this.pl_main_center.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.pl_main_center.Controls.Add(this.pl_main_center_detail); - this.pl_main_center.Controls.Add(this.pl_Right); - this.pl_main_center.Controls.Add(this.pl_main_center_master); + this.pl_main_center.Controls.Add(this.splitMainControl); this.pl_main_center.Dock = System.Windows.Forms.DockStyle.Fill; this.pl_main_center.Location = new System.Drawing.Point(2, 40); this.pl_main_center.Name = "pl_main_center"; @@ -198,10 +204,10 @@ this.pl_main_center_detail.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.pl_main_center_detail.Controls.Add(this.gcMain); this.pl_main_center_detail.Dock = System.Windows.Forms.DockStyle.Fill; - this.pl_main_center_detail.Location = new System.Drawing.Point(0, 224); + this.pl_main_center_detail.Location = new System.Drawing.Point(0, 215); this.pl_main_center_detail.Name = "pl_main_center_detail"; - this.pl_main_center_detail.Size = new System.Drawing.Size(1501, 396); - this.pl_main_center_detail.TabIndex = 8; + this.pl_main_center_detail.Size = new System.Drawing.Size(1501, 405); + this.pl_main_center_detail.TabIndex = 26; // // gcMain // @@ -212,41 +218,41 @@ this.gcMain.Margin = new System.Windows.Forms.Padding(5); this.gcMain.Name = "gcMain"; this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum; - this.gcMain.Size = new System.Drawing.Size(1501, 396); + this.gcMain.Size = new System.Drawing.Size(1501, 405); this.gcMain.TabIndex = 0; // - // pl_Right + // splitMainControl // - this.pl_Right.Appearance.BackColor = System.Drawing.Color.Transparent; - this.pl_Right.Appearance.Options.UseBackColor = true; - this.pl_Right.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; - this.pl_Right.Controls.Add(this.groupBox1); - this.pl_Right.Dock = System.Windows.Forms.DockStyle.Top; - this.pl_Right.Location = new System.Drawing.Point(0, 164); - this.pl_Right.Name = "pl_Right"; - this.pl_Right.Padding = new System.Windows.Forms.Padding(0, 0, 0, 5); - this.pl_Right.Size = new System.Drawing.Size(1501, 60); - this.pl_Right.TabIndex = 7; + this.splitMainControl.Dock = System.Windows.Forms.DockStyle.Top; + this.splitMainControl.Location = new System.Drawing.Point(0, 0); + this.splitMainControl.Name = "splitMainControl"; + this.splitMainControl.Panel1.Controls.Add(this.panel1); + this.splitMainControl.Panel1.Controls.Add(this.pl_Right); + this.splitMainControl.Panel1.Text = "Panel1"; + this.splitMainControl.Panel2.Controls.Add(this.ModuleGridEx); + this.splitMainControl.Panel2.Text = "Panel2"; + this.splitMainControl.Size = new System.Drawing.Size(1501, 215); + this.splitMainControl.SplitterPosition = 636; + this.splitMainControl.TabIndex = 25; + this.splitMainControl.Text = "splitContainerControl1"; // - // groupBox1 + // panel1 // - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Font = new System.Drawing.Font("Tahoma", 1F); - this.groupBox1.Location = new System.Drawing.Point(0, 0); - this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 5); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(1501, 55); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; + this.panel1.Controls.Add(this.pl_main_center_master); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(636, 155); + this.panel1.TabIndex = 8; // // pl_main_center_master // this.pl_main_center_master.AutoScroll = false; this.pl_main_center_master.Controls.Add(this.pl_treeview_detault_search); - this.pl_main_center_master.Dock = System.Windows.Forms.DockStyle.Top; + this.pl_main_center_master.Dock = System.Windows.Forms.DockStyle.Fill; this.pl_main_center_master.Location = new System.Drawing.Point(0, 0); this.pl_main_center_master.Name = "pl_main_center_master"; - this.pl_main_center_master.Size = new System.Drawing.Size(1501, 164); + this.pl_main_center_master.Size = new System.Drawing.Size(636, 155); this.pl_main_center_master.TabIndex = 6; this.pl_main_center_master.Click += new System.EventHandler(this.OnMainFocusAfter); // @@ -365,6 +371,43 @@ this.btnTreeSearch.TabIndex = 21; this.btnTreeSearch.Text = "查询"; // + // pl_Right + // + this.pl_Right.Appearance.BackColor = System.Drawing.Color.Transparent; + this.pl_Right.Appearance.Options.UseBackColor = true; + this.pl_Right.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + this.pl_Right.Controls.Add(this.groupBox1); + this.pl_Right.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pl_Right.Location = new System.Drawing.Point(0, 155); + this.pl_Right.Name = "pl_Right"; + this.pl_Right.Padding = new System.Windows.Forms.Padding(0, 0, 0, 5); + this.pl_Right.Size = new System.Drawing.Size(636, 60); + this.pl_Right.TabIndex = 7; + // + // groupBox1 + // + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox1.Font = new System.Drawing.Font("Tahoma", 1F); + this.groupBox1.Location = new System.Drawing.Point(0, 0); + this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 5); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(636, 55); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + // + // ModuleGridEx + // + this.ModuleGridEx.BackColor = System.Drawing.Color.Transparent; + this.ModuleGridEx.Dock = System.Windows.Forms.DockStyle.Fill; + this.ModuleGridEx.Location = new System.Drawing.Point(0, 0); + this.ModuleGridEx.Name = "ModuleGridEx"; + this.ModuleGridEx.OperShortMode = true; + this.ModuleGridEx.Size = new System.Drawing.Size(860, 215); + this.ModuleGridEx.TabIndex = 9; + this.ModuleGridEx.VisibleMrpSearchPanel = false; + this.ModuleGridEx.VisibleOperPanel = true; + this.ModuleGridEx.VisibleSearchPanel = true; + // // pl_main_bottom // this.pl_main_bottom.Appearance.BackColor = System.Drawing.Color.Transparent; @@ -722,8 +765,9 @@ this.pl_main_center.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pl_main_center_detail)).EndInit(); this.pl_main_center_detail.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pl_Right)).EndInit(); - this.pl_Right.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitMainControl)).EndInit(); + this.splitMainControl.ResumeLayout(false); + this.panel1.ResumeLayout(false); this.pl_main_center_master.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pl_treeview_detault_search)).EndInit(); this.pl_treeview_detault_search.ResumeLayout(false); @@ -733,6 +777,8 @@ ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit(); this.panelControl3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pl_Right)).EndInit(); + this.pl_Right.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pl_main_bottom)).EndInit(); this.pl_main_bottom.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pl_templete)).EndInit(); @@ -784,13 +830,6 @@ private DevExpress.XtraBars.PopupMenu pMprint; private DevExpress.XtraEditors.PanelControl pl_main; private DevExpress.XtraEditors.PanelControl pl_main_center; - private DevExpress.XtraEditors.XtraScrollableControl pl_main_center_master; - private DevExpress.XtraEditors.PanelControl pl_treeview_detault_search; - private DevExpress.XtraEditors.PanelControl panelControl4; - private DevExpress.XtraEditors.TextEdit textEdit1; - private Control.LabelComboxEdit lceCombobox; - private DevExpress.XtraEditors.PanelControl panelControl3; - private DevExpress.XtraEditors.SimpleButton btnTreeSearch; public DevExpress.XtraEditors.PanelControl pl_main_bottom; private DevExpress.XtraEditors.PanelControl pl_templete; private DevExpress.XtraEditors.ComboBoxEdit cb_templete; @@ -806,4 +845,15 @@ private DevExpress.XtraEditors.PanelControl pl_main_top_center; private System.Windows.Forms.Label lbTitle; private DevExpress.XtraEditors.PanelControl pl_main_top_right; - private DevExpress.XtraEditors.LabelControl lblOrderNo; \ No newline at end of file + private DevExpress.XtraEditors.LabelControl lblOrderNo; + private DevExpress.XtraEditors.LabelControl labelControl1; + private DevExpress.XtraEditors.PanelControl pl_main_top_left; + private DevExpress.XtraEditors.PanelControl pl_red; + private System.Windows.Forms.RadioButton rdRed; + private DevExpress.XtraEditors.PanelControl pl_blue; + private System.Windows.Forms.RadioButton rdBlue; + private DevExpress.XtraEditors.TextEdit txt_input; + private DevExpress.XtraBars.PopupMenu pmFP; + private DevExpress.XtraEditors.SimpleButton btnBillAdd; + private DevExpress.XtraEditors.SimpleButton btnPrint; + private System.ComponentModel.Background \ No newline at end of file diff --git a/插件库/Lskj.PubBillSpecial/BillModule.cs b/插件库/Lskj.PubBillSpecial/BillModule.cs index 0294098..37bfd8f 100644 --- a/插件库/Lskj.PubBillSpecial/BillModule.cs +++ b/插件库/Lskj.PubBillSpecial/BillModule.cs @@ -626,6 +626,23 @@ namespace Lskj.PubBillSpecial this.InitializeStatus();//初始化红蓝字单 this.InitializeOper();//初始化常用操作等功能 this.InitializeBillInfo();//初始化单据控件信息 + this.InitializeModuleGridex(); + } + + /// + /// 初始化右侧表格 + /// + private void InitializeModuleGridex() + { + DynamicModel dyncModel = new DynamicModel(new string[] {"", ERPInfo.Instance.UserId, ERPInfo.Instance.UserName, this.SysModel.Privilege, this.BillModel.RightModuleCode, "0" }); + DataRow moduleInformation = MainImpl.GetSystemdllTab(this.BillModel.RightModuleCode); + if (moduleInformation == null) + { + MessageUtil.Show("没有找到编号为" + this.BillModel.RightModuleCode + "的模块信息"); + return; + } + ModuleModel SystemModel= new ModuleModel(moduleInformation); + } /// diff --git a/插件库/Lskj.PubBillSpecial/FrmScanCodeAssociation.cs b/插件库/Lskj.PubBillSpecial/FrmScanCodeAssociation.cs index c13339a..941f08f 100644 --- a/插件库/Lskj.PubBillSpecial/FrmScanCodeAssociation.cs +++ b/插件库/Lskj.PubBillSpecial/FrmScanCodeAssociation.cs @@ -47,4 +47,4 @@ namespace Lskj.PubBillSpecial //根据传入的模块号获取模块信息 this.SysModel = new ModuleModel(modelRow); DataTable mainGridColumns = BaseModuleImpl.GetBaseGridColumns(this.SysModel.ModeCode); - this.gcMain.SetReadOnlyColu \ No newline at end of file + this.gcMain.SetReadOnlyColumns(mainGridColumns, GridCustomColumnStruct.BaseMainGridView + this.SysMode \ No newline at end of file