SVN-Revision: r737
This commit is contained in:
wyf
2025-06-14 15:53:32 +00:00
parent f6968aa9de
commit 761bbc9e11
4 changed files with 50 additions and 46 deletions
+6 -3
View File
@@ -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);