diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 81f0fa8..e735d8a 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -170,7 +170,7 @@ - + diff --git a/SiteSelector/bin/SiteSelector.dll b/SiteSelector/bin/SiteSelector.dll index 1f88c8e..bc9094e 100644 Binary files a/SiteSelector/bin/SiteSelector.dll and b/SiteSelector/bin/SiteSelector.dll differ diff --git a/StockManMVC/App_Start/MVCGridConfig.cs b/StockManMVC/App_Start/MVCGridConfig.cs index f49cc66..1a8b7a0 100644 --- a/StockManMVC/App_Start/MVCGridConfig.cs +++ b/StockManMVC/App_Start/MVCGridConfig.cs @@ -201,6 +201,11 @@ namespace StockManMVC .WithHeaderText("Variazione netta") .WithCellCssClassExpression(p => p.TotQtaCar > 0 ? "success text-right" : "danger text-right") .WithValueExpression(i => i.TotQta.ToString()); + cols.Add("TotQtaOrd").WithColumnName("TotQtaOrd") + .WithVisibility(true, false) + .WithHeaderText("Tot Ordini") + .WithCellCssClassExpression(p => p.TotQtaOrd > 0 ? "success text-right" : "info text-right") + .WithValueExpression(i => i.TotQtaOrd.ToString()); cols.Add("TotQtaCar").WithColumnName("TotQtaCar") .WithVisibility(true, false) .WithHeaderText("Tot Carichi") diff --git a/StockManMVC/Controllers/ItemFluxesController.cs b/StockManMVC/Controllers/ItemFluxesController.cs index 4a50b8f..14dc6c1 100644 --- a/StockManMVC/Controllers/ItemFluxesController.cs +++ b/StockManMVC/Controllers/ItemFluxesController.cs @@ -446,20 +446,11 @@ namespace StockManMVC.Controllers case "CAR": // per partire scelgo la posizione di default ric ordini string stdLocationId = "RIC-ORD"; - // cerco se ci sia una posizione occupata dall'item in stock.. - if (db.ItemStock.Where(s => s.ItemID == ItemID).Count() > 0) - { - stdLocationId = db.ItemStock.Where(s => s.ItemID == ItemID).ToList()[0].LocationID; - } ViewBag.LocationID = new SelectList(db.Location.Where(o => o.LocType.IsStock), "ID", "Descr", stdLocationId); ViewBag.ExtLocationID = new SelectList(db.Location.Where(o => o.LocType.IsFor), "ID", "Descr"); CurrStyle = "bg-success"; break; case "SCAR": - if (query.Count() > 0) - { - ViewBag.LocationID = new SelectList(query, "ID", "Descr"); - } ViewBag.ExtLocationID = new SelectList(db.Location.Where(o => o.LocType.IsCli), "ID", "Descr"); ViewBag.enabEditVal = false; CurrStyle = "bg-danger"; @@ -475,10 +466,6 @@ namespace StockManMVC.Controllers CurrStyle = "bg-info"; break; case "RETT": - if (query.Count() > 0) - { - ViewBag.LocationID = new SelectList(query, "ID", "Descr"); - } ViewBag.ExtLocationID = new SelectList(db.Location, "ID", "Descr"); ViewBag.enabEditVal = false; CurrStyle = "bg-warning"; diff --git a/StockManMVC/Models/SMModel.edmx b/StockManMVC/Models/SMModel.edmx index 1cc72e3..bf2174a 100644 --- a/StockManMVC/Models/SMModel.edmx +++ b/StockManMVC/Models/SMModel.edmx @@ -105,6 +105,7 @@ warning 6002: The table/view 'StockMan.dbo.vItemFlux2Save' does not have a prima +