Compare commits
No commits in common. "993dfe1e318ee6405d539d6217ae78bba11e12c6" and "237aee55269ba404a807a040ef4419d9b5facf42" have entirely different histories.
993dfe1e31
...
237aee5526
@ -48,6 +48,7 @@ namespace RhSolutions.Controllers
|
||||
{
|
||||
Range worksheetCells = TargetFile.Sheet.Cells;
|
||||
Range skuColumn = TargetFile.SkuCell.EntireColumn;
|
||||
Range oldSkuColumn = TargetFile.OldSkuCell.EntireColumn;
|
||||
|
||||
int? row = GetPositionRow(skuColumn, positionAmount.Key.ProductSku, positionAmount.Key.ProductLine);
|
||||
|
||||
@ -65,7 +66,7 @@ namespace RhSolutions.Controllers
|
||||
|
||||
if (TargetFile.OldSkuCell != null)
|
||||
{
|
||||
row = GetPositionRow(TargetFile.OldSkuCell.EntireColumn, positionAmount.Key.ProductSku, positionAmount.Key.ProductLine);
|
||||
row = GetPositionRow(oldSkuColumn, positionAmount.Key.ProductSku, positionAmount.Key.ProductLine);
|
||||
|
||||
if (row != null)
|
||||
{
|
||||
|
@ -2,7 +2,6 @@
|
||||
using Microsoft.Office.Interop.Excel;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
namespace RhSolutions.Models
|
||||
@ -19,7 +18,7 @@ namespace RhSolutions.Models
|
||||
}
|
||||
|
||||
Sheet = workbook.ActiveSheet;
|
||||
Name = Path.GetFileNameWithoutExtension(workbook.FullName);
|
||||
Name = workbook.Name;
|
||||
|
||||
Range[] cells = new[]
|
||||
{
|
||||
|
@ -1,6 +1,5 @@
|
||||
using Microsoft.Office.Interop.Excel;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
namespace RhSolutions.Models
|
||||
@ -18,7 +17,7 @@ namespace RhSolutions.Models
|
||||
}
|
||||
|
||||
Sheet = workbook.ActiveSheet;
|
||||
Name = Path.GetFileNameWithoutExtension(workbook.FullName);
|
||||
Name = workbook.FullName;
|
||||
|
||||
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
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.2.3.0")]
|
||||
[assembly: AssemblyFileVersion("1.2.3.0")]
|
||||
[assembly: AssemblyVersion("1.2.1.0")]
|
||||
[assembly: AssemblyFileVersion("1.2.1.0")]
|
||||
|
Loading…
x
Reference in New Issue
Block a user