diff --git a/插件库/Lskj.PubBomImportNew/FrmMain.Designer.cs b/插件库/Lskj.PubBomImportNew/FrmMain.Designer.cs index 9763eb7..acd44c3 100644 --- a/插件库/Lskj.PubBomImportNew/FrmMain.Designer.cs +++ b/插件库/Lskj.PubBomImportNew/FrmMain.Designer.cs @@ -31,9 +31,9 @@ namespace Lskj.PubBomImportNew { this.pl_bottom = new DevExpress.XtraEditors.PanelControl(); this.btnCancel = new DevExpress.XtraEditors.SimpleButton(); + this.btnRead = new DevExpress.XtraEditors.SimpleButton(); this.btnOk = new DevExpress.XtraEditors.SimpleButton(); this.gcMain = new Lskj.Control.GridControlEx(); - this.btnRead = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.pl_bottom)).BeginInit(); this.pl_bottom.SuspendLayout(); this.SuspendLayout(); @@ -47,10 +47,10 @@ namespace Lskj.PubBomImportNew this.pl_bottom.Controls.Add(this.btnRead); this.pl_bottom.Controls.Add(this.btnOk); this.pl_bottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pl_bottom.Location = new System.Drawing.Point(0, 549); + this.pl_bottom.Location = new System.Drawing.Point(0, 411); this.pl_bottom.Margin = new System.Windows.Forms.Padding(4); this.pl_bottom.Name = "pl_bottom"; - this.pl_bottom.Size = new System.Drawing.Size(872, 50); + this.pl_bottom.Size = new System.Drawing.Size(784, 50); this.pl_bottom.TabIndex = 2; // // btnCancel @@ -62,6 +62,16 @@ namespace Lskj.PubBomImportNew this.btnCancel.TabIndex = 11; this.btnCancel.Text = "清除绑定"; // + // btnRead + // + this.btnRead.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnRead.Location = new System.Drawing.Point(674, 10); + this.btnRead.Margin = new System.Windows.Forms.Padding(4); + this.btnRead.Name = "btnRead"; + this.btnRead.Size = new System.Drawing.Size(97, 31); + this.btnRead.TabIndex = 10; + this.btnRead.Text = "读取Excel"; + // // btnOk // this.btnOk.Location = new System.Drawing.Point(12, 10); @@ -79,19 +89,9 @@ namespace Lskj.PubBomImportNew this.gcMain.Margin = new System.Windows.Forms.Padding(4); this.gcMain.Name = "gcMain"; this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum; - this.gcMain.Size = new System.Drawing.Size(872, 549); + this.gcMain.Size = new System.Drawing.Size(784, 411); this.gcMain.TabIndex = 17; // - // btnRead - // - this.btnRead.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnRead.Location = new System.Drawing.Point(762, 10); - this.btnRead.Margin = new System.Windows.Forms.Padding(4); - this.btnRead.Name = "btnRead"; - this.btnRead.Size = new System.Drawing.Size(97, 31); - this.btnRead.TabIndex = 10; - this.btnRead.Text = "读取Excel"; - // // FrmMain // this.Appear \ No newline at end of file diff --git a/插件库/Lskj.PubBomImportNew/FrmMain.cs b/插件库/Lskj.PubBomImportNew/FrmMain.cs index 1ff69e3..227888f 100644 --- a/插件库/Lskj.PubBomImportNew/FrmMain.cs +++ b/插件库/Lskj.PubBomImportNew/FrmMain.cs @@ -61,6 +61,7 @@ namespace Lskj.PubBomImportNew { try { + this.Opacity = 1; InitEvents(); InitGridColumns(); InitDataSource(); @@ -218,8 +219,8 @@ namespace Lskj.PubBomImportNew GridColumn clientFieldNameColumn = this.gcMain.GridView.Columns.AddVisible("clientFieldName", "绑定程序列"); clientFieldNameColumn.Width = 200; - //DataTable gridColumnsTab = BaseModuleImpl.GetBaseGridColumns(this.Model.ModuleCode); - DataTable gridColumnsTab = BillImpl.GetDetailColumns(this.Model.ModuleCode); + DataTable gridColumnsTab = BaseModuleImpl.GetBaseGridColumns(this.Model.ModuleCode); + //DataTable gridColumnsTab = BillImpl.GetDetailColumns(this.Model.ModuleCode); searchEdit.View.OptionsView.ShowIndicator = false; searchEdit.View.OptionsView.ColumnAutoWidth = false; //searchEdit.PopupSizeable = true; @@ -407,7 +408,7 @@ namespace Lskj.PubBomImportNew startRow = mergrRange.LastRow + 1; if (mergrRange != null) { - if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp + if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp { isBandTitle = true; bandRow = sheet.GetRow(mergrRange.LastRow + 1); @@ -689,7 +690,7 @@ namespace Lskj.PubBomImportNew startRow = mergrRange.LastRow + 1; if (mergrRange != null) { - if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp + if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp { isBandTitle = true; bandRow = sheet.GetRow(mergrRange.LastRow + 1); @@ -775,7 +776,7 @@ namespace Lskj.PubBomImportNew startRow = mergrRange.LastRow + 1; if (mergrRange != null) { - if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp + if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp { isBandTitle = true; bandRow = sheet.GetRow(mergrRange.LastRow + 1); diff --git a/插件库/Lskj.PubBomImportNew/FrmMain2.Designer.cs b/插件库/Lskj.PubBomImportNew/FrmMain2.Designer.cs index eaa3432..eaa231f 100644 --- a/插件库/Lskj.PubBomImportNew/FrmMain2.Designer.cs +++ b/插件库/Lskj.PubBomImportNew/FrmMain2.Designer.cs @@ -29,7 +29,6 @@ namespace Lskj.PubBomImportNew /// private void InitializeComponent() { - this.gcMain = new Lskj.Control.GridControlEx(); this.pl_top = new DevExpress.XtraEditors.PanelControl(); this.btnCover = new DevExpress.XtraEditors.SimpleButton(); this.btnImport = new DevExpress.XtraEditors.SimpleButton(); @@ -38,6 +37,7 @@ namespace Lskj.PubBomImportNew this.pl_bottom = new DevExpress.XtraEditors.PanelControl(); this.label1 = new System.Windows.Forms.Label(); this.pl_main = new DevExpress.XtraEditors.PanelControl(); + this.gcMain = new Lskj.Control.GridControlEx(); ((System.ComponentModel.ISupportInitialize)(this.pl_top)).BeginInit(); this.pl_top.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pl_bottom)).BeginInit(); @@ -46,19 +46,6 @@ namespace Lskj.PubBomImportNew this.pl_main.SuspendLayout(); this.SuspendLayout(); // - // gcMain - // - this.gcMain.AdapterObj = null; - this.gcMain.BackColor = System.Drawing.Color.Transparent; - this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain.Font = new System.Drawing.Font("宋体", 9F); - this.gcMain.Location = new System.Drawing.Point(0, 0); - this.gcMain.Margin = new System.Windows.Forms.Padding(6); - this.gcMain.Name = "gcMain"; - this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum; - this.gcMain.Size = new System.Drawing.Size(1394, 927); - this.gcMain.TabIndex = 0; - // // pl_top // this.pl_top.Appearance.BackColor = System.Drawing.Color.Transparent; @@ -72,7 +59,7 @@ namespace Lskj.PubBomImportNew this.pl_top.Location = new System.Drawing.Point(0, 0); this.pl_top.Margin = new System.Windows.Forms.Padding(4); this.pl_top.Name = "pl_top"; - this.pl_top.Size = new System.Drawing.Size(1394, 64); + this.pl_top.Size = new System.Drawing.Size(884, 64); this.pl_top.TabIndex = 3; // // btnCover @@ -111,7 +98,7 @@ namespace Lskj.PubBomImportNew // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(1076, 22); + this.label2.Location = new System.Drawing.Point(566, 22); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(199, 14); @@ -125,10 +112,10 @@ namespace Lskj.PubBomImportNew this.pl_bottom.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.pl_bottom.Controls.Add(this.label1); this.pl_bottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pl_bottom.Location = new System.Drawing.Point(0, 885); + this.pl_bottom.Location = new System.Drawing.Point(0, 519); this.pl_bottom.Margin = new System.Windows.Forms.Padding(4); this.pl_bottom.Name = "pl_bottom"; - this.pl_bottom.Size = new System.Drawing.Size(1394, 42); + this.pl_bottom.Size = new System.Drawing.Size(884, 42); this.pl_bottom.TabIndex = 4; // // label1 @@ -148,11 +135,24 @@ namespace Lskj.PubBomImportNew this.pl_main.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.pl_main.Controls.Add(this.gcMain); this.pl_main.Dock = System.Windows.Forms.DockStyle.Fill; - this.pl_main.Location = new System.Drawing.Point(0, 0); + this.pl_main.Location = new System.Drawing.Point(0, 64); this.pl_main.Margin = new System.Windows.Forms.Padding(4); this.pl_main.Name = "pl_main"; - this.pl_main.Size = new System.Drawing.Size(1394, 927); - this.pl_main.TabIndex = 5; + this.pl_main.Size = new System.Drawing.Size(884, 455); + this.pl_main.TabIndex = 6; + // + // gcMain + // + this.gcMain.AdapterObj = null; + this.gcMain.BackColor = System.Drawing.Color.Transparent; + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Font = new System.Drawing.Font("宋体", 9F); + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.Margin = new System.Windows.Forms.Padding(6); + this.gcMain.Name = "gcMain"; + this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum; + this.gcMain.Size = new System.Drawing.Size(884, 455); + this.gcMain.TabIndex = 1; // // FrmMain2 // @@ -160,11 +160,11 @@ namespace Lskj.PubBomImportNew this.Appearance.Options.UseBackColor = true; this.Appearance.Options.UseFont = true; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1394, 927); + this.ClientSize = new System.Drawing.Size(884, 561); + this.Controls.Add(this.pl_main); this.Controls.Add(this.pl_top); this.Controls.Add(this.pl_bottom); - this.Controls.Add(this.pl_main); this.Name = "FrmMain2"; this.Opacity = 0D; this.Text = "表格导入"; - ((System.ComponentModel.ISupportInitialize)(this.pl_top) \ No newline at end of file + ((System.ComponentModel.ISupportInitialize)(this.pl_to \ No newline at end of file diff --git a/插件库/Lskj.PubBomImportNew/FrmMain2.cs b/插件库/Lskj.PubBomImportNew/FrmMain2.cs index 0df385e..445b11a 100644 --- a/插件库/Lskj.PubBomImportNew/FrmMain2.cs +++ b/插件库/Lskj.PubBomImportNew/FrmMain2.cs @@ -122,6 +122,7 @@ namespace Lskj.PubBomImportNew public int FirstRowIndex = 0; protected override void OnLoad(EventArgs e) { + this.Opacity = 1; int.TryParse(Model.stratRowHand + "", out FirstRowIndex); DataRow modelRow = MainImpl.GetSystemdllTab(Model.ModuleCode);//获取模块信息 if (modelRow != null) @@ -868,11 +869,13 @@ namespace Lskj.PubBomImportNew if (dataTable == null || dataTable.Rows.Count == 0) { MessageUtil.Show("未配置关联\r\n请联系管理员进行配置"); + return; } } else { MessageUtil.Show("未配置关联\r\n请联系管理员进行配置"); + return; } OpenFileDialog dialog = new OpenFileDialog(); dialog.Title = "选择导入文件"; @@ -1190,7 +1193,7 @@ namespace Lskj.PubBomImportNew startRow = mergrRange.LastRow + 1; if (mergrRange != null) { - if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp + if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp { isBandTitle = true; bandRow = sheet.GetRow(mergrRange.LastRow + 1); @@ -1425,7 +1428,7 @@ namespace Lskj.PubBomImportNew startRow = mergrRange.LastRow + 1; if (mergrRange != null) { - if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp + if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp { isBandTitle = true; bandRow = sheet.GetRow(mergrRange.LastRow + 1); @@ -1511,7 +1514,7 @@ namespace Lskj.PubBomImportNew startRow = mergrRange.LastRow + 1; if (mergrRange != null) { - if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp + if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp { isBandTitle = true; bandRow = sheet.GetRow(mergrRange.LastRow + 1);