Compare commits
3 Commits
237aee5526
...
993dfe1e31
Author | SHA1 | Date | |
---|---|---|---|
|
993dfe1e31 | ||
|
6145594390 | ||
|
1970739306 |
@ -48,7 +48,6 @@ namespace RhSolutions.Controllers
|
|||||||
{
|
{
|
||||||
Range worksheetCells = TargetFile.Sheet.Cells;
|
Range worksheetCells = TargetFile.Sheet.Cells;
|
||||||
Range skuColumn = TargetFile.SkuCell.EntireColumn;
|
Range skuColumn = TargetFile.SkuCell.EntireColumn;
|
||||||
Range oldSkuColumn = TargetFile.OldSkuCell.EntireColumn;
|
|
||||||
|
|
||||||
int? row = GetPositionRow(skuColumn, positionAmount.Key.ProductSku, positionAmount.Key.ProductLine);
|
int? row = GetPositionRow(skuColumn, positionAmount.Key.ProductSku, positionAmount.Key.ProductLine);
|
||||||
|
|
||||||
@ -66,7 +65,7 @@ namespace RhSolutions.Controllers
|
|||||||
|
|
||||||
if (TargetFile.OldSkuCell != null)
|
if (TargetFile.OldSkuCell != null)
|
||||||
{
|
{
|
||||||
row = GetPositionRow(oldSkuColumn, positionAmount.Key.ProductSku, positionAmount.Key.ProductLine);
|
row = GetPositionRow(TargetFile.OldSkuCell.EntireColumn, positionAmount.Key.ProductSku, positionAmount.Key.ProductLine);
|
||||||
|
|
||||||
if (row != null)
|
if (row != null)
|
||||||
{
|
{
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
using Microsoft.Office.Interop.Excel;
|
using Microsoft.Office.Interop.Excel;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
namespace RhSolutions.Models
|
namespace RhSolutions.Models
|
||||||
@ -18,7 +19,7 @@ namespace RhSolutions.Models
|
|||||||
}
|
}
|
||||||
|
|
||||||
Sheet = workbook.ActiveSheet;
|
Sheet = workbook.ActiveSheet;
|
||||||
Name = workbook.Name;
|
Name = Path.GetFileNameWithoutExtension(workbook.FullName);
|
||||||
|
|
||||||
Range[] cells = new[]
|
Range[] cells = new[]
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using Microsoft.Office.Interop.Excel;
|
using Microsoft.Office.Interop.Excel;
|
||||||
using System;
|
using System;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
namespace RhSolutions.Models
|
namespace RhSolutions.Models
|
||||||
@ -17,7 +18,7 @@ namespace RhSolutions.Models
|
|||||||
}
|
}
|
||||||
|
|
||||||
Sheet = workbook.ActiveSheet;
|
Sheet = workbook.ActiveSheet;
|
||||||
Name = workbook.FullName;
|
Name = Path.GetFileNameWithoutExtension(workbook.FullName);
|
||||||
|
|
||||||
Range[] cells = new[]
|
Range[] cells = new[]
|
||||||
{
|
{
|
||||||
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.2.1.0")]
|
[assembly: AssemblyVersion("1.2.3.0")]
|
||||||
[assembly: AssemblyFileVersion("1.2.1.0")]
|
[assembly: AssemblyFileVersion("1.2.3.0")]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user