Compare commits
2 Commits
c13e92da1c
...
97d601999c
Author | SHA1 | Date | |
---|---|---|---|
97d601999c | |||
ae7d81e95f |
@ -31,9 +31,14 @@ namespace RhSolutions.Api.Services
|
|||||||
{
|
{
|
||||||
var firstCellAddress = ws.Search("Программа", System.Globalization.CompareOptions.IgnoreCase)
|
var firstCellAddress = ws.Search("Программа", System.Globalization.CompareOptions.IgnoreCase)
|
||||||
.First()
|
.First()
|
||||||
|
.CellLeft()
|
||||||
.Address;
|
.Address;
|
||||||
|
|
||||||
var lastCellAddress = ws.LastCellUsed().Address;
|
var lastCellAddress = ws.Search("Цена брутто", System.Globalization.CompareOptions.IgnoreCase)
|
||||||
|
.First()
|
||||||
|
.WorksheetColumn()
|
||||||
|
.LastCellUsed()
|
||||||
|
.Address;
|
||||||
|
|
||||||
return ws.Range(firstCellAddress, lastCellAddress).AsTable();
|
return ws.Range(firstCellAddress, lastCellAddress).AsTable();
|
||||||
}
|
}
|
||||||
@ -89,16 +94,16 @@ namespace RhSolutions.Api.Services
|
|||||||
productWarehouseCount = 0.0;
|
productWarehouseCount = 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
string onWarehouseField = row.Field("Складская программа")
|
string onWarehouseField = row.Field(0)
|
||||||
.GetString();
|
.GetString();
|
||||||
bool IsOnWarehouse;
|
bool IsOnWarehouse;
|
||||||
|
|
||||||
switch (onWarehouseField)
|
switch (onWarehouseField)
|
||||||
{
|
{
|
||||||
case "x":
|
case "N":
|
||||||
IsOnWarehouse = true;
|
IsOnWarehouse = true;
|
||||||
break;
|
break;
|
||||||
case "под заказ":
|
case "Z":
|
||||||
IsOnWarehouse = false;
|
IsOnWarehouse = false;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -7,7 +7,6 @@ public class RautitanPipesTests : ProductParsersTests
|
|||||||
[TestCase("Труба flex 16", "Труба РЕХАУ FLEX 16x2,2")]
|
[TestCase("Труба flex 16", "Труба РЕХАУ FLEX 16x2,2")]
|
||||||
[TestCase("Унив.труба RAUTITAN flex 32x4,4, прям.отрезки 6м", "Труба РЕХАУ FLEX 32x4,4")]
|
[TestCase("Унив.труба RAUTITAN flex 32x4,4, прям.отрезки 6м", "Труба РЕХАУ FLEX 32x4,4")]
|
||||||
[TestCase("Труба flex 32", "Труба РЕХАУ FLEX 32x4,4")]
|
[TestCase("Труба flex 32", "Труба РЕХАУ FLEX 32x4,4")]
|
||||||
[TestCase("20 Труба PPRC SDR6 PN20 Дн32х5,4 ГОСТ 32415-2013 heisskraft м 10,0", "Труба РЕХАУ FLEX 32x4,4")]
|
|
||||||
public void FlexPipeTest(string query, string modified)
|
public void FlexPipeTest(string query, string modified)
|
||||||
=> Invoke(productType: "Flex", query, modified);
|
=> Invoke(productType: "Flex", query, modified);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user