diff --git a/StockManMVC/Controllers/ItemStocksController.cs b/StockManMVC/Controllers/ItemStocksController.cs index 08d73f8..dcd09e0 100644 --- a/StockManMVC/Controllers/ItemStocksController.cs +++ b/StockManMVC/Controllers/ItemStocksController.cs @@ -47,6 +47,18 @@ namespace StockManMVC.Controllers return View(itemStock.ToList()); } + /// + /// Elenco x famiglia ordine qta desc + /// + /// + /// + public ActionResult ListByLocation(string LocationID) + { + if (LocationID == null) LocationID = ""; + var itemStock = db.ItemStock.Where(s => s.LocationID == LocationID && s.QtyConf > 0).OrderByDescending(x => x.QtyConf); + return PartialView("ListByLocation", itemStock); + } + // GET: ItemStocks/Details/5 public ActionResult Details(int? id) { diff --git a/StockManMVC/Controllers/ItemsController.cs b/StockManMVC/Controllers/ItemsController.cs index bd918ee..56ca9a9 100644 --- a/StockManMVC/Controllers/ItemsController.cs +++ b/StockManMVC/Controllers/ItemsController.cs @@ -155,7 +155,6 @@ namespace StockManMVC.Controllers var item = db.Item.Where(s => s.ItemFamilyID == FamilyID).OrderByDescending(x=>x.QtaPend); return PartialView("ListByFamily", item); } - // GET: Items/Consolidate/5?caller=callingController public ActionResult Consolidate(int? id, string caller) diff --git a/StockManMVC/StockManMVC.csproj b/StockManMVC/StockManMVC.csproj index 6fba1ec..5d35603 100644 --- a/StockManMVC/StockManMVC.csproj +++ b/StockManMVC/StockManMVC.csproj @@ -446,6 +446,7 @@ + diff --git a/StockManMVC/Views/ItemStocks/ListByLocation.cshtml b/StockManMVC/Views/ItemStocks/ListByLocation.cshtml new file mode 100644 index 0000000..6bb0fb1 --- /dev/null +++ b/StockManMVC/Views/ItemStocks/ListByLocation.cshtml @@ -0,0 +1,68 @@ +@model IEnumerable + +
+
+
+
+ @Html.DisplayNameFor(model => model.Location.Descr) +
+
+ reset +
+
+
+
+ + + + + + + + + + @foreach (var item in Model) + { + + + + + + + + } + +
+ @Html.DisplayNameFor(model => model.Item.CodInt) + + @Html.DisplayNameFor(model => model.Item.Descr) + + @Html.DisplayNameFor(model => model.QtyConf) + + @Html.DisplayNameFor(model => model.Item.CurrValue) +
+ + + + +
+ @Html.DisplayFor(modelItem => item.Item.CodInt) +
+
+ (@Html.DisplayFor(modelItem => item.Item.CodExt)) +
+ +
+
+ @Html.DisplayFor(modelItem => item.Item.Descr) +
+
+ (@Html.DisplayFor(modelItem => item.Item.DescrExt)) +
+
+ @Html.DisplayFor(modelItem => item.QtyConf) + + @Html.DisplayFor(modelItem => item.Item.CurrValue) +
+
+
diff --git a/StockManMVC/Views/Items/ListByFamily.cshtml b/StockManMVC/Views/Items/ListByFamily.cshtml index 8c98e76..79b6496 100644 --- a/StockManMVC/Views/Items/ListByFamily.cshtml +++ b/StockManMVC/Views/Items/ListByFamily.cshtml @@ -42,7 +42,7 @@ @Html.DisplayFor(modelItem => item.CodInt)
- (@Html.DisplayFor(modelItem => item.CodInt)) + (@Html.DisplayFor(modelItem => item.CodExt))
diff --git a/StockManMVC/Views/MagStatus/Index.cshtml b/StockManMVC/Views/MagStatus/Index.cshtml index a82ecb3..f726716 100644 --- a/StockManMVC/Views/MagStatus/Index.cshtml +++ b/StockManMVC/Views/MagStatus/Index.cshtml @@ -5,6 +5,10 @@ }
+ @*
+
+
+
*@
@@ -13,6 +17,7 @@
+ @@ -28,11 +33,15 @@ + @foreach (var item in Model) { - + + @@ -48,6 +57,10 @@ + + }
@Html.DisplayNameFor(model => model.Location.Descr) @Html.DisplayNameFor(model => model.TotVal)
+ + @Html.DisplayFor(modelItem => item.Location.Descr) @Html.DisplayFor(modelItem => item.TotVal) + +
@@ -56,8 +69,6 @@
- @*@using (Html.BeginForm("Index", "MagStatus", FormMethod.Get)) - {*@
@@ -113,7 +124,6 @@
- @*}*@
diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index 86705cc..0ae31e9 100644 Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ