aggiunto num ordini forn in movimenti aperti

refresh su IIS01/IIS02
This commit is contained in:
Samuele E. Locatelli
2016-10-24 10:33:04 +02:00
parent 3f409f4a00
commit 487828a697
12 changed files with 15 additions and 18 deletions
+1 -1
View File
@@ -170,7 +170,7 @@
</site>
<site name="SiteSelector" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\Visual Studio 2015\Projects\StockMan\SiteSelector" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\StockMan\SiteSelector" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3526:localhost" />
Binary file not shown.
+5
View File
@@ -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")
@@ -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";
+4
View File
@@ -105,6 +105,7 @@ warning 6002: The table/view 'StockMan.dbo.vItemFlux2Save' does not have a prima
<Property Name="NumMov" Type="int" />
<Property Name="TotQta" Type="int" />
<Property Name="TotValCar" Type="decimal" Precision="38" Scale="6" />
<Property Name="TotQtaOrd" Type="int" />
<Property Name="TotQtaCar" Type="int" />
</EntityType>
<!--Errors Found During Generation:
@@ -276,6 +277,7 @@ warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary
[vItemFlux2Save].[NumMov] AS [NumMov],
[vItemFlux2Save].[TotQta] AS [TotQta],
[vItemFlux2Save].[TotValCar] AS [TotValCar],
[vItemFlux2Save].[TotQtaOrd] AS [TotQtaOrd],
[vItemFlux2Save].[TotQtaCar] AS [TotQtaCar]
FROM [dbo].[vItemFlux2Save] AS [vItemFlux2Save]</DefiningQuery>
</EntitySet>
@@ -645,6 +647,7 @@ warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary
<Property Name="TotValCar" Type="Decimal" Precision="38" Scale="6" />
<Property Name="TotQtaCar" Type="Int32" />
<NavigationProperty Name="Item" Relationship="StockManModel.ItemvItemFlux2Save" FromRole="vItemFlux2Save" ToRole="Item" />
<Property Name="TotQtaOrd" Type="Int32" />
</EntityType>
<Association Name="ItemvItemFlux2Save">
<End Type="StockManModel.Item" Role="Item" Multiplicity="1" />
@@ -823,6 +826,7 @@ warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary
<EntitySetMapping Name="vItemFlux2Save">
<EntityTypeMapping TypeName="StockManModel.vItemFlux2Save">
<MappingFragment StoreEntitySet="vItemFlux2Save">
<ScalarProperty Name="TotQtaOrd" ColumnName="TotQtaOrd" />
<ScalarProperty Name="TotQtaCar" ColumnName="TotQtaCar" />
<ScalarProperty Name="TotValCar" ColumnName="TotValCar" />
<ScalarProperty Name="TotQta" ColumnName="TotQta" />
+1
View File
@@ -19,6 +19,7 @@ namespace StockManMVC.Models
public Nullable<int> TotQta { get; set; }
public Nullable<decimal> TotValCar { get; set; }
public Nullable<int> TotQtaCar { get; set; }
public Nullable<int> TotQtaOrd { get; set; }
public virtual Item Item { get; set; }
}
Binary file not shown.
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.1.54.563")]
[assembly: AssemblyFileVersion("1.1.54.563")]
[assembly: AssemblyVersion("1.1.55.564")]
[assembly: AssemblyFileVersion("1.1.55.564")]
[assembly: AssemblyCopyright("Steamware © 2006-2016")]
[assembly: AssemblyCompany("Steamware")]
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.1.54.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.1.54.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.1.55.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.1.55.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
Binary file not shown.
Binary file not shown.
Binary file not shown.