From 487828a697477cdf03f7f83e244324d9113f1dcc Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 24 Oct 2016 10:33:04 +0200 Subject: [PATCH] aggiunto num ordini forn in movimenti aperti refresh su IIS01/IIS02 --- .vs/config/applicationhost.config | 2 +- SiteSelector/bin/SiteSelector.dll | Bin 8192 -> 8192 bytes StockManMVC/App_Start/MVCGridConfig.cs | 5 +++++ .../Controllers/ItemFluxesController.cs | 13 ------------- StockManMVC/Models/SMModel.edmx | 4 ++++ StockManMVC/Models/vItemFlux2Save.cs | 1 + StockManMVC/bin/StockManMVC.dll | Bin 137216 -> 138240 bytes VersGen/VersGen.cs | 4 ++-- VersGen/VersGen.tt | 4 ++-- VersGen/bin/Release/VersGen.dll | Bin 4096 -> 4096 bytes VersGen/obj/Release/TempPE/VersGen.cs.dll | Bin 2048 -> 2048 bytes VersGen/obj/Release/VersGen.dll | Bin 4096 -> 4096 bytes 12 files changed, 15 insertions(+), 18 deletions(-) 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 1f88c8e543d642df052e180b766024332f12e59e..bc9094ea82e27df5d6bd815017efbbee9bead9fa 100644 GIT binary patch delta 150 zcmZp0XmFU&!TkI%@5XL@E@pEElg)d%HggJ;o=Kf~U2~@I6mFA@Rn003H#dk(V`Mee zGc_}rEG>2sq+#-VF-d{{>u*U0cd9$Lr7d47(Vru=Swg&oncIZPoPiMtf%N9-Qqhc@ irVM%vrVM64(|=1>BXK9!%bFu3Cr=c2+RP~TpAi5iy)7yL delta 150 zcmZp0XmFU&!5pE-wXs{Di`k69c=KMa&71;fD))TbwsL{bR;j+SaK^vFn;S%?F|wNI znVK0-mKM9n9I3}O`MsE=fVfWE!zEI@E*sue_ 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 +