diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index e7bbd02..1ab2390 100644 --- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json +++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj": {} + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj": {} }, "projects": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -29,14 +29,14 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj" } } } @@ -75,14 +75,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -136,14 +136,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -161,8 +161,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" } } } @@ -201,14 +201,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -226,8 +226,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" } } } diff --git a/Controladora/obj/project.assets.json b/Controladora/obj/project.assets.json index 90a391d..8825f63 100644 --- a/Controladora/obj/project.assets.json +++ b/Controladora/obj/project.assets.json @@ -3236,11 +3236,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -3258,14 +3258,14 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj" } } } diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache index fdd8a32..e1ef77f 100644 --- a/Controladora/obj/project.nuget.cache +++ b/Controladora/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "E4oWaijIyXE=", + "dgSpecHash": "jzcwhlwBITI=", "success": true, - "projectFilePath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj", "expectedPackageFiles": [ "C:\\Users\\fedpo\\.nuget\\packages\\azure.core\\1.35.0\\azure.core.1.35.0.nupkg.sha512", "C:\\Users\\fedpo\\.nuget\\packages\\azure.identity\\1.10.3\\azure.identity.1.10.3.nupkg.sha512", diff --git a/Entidades/Detalle.cs b/Entidades/Detalle.cs index cafef6f..9bd8783 100644 --- a/Entidades/Detalle.cs +++ b/Entidades/Detalle.cs @@ -2,7 +2,7 @@ namespace Entidades { - public class Detalle where T:Producto + public class Detalle where T: Producto { public int Id { get; set; } diff --git a/Entidades/DetalleFactura.cs b/Entidades/DetalleFactura.cs index 966aa2b..b637c4e 100644 --- a/Entidades/DetalleFactura.cs +++ b/Entidades/DetalleFactura.cs @@ -3,8 +3,9 @@ using System.ComponentModel.DataAnnotations.Schema; namespace Entidades { - public class DetalleFactura: Detalle + public class DetalleFactura: Detalle, ICloneable { + public DetalleFactura() { } public int IdFactura { get; set; } public double Subtotal @@ -22,5 +23,17 @@ namespace Entidades return Producto.Nombre; } } + + private DetalleFactura(DetalleFactura detalle) + { + Id = detalle.Id; + IdFactura = detalle.IdFactura; + Producto = detalle.Producto; + Cantidad = detalle.Cantidad; + } + public object Clone() + { + return new DetalleFactura(this); + } } } diff --git a/Entidades/Lote.cs b/Entidades/Lote.cs index e56e288..efaee8d 100644 --- a/Entidades/Lote.cs +++ b/Entidades/Lote.cs @@ -8,7 +8,8 @@ namespace Entidades public int IdRemito { get; set; } public DateTime Fecha { get; set; } public bool Habilitado { get; set; } - + public int CantRecibida { get; set; } + [NotMapped] public string NombreProducto { @@ -31,6 +32,7 @@ namespace Entidades IdRemito = lote.IdRemito; Fecha = lote.Fecha; Habilitado = lote.Habilitado; + CantRecibida = CantRecibida; } public object Clone() diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index fe85bce..e0644f9 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": {} + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": {} }, "projects": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Entidades/obj/project.assets.json b/Entidades/obj/project.assets.json index d949d63..2591af6 100644 --- a/Entidades/obj/project.assets.json +++ b/Entidades/obj/project.assets.json @@ -13,11 +13,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Entidades/obj/project.nuget.cache b/Entidades/obj/project.nuget.cache index 9615683..1d4e752 100644 --- a/Entidades/obj/project.nuget.cache +++ b/Entidades/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "88BLEYt162w=", + "dgSpecHash": "AY+tdJ7Ql6g=", "success": true, - "projectFilePath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Informes/bin/Debug/net8.0/Entidades.dll b/Informes/bin/Debug/net8.0/Entidades.dll index 8416213..2ba4ec9 100644 Binary files a/Informes/bin/Debug/net8.0/Entidades.dll and b/Informes/bin/Debug/net8.0/Entidades.dll differ diff --git a/Informes/bin/Debug/net8.0/Entidades.pdb b/Informes/bin/Debug/net8.0/Entidades.pdb index b8316e6..cb22731 100644 Binary files a/Informes/bin/Debug/net8.0/Entidades.pdb and b/Informes/bin/Debug/net8.0/Entidades.pdb differ diff --git a/Informes/bin/Debug/net8.0/Informes.dll b/Informes/bin/Debug/net8.0/Informes.dll index caeb0d7..3c0d4c8 100644 Binary files a/Informes/bin/Debug/net8.0/Informes.dll and b/Informes/bin/Debug/net8.0/Informes.dll differ diff --git a/Informes/bin/Debug/net8.0/Informes.pdb b/Informes/bin/Debug/net8.0/Informes.pdb index 70ddfc9..49241c3 100644 Binary files a/Informes/bin/Debug/net8.0/Informes.pdb and b/Informes/bin/Debug/net8.0/Informes.pdb differ diff --git a/Informes/obj/Debug/net8.0/Informes.AssemblyInfo.cs b/Informes/obj/Debug/net8.0/Informes.AssemblyInfo.cs index f79d940..105b73b 100644 --- a/Informes/obj/Debug/net8.0/Informes.AssemblyInfo.cs +++ b/Informes/obj/Debug/net8.0/Informes.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Informes")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+393caac989bc21fa565a3f37f2db36fec8e62f3b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+431da19be6efff5ccabfe99b4a6044ed89fccab6")] [assembly: System.Reflection.AssemblyProductAttribute("Informes")] [assembly: System.Reflection.AssemblyTitleAttribute("Informes")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Informes/obj/Debug/net8.0/Informes.AssemblyInfoInputs.cache b/Informes/obj/Debug/net8.0/Informes.AssemblyInfoInputs.cache index 3d36f52..d1c36b7 100644 --- a/Informes/obj/Debug/net8.0/Informes.AssemblyInfoInputs.cache +++ b/Informes/obj/Debug/net8.0/Informes.AssemblyInfoInputs.cache @@ -1 +1 @@ -dc67df6e3c1aefb669493ea32177a9ea3a8c3f191c3f4fe633543c972150f401 +a020ef62df5a36a6dbf64f43e2ea1097a9c521e75bac6e6186a3db5c5c3fa3ac diff --git a/Informes/obj/Debug/net8.0/Informes.GeneratedMSBuildEditorConfig.editorconfig b/Informes/obj/Debug/net8.0/Informes.GeneratedMSBuildEditorConfig.editorconfig index 494af7b..24d5a1c 100644 --- a/Informes/obj/Debug/net8.0/Informes.GeneratedMSBuildEditorConfig.editorconfig +++ b/Informes/obj/Debug/net8.0/Informes.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Informes -build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_Das\Informes\ +build_property.ProjectDir = C:\Users\fedpo\Desktop\Final_Das\Informes\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Informes/obj/Debug/net8.0/Informes.assets.cache b/Informes/obj/Debug/net8.0/Informes.assets.cache index be83936..d56dc25 100644 Binary files a/Informes/obj/Debug/net8.0/Informes.assets.cache and b/Informes/obj/Debug/net8.0/Informes.assets.cache differ diff --git a/Informes/obj/Debug/net8.0/Informes.csproj.AssemblyReference.cache b/Informes/obj/Debug/net8.0/Informes.csproj.AssemblyReference.cache index 3ca4e95..7b3cc4a 100644 Binary files a/Informes/obj/Debug/net8.0/Informes.csproj.AssemblyReference.cache and b/Informes/obj/Debug/net8.0/Informes.csproj.AssemblyReference.cache differ diff --git a/Informes/obj/Debug/net8.0/Informes.csproj.CoreCompileInputs.cache b/Informes/obj/Debug/net8.0/Informes.csproj.CoreCompileInputs.cache index 035dc11..f4d02dd 100644 --- a/Informes/obj/Debug/net8.0/Informes.csproj.CoreCompileInputs.cache +++ b/Informes/obj/Debug/net8.0/Informes.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -efb9a16b1b272dbbbf00349d110ae10d377e83fdbe7ddba6ee10317b0fdf737e +c0f0828cef1fb9a9a61977c2bc76d77ef28e48bdc61a59c47e7a0e271e4d0eb2 diff --git a/Informes/obj/Debug/net8.0/Informes.csproj.FileListAbsolute.txt b/Informes/obj/Debug/net8.0/Informes.csproj.FileListAbsolute.txt index da95353..125d2f2 100644 --- a/Informes/obj/Debug/net8.0/Informes.csproj.FileListAbsolute.txt +++ b/Informes/obj/Debug/net8.0/Informes.csproj.FileListAbsolute.txt @@ -28,3 +28,18 @@ C:\Users\fedpo\source\repos\Final_Das\Informes\obj\Debug\net8.0\Informes.dll C:\Users\fedpo\source\repos\Final_Das\Informes\obj\Debug\net8.0\refint\Informes.dll C:\Users\fedpo\source\repos\Final_Das\Informes\obj\Debug\net8.0\Informes.pdb C:\Users\fedpo\source\repos\Final_Das\Informes\obj\Debug\net8.0\ref\Informes.dll +C:\Users\fedpo\Desktop\Final_Das\Informes\bin\Debug\net8.0\Informes.deps.json +C:\Users\fedpo\Desktop\Final_Das\Informes\bin\Debug\net8.0\Informes.dll +C:\Users\fedpo\Desktop\Final_Das\Informes\bin\Debug\net8.0\Informes.pdb +C:\Users\fedpo\Desktop\Final_Das\Informes\bin\Debug\net8.0\Entidades.dll +C:\Users\fedpo\Desktop\Final_Das\Informes\bin\Debug\net8.0\Entidades.pdb +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\Informes.csproj.AssemblyReference.cache +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\Informes.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\Informes.AssemblyInfoInputs.cache +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\Informes.AssemblyInfo.cs +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\Informes.csproj.CoreCompileInputs.cache +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\Informes.csproj.Up2Date +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\Informes.dll +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\refint\Informes.dll +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\Informes.pdb +C:\Users\fedpo\Desktop\Final_Das\Informes\obj\Debug\net8.0\ref\Informes.dll diff --git a/Informes/obj/Debug/net8.0/Informes.dll b/Informes/obj/Debug/net8.0/Informes.dll index caeb0d7..3c0d4c8 100644 Binary files a/Informes/obj/Debug/net8.0/Informes.dll and b/Informes/obj/Debug/net8.0/Informes.dll differ diff --git a/Informes/obj/Debug/net8.0/Informes.pdb b/Informes/obj/Debug/net8.0/Informes.pdb index 70ddfc9..49241c3 100644 Binary files a/Informes/obj/Debug/net8.0/Informes.pdb and b/Informes/obj/Debug/net8.0/Informes.pdb differ diff --git a/Informes/obj/Debug/net8.0/ref/Informes.dll b/Informes/obj/Debug/net8.0/ref/Informes.dll index 3c558c4..25ea68b 100644 Binary files a/Informes/obj/Debug/net8.0/ref/Informes.dll and b/Informes/obj/Debug/net8.0/ref/Informes.dll differ diff --git a/Informes/obj/Debug/net8.0/refint/Informes.dll b/Informes/obj/Debug/net8.0/refint/Informes.dll index 3c558c4..25ea68b 100644 Binary files a/Informes/obj/Debug/net8.0/refint/Informes.dll and b/Informes/obj/Debug/net8.0/refint/Informes.dll differ diff --git a/Informes/obj/Informes.csproj.nuget.dgspec.json b/Informes/obj/Informes.csproj.nuget.dgspec.json index 366238b..5b24f0f 100644 --- a/Informes/obj/Informes.csproj.nuget.dgspec.json +++ b/Informes/obj/Informes.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": {} + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": {} }, "projects": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -65,14 +65,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -90,8 +90,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" } } } diff --git a/Informes/obj/project.assets.json b/Informes/obj/project.assets.json index 5942cf5..113f6d1 100644 --- a/Informes/obj/project.assets.json +++ b/Informes/obj/project.assets.json @@ -32,11 +32,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -54,8 +54,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" } } } diff --git a/Informes/obj/project.nuget.cache b/Informes/obj/project.nuget.cache index 7a42821..2770c95 100644 --- a/Informes/obj/project.nuget.cache +++ b/Informes/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "JpHw2bRb2qg=", + "dgSpecHash": "9Ctun7lgVgo=", "success": true, - "projectFilePath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Modelo/Migrations/20241016232125_PuseCantidadOriginalDeStock.Designer.cs b/Modelo/Migrations/20241016232125_PuseCantidadOriginalDeStock.Designer.cs new file mode 100644 index 0000000..ce11153 --- /dev/null +++ b/Modelo/Migrations/20241016232125_PuseCantidadOriginalDeStock.Designer.cs @@ -0,0 +1,559 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Modelo; + +#nullable disable + +namespace Modelo.Migrations +{ + [DbContext(typeof(Context))] + [Migration("20241016232125_PuseCantidadOriginalDeStock")] + partial class PuseCantidadOriginalDeStock + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); + + modelBuilder.Entity("Entidades.Categoria", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Descripcion") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Categoria", (string)null); + }); + + modelBuilder.Entity("Entidades.Cliente", b => + { + b.Property("Cuit") + .HasColumnType("INTEGER"); + + b.Property("Apellido") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("TEXT"); + + b.Property("Correo") + .IsRequired() + .HasMaxLength(150) + .HasColumnType("TEXT"); + + b.Property("Direccion") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("Habilitado") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("Nombre") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("TEXT"); + + b.HasKey("Cuit"); + + b.ToTable("Clientes", (string)null); + }); + + modelBuilder.Entity("Entidades.DetalleFactura", b => + { + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("IdFactura") + .HasColumnType("INTEGER"); + + b.Property("Cantidad") + .HasColumnType("INTEGER"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("Id", "IdFactura"); + + b.HasIndex("IdFactura"); + + b.HasIndex("ProductoId"); + + b.ToTable("DetallesFacturas", (string)null); + }); + + modelBuilder.Entity("Entidades.DetalleOrdenDeCompra", b => + { + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("IdOrdenDeCompra") + .HasColumnType("INTEGER"); + + b.Property("Cantidad") + .HasColumnType("INTEGER"); + + b.Property("IdPresupuesto") + .HasColumnType("INTEGER"); + + b.Property("MontoCU") + .HasColumnType("REAL"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("Id", "IdOrdenDeCompra"); + + b.HasIndex("IdOrdenDeCompra"); + + b.HasIndex("ProductoId"); + + b.ToTable("DetalleOrdenDeCompras"); + }); + + modelBuilder.Entity("Entidades.DetallePresupuesto", b => + { + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("IdPresupuesto") + .HasColumnType("INTEGER"); + + b.Property("Cantidad") + .HasColumnType("INTEGER"); + + b.Property("MontoCUPropuesto") + .HasColumnType("REAL"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("Id", "IdPresupuesto"); + + b.HasIndex("IdPresupuesto"); + + b.HasIndex("ProductoId"); + + b.ToTable("DetallePresupuestos"); + }); + + modelBuilder.Entity("Entidades.Factura", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClienteCuit") + .HasColumnType("INTEGER"); + + b.Property("Fecha") + .HasColumnType("TEXT"); + + b.Property("IdCliente") + .HasColumnType("INTEGER"); + + b.Property("Total") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("ClienteCuit"); + + b.ToTable("Facturas", (string)null); + }); + + modelBuilder.Entity("Entidades.Lote", b => + { + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("IdRemito") + .HasColumnType("INTEGER"); + + b.Property("CantOriginal") + .HasColumnType("INTEGER"); + + b.Property("Cantidad") + .HasColumnType("INTEGER"); + + b.Property("Fecha") + .HasColumnType("TEXT"); + + b.Property("Habilitado") + .HasColumnType("INTEGER"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("Id", "IdRemito"); + + b.HasIndex("IdRemito"); + + b.HasIndex("ProductoId"); + + b.ToTable("Lotes"); + }); + + modelBuilder.Entity("Entidades.OrdenDeCompra", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Entregado") + .HasColumnType("INTEGER"); + + b.Property("IdProveedor") + .HasColumnType("INTEGER"); + + b.Property("ProveedorCuit") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ProveedorCuit"); + + b.ToTable("OrdenDeCompras"); + }); + + modelBuilder.Entity("Entidades.Presupuesto", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Aceptado") + .HasColumnType("INTEGER"); + + b.Property("Fecha") + .HasColumnType("TEXT"); + + b.Property("Habilitado") + .HasColumnType("INTEGER"); + + b.Property("IdProveedor") + .HasColumnType("INTEGER"); + + b.Property("ProveedorCuit") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ProveedorCuit"); + + b.ToTable("Presupuestos"); + }); + + modelBuilder.Entity("Entidades.Producto", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Discriminator") + .IsRequired() + .HasMaxLength(21) + .HasColumnType("TEXT"); + + b.Property("EsPerecedero") + .HasColumnType("INTEGER"); + + b.Property("Habilitado") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("Nombre") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("TEXT"); + + b.Property("Precio") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Producto"); + + b.HasDiscriminator().HasValue("Producto"); + + b.UseTphMappingStrategy(); + }); + + modelBuilder.Entity("Entidades.Proveedor", b => + { + b.Property("Cuit") + .HasColumnType("INTEGER"); + + b.Property("Direccion") + .IsRequired() + .HasMaxLength(60) + .HasColumnType("TEXT"); + + b.Property("Habilitado") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("Nombre") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("TEXT"); + + b.Property("RazonSocial") + .IsRequired() + .HasMaxLength(60) + .HasColumnType("TEXT"); + + b.HasKey("Cuit"); + + b.ToTable("Proveedores"); + }); + + modelBuilder.Entity("Entidades.Remito", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ProveedorCuit") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ProveedorCuit"); + + b.ToTable("Remitos"); + }); + + modelBuilder.Entity("ProductoCategoria", b => + { + b.Property("CategoriaId") + .HasColumnType("INTEGER"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("CategoriaId", "ProductoId"); + + b.HasIndex("ProductoId"); + + b.ToTable("ProductoCategoria"); + }); + + modelBuilder.Entity("ProductoProveedor", b => + { + b.Property("ProveedorId") + .HasColumnType("INTEGER"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("ProveedorId", "ProductoId"); + + b.HasIndex("ProductoId"); + + b.ToTable("ProductoProveedor"); + }); + + modelBuilder.Entity("Entidades.ProductoNoPercedero", b => + { + b.HasBaseType("Entidades.Producto"); + + b.Property("TipoDeEnvase") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasDiscriminator().HasValue("ProductoNoPercedero"); + }); + + modelBuilder.Entity("Entidades.ProductoPercedero", b => + { + b.HasBaseType("Entidades.Producto"); + + b.Property("MesesHastaConsumoPreferente") + .HasColumnType("INTEGER"); + + b.Property("MesesHastaVencimiento") + .HasColumnType("INTEGER"); + + b.HasDiscriminator().HasValue("ProductoPercedero"); + }); + + modelBuilder.Entity("Entidades.DetalleFactura", b => + { + b.HasOne("Entidades.Factura", null) + .WithMany("Detalles") + .HasForeignKey("IdFactura") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", "Producto") + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Producto"); + }); + + modelBuilder.Entity("Entidades.DetalleOrdenDeCompra", b => + { + b.HasOne("Entidades.OrdenDeCompra", null) + .WithMany("detalles") + .HasForeignKey("IdOrdenDeCompra") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", "Producto") + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Producto"); + }); + + modelBuilder.Entity("Entidades.DetallePresupuesto", b => + { + b.HasOne("Entidades.Presupuesto", null) + .WithMany("detalles") + .HasForeignKey("IdPresupuesto") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", "Producto") + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Producto"); + }); + + modelBuilder.Entity("Entidades.Factura", b => + { + b.HasOne("Entidades.Cliente", "Cliente") + .WithMany() + .HasForeignKey("ClienteCuit") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Cliente"); + }); + + modelBuilder.Entity("Entidades.Lote", b => + { + b.HasOne("Entidades.Remito", null) + .WithMany("Lotes") + .HasForeignKey("IdRemito") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", "Producto") + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Producto"); + }); + + modelBuilder.Entity("Entidades.OrdenDeCompra", b => + { + b.HasOne("Entidades.Proveedor", "Proveedor") + .WithMany() + .HasForeignKey("ProveedorCuit") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Proveedor"); + }); + + modelBuilder.Entity("Entidades.Presupuesto", b => + { + b.HasOne("Entidades.Proveedor", "Proveedor") + .WithMany() + .HasForeignKey("ProveedorCuit") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Proveedor"); + }); + + modelBuilder.Entity("Entidades.Remito", b => + { + b.HasOne("Entidades.Proveedor", "Proveedor") + .WithMany() + .HasForeignKey("ProveedorCuit") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Proveedor"); + }); + + modelBuilder.Entity("ProductoCategoria", b => + { + b.HasOne("Entidades.Categoria", null) + .WithMany() + .HasForeignKey("CategoriaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", null) + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ProductoProveedor", b => + { + b.HasOne("Entidades.Producto", null) + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Proveedor", null) + .WithMany() + .HasForeignKey("ProveedorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Entidades.Factura", b => + { + b.Navigation("Detalles"); + }); + + modelBuilder.Entity("Entidades.OrdenDeCompra", b => + { + b.Navigation("detalles"); + }); + + modelBuilder.Entity("Entidades.Presupuesto", b => + { + b.Navigation("detalles"); + }); + + modelBuilder.Entity("Entidades.Remito", b => + { + b.Navigation("Lotes"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Modelo/Migrations/20241016232125_PuseCantidadOriginalDeStock.cs b/Modelo/Migrations/20241016232125_PuseCantidadOriginalDeStock.cs new file mode 100644 index 0000000..8b10b5e --- /dev/null +++ b/Modelo/Migrations/20241016232125_PuseCantidadOriginalDeStock.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Modelo.Migrations +{ + /// + public partial class PuseCantidadOriginalDeStock : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "CantOriginal", + table: "Lotes", + type: "INTEGER", + nullable: false, + defaultValue: 0); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "CantOriginal", + table: "Lotes"); + } + } +} diff --git a/Modelo/Migrations/20241016232600_RefactorNombre.Designer.cs b/Modelo/Migrations/20241016232600_RefactorNombre.Designer.cs new file mode 100644 index 0000000..9786825 --- /dev/null +++ b/Modelo/Migrations/20241016232600_RefactorNombre.Designer.cs @@ -0,0 +1,559 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Modelo; + +#nullable disable + +namespace Modelo.Migrations +{ + [DbContext(typeof(Context))] + [Migration("20241016232600_RefactorNombre")] + partial class RefactorNombre + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); + + modelBuilder.Entity("Entidades.Categoria", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Descripcion") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Categoria", (string)null); + }); + + modelBuilder.Entity("Entidades.Cliente", b => + { + b.Property("Cuit") + .HasColumnType("INTEGER"); + + b.Property("Apellido") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("TEXT"); + + b.Property("Correo") + .IsRequired() + .HasMaxLength(150) + .HasColumnType("TEXT"); + + b.Property("Direccion") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("Habilitado") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("Nombre") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("TEXT"); + + b.HasKey("Cuit"); + + b.ToTable("Clientes", (string)null); + }); + + modelBuilder.Entity("Entidades.DetalleFactura", b => + { + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("IdFactura") + .HasColumnType("INTEGER"); + + b.Property("Cantidad") + .HasColumnType("INTEGER"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("Id", "IdFactura"); + + b.HasIndex("IdFactura"); + + b.HasIndex("ProductoId"); + + b.ToTable("DetallesFacturas", (string)null); + }); + + modelBuilder.Entity("Entidades.DetalleOrdenDeCompra", b => + { + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("IdOrdenDeCompra") + .HasColumnType("INTEGER"); + + b.Property("Cantidad") + .HasColumnType("INTEGER"); + + b.Property("IdPresupuesto") + .HasColumnType("INTEGER"); + + b.Property("MontoCU") + .HasColumnType("REAL"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("Id", "IdOrdenDeCompra"); + + b.HasIndex("IdOrdenDeCompra"); + + b.HasIndex("ProductoId"); + + b.ToTable("DetalleOrdenDeCompras"); + }); + + modelBuilder.Entity("Entidades.DetallePresupuesto", b => + { + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("IdPresupuesto") + .HasColumnType("INTEGER"); + + b.Property("Cantidad") + .HasColumnType("INTEGER"); + + b.Property("MontoCUPropuesto") + .HasColumnType("REAL"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("Id", "IdPresupuesto"); + + b.HasIndex("IdPresupuesto"); + + b.HasIndex("ProductoId"); + + b.ToTable("DetallePresupuestos"); + }); + + modelBuilder.Entity("Entidades.Factura", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClienteCuit") + .HasColumnType("INTEGER"); + + b.Property("Fecha") + .HasColumnType("TEXT"); + + b.Property("IdCliente") + .HasColumnType("INTEGER"); + + b.Property("Total") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("ClienteCuit"); + + b.ToTable("Facturas", (string)null); + }); + + modelBuilder.Entity("Entidades.Lote", b => + { + b.Property("Id") + .HasColumnType("INTEGER"); + + b.Property("IdRemito") + .HasColumnType("INTEGER"); + + b.Property("CantRecibida") + .HasColumnType("INTEGER"); + + b.Property("Cantidad") + .HasColumnType("INTEGER"); + + b.Property("Fecha") + .HasColumnType("TEXT"); + + b.Property("Habilitado") + .HasColumnType("INTEGER"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("Id", "IdRemito"); + + b.HasIndex("IdRemito"); + + b.HasIndex("ProductoId"); + + b.ToTable("Lotes"); + }); + + modelBuilder.Entity("Entidades.OrdenDeCompra", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Entregado") + .HasColumnType("INTEGER"); + + b.Property("IdProveedor") + .HasColumnType("INTEGER"); + + b.Property("ProveedorCuit") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ProveedorCuit"); + + b.ToTable("OrdenDeCompras"); + }); + + modelBuilder.Entity("Entidades.Presupuesto", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Aceptado") + .HasColumnType("INTEGER"); + + b.Property("Fecha") + .HasColumnType("TEXT"); + + b.Property("Habilitado") + .HasColumnType("INTEGER"); + + b.Property("IdProveedor") + .HasColumnType("INTEGER"); + + b.Property("ProveedorCuit") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ProveedorCuit"); + + b.ToTable("Presupuestos"); + }); + + modelBuilder.Entity("Entidades.Producto", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Discriminator") + .IsRequired() + .HasMaxLength(21) + .HasColumnType("TEXT"); + + b.Property("EsPerecedero") + .HasColumnType("INTEGER"); + + b.Property("Habilitado") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("Nombre") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("TEXT"); + + b.Property("Precio") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Producto"); + + b.HasDiscriminator().HasValue("Producto"); + + b.UseTphMappingStrategy(); + }); + + modelBuilder.Entity("Entidades.Proveedor", b => + { + b.Property("Cuit") + .HasColumnType("INTEGER"); + + b.Property("Direccion") + .IsRequired() + .HasMaxLength(60) + .HasColumnType("TEXT"); + + b.Property("Habilitado") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("Nombre") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("TEXT"); + + b.Property("RazonSocial") + .IsRequired() + .HasMaxLength(60) + .HasColumnType("TEXT"); + + b.HasKey("Cuit"); + + b.ToTable("Proveedores"); + }); + + modelBuilder.Entity("Entidades.Remito", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ProveedorCuit") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ProveedorCuit"); + + b.ToTable("Remitos"); + }); + + modelBuilder.Entity("ProductoCategoria", b => + { + b.Property("CategoriaId") + .HasColumnType("INTEGER"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("CategoriaId", "ProductoId"); + + b.HasIndex("ProductoId"); + + b.ToTable("ProductoCategoria"); + }); + + modelBuilder.Entity("ProductoProveedor", b => + { + b.Property("ProveedorId") + .HasColumnType("INTEGER"); + + b.Property("ProductoId") + .HasColumnType("INTEGER"); + + b.HasKey("ProveedorId", "ProductoId"); + + b.HasIndex("ProductoId"); + + b.ToTable("ProductoProveedor"); + }); + + modelBuilder.Entity("Entidades.ProductoNoPercedero", b => + { + b.HasBaseType("Entidades.Producto"); + + b.Property("TipoDeEnvase") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasDiscriminator().HasValue("ProductoNoPercedero"); + }); + + modelBuilder.Entity("Entidades.ProductoPercedero", b => + { + b.HasBaseType("Entidades.Producto"); + + b.Property("MesesHastaConsumoPreferente") + .HasColumnType("INTEGER"); + + b.Property("MesesHastaVencimiento") + .HasColumnType("INTEGER"); + + b.HasDiscriminator().HasValue("ProductoPercedero"); + }); + + modelBuilder.Entity("Entidades.DetalleFactura", b => + { + b.HasOne("Entidades.Factura", null) + .WithMany("Detalles") + .HasForeignKey("IdFactura") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", "Producto") + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Producto"); + }); + + modelBuilder.Entity("Entidades.DetalleOrdenDeCompra", b => + { + b.HasOne("Entidades.OrdenDeCompra", null) + .WithMany("detalles") + .HasForeignKey("IdOrdenDeCompra") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", "Producto") + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Producto"); + }); + + modelBuilder.Entity("Entidades.DetallePresupuesto", b => + { + b.HasOne("Entidades.Presupuesto", null) + .WithMany("detalles") + .HasForeignKey("IdPresupuesto") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", "Producto") + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Producto"); + }); + + modelBuilder.Entity("Entidades.Factura", b => + { + b.HasOne("Entidades.Cliente", "Cliente") + .WithMany() + .HasForeignKey("ClienteCuit") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Cliente"); + }); + + modelBuilder.Entity("Entidades.Lote", b => + { + b.HasOne("Entidades.Remito", null) + .WithMany("Lotes") + .HasForeignKey("IdRemito") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", "Producto") + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Producto"); + }); + + modelBuilder.Entity("Entidades.OrdenDeCompra", b => + { + b.HasOne("Entidades.Proveedor", "Proveedor") + .WithMany() + .HasForeignKey("ProveedorCuit") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Proveedor"); + }); + + modelBuilder.Entity("Entidades.Presupuesto", b => + { + b.HasOne("Entidades.Proveedor", "Proveedor") + .WithMany() + .HasForeignKey("ProveedorCuit") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Proveedor"); + }); + + modelBuilder.Entity("Entidades.Remito", b => + { + b.HasOne("Entidades.Proveedor", "Proveedor") + .WithMany() + .HasForeignKey("ProveedorCuit") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Proveedor"); + }); + + modelBuilder.Entity("ProductoCategoria", b => + { + b.HasOne("Entidades.Categoria", null) + .WithMany() + .HasForeignKey("CategoriaId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Producto", null) + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ProductoProveedor", b => + { + b.HasOne("Entidades.Producto", null) + .WithMany() + .HasForeignKey("ProductoId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Entidades.Proveedor", null) + .WithMany() + .HasForeignKey("ProveedorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Entidades.Factura", b => + { + b.Navigation("Detalles"); + }); + + modelBuilder.Entity("Entidades.OrdenDeCompra", b => + { + b.Navigation("detalles"); + }); + + modelBuilder.Entity("Entidades.Presupuesto", b => + { + b.Navigation("detalles"); + }); + + modelBuilder.Entity("Entidades.Remito", b => + { + b.Navigation("Lotes"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Modelo/Migrations/20241016232600_RefactorNombre.cs b/Modelo/Migrations/20241016232600_RefactorNombre.cs new file mode 100644 index 0000000..102db84 --- /dev/null +++ b/Modelo/Migrations/20241016232600_RefactorNombre.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Modelo.Migrations +{ + /// + public partial class RefactorNombre : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "CantOriginal", + table: "Lotes", + newName: "CantRecibida"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "CantRecibida", + table: "Lotes", + newName: "CantOriginal"); + } + } +} diff --git a/Modelo/Migrations/ContextModelSnapshot.cs b/Modelo/Migrations/ContextModelSnapshot.cs index 3b580d3..81f3007 100644 --- a/Modelo/Migrations/ContextModelSnapshot.cs +++ b/Modelo/Migrations/ContextModelSnapshot.cs @@ -179,6 +179,9 @@ namespace Modelo.Migrations b.Property("IdRemito") .HasColumnType("INTEGER"); + b.Property("CantRecibida") + .HasColumnType("INTEGER"); + b.Property("Cantidad") .HasColumnType("INTEGER"); diff --git a/Modelo/RepositorioFactura.cs b/Modelo/RepositorioFactura.cs index 14725b7..95991c9 100644 --- a/Modelo/RepositorioFactura.cs +++ b/Modelo/RepositorioFactura.cs @@ -24,13 +24,25 @@ namespace Modelo { t.Cliente = context.Clientes.FirstOrDefault(x => x.Cuit == t.Cliente.Cuit); + var list = new List(); + + int contador = 0; foreach (var detalle in t.Detalles) + { + list.Add((DetalleFactura)detalle.Clone()); + list.Last().Producto = detalle.Producto; + list.Last().Id = contador++; + } + + foreach (var detalle in list) { detalle.Producto = (detalle.Producto.EsPerecedero) ? context.ProductoPercederos.FirstOrDefault(x => x.Id == detalle.Producto.Id) : context.ProductoNoPercederos.FirstOrDefault(x => x.Id == detalle.Producto.Id) ; } + t.Detalles = list; + context.Facturas.Add(t); } diff --git a/Modelo/RepositorioRemito.cs b/Modelo/RepositorioRemito.cs index 4342c5d..72afbbe 100644 --- a/Modelo/RepositorioRemito.cs +++ b/Modelo/RepositorioRemito.cs @@ -41,6 +41,7 @@ namespace Modelo { listaLotes.Add((Lote)lote.Clone()); listaLotes.Last().Producto = lote.Producto; + listaLotes.Last().CantRecibida = lote.Cantidad; } foreach (var lote in listaLotes) diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index 7ac8681..a462270 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj": {} + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj": {} }, "projects": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -65,14 +65,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -90,8 +90,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" } } } diff --git a/Modelo/obj/project.assets.json b/Modelo/obj/project.assets.json index 176093e..ccebf35 100644 --- a/Modelo/obj/project.assets.json +++ b/Modelo/obj/project.assets.json @@ -4443,11 +4443,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -4465,8 +4465,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" } } } diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache index cb2fb4a..5c3766d 100644 --- a/Modelo/obj/project.nuget.cache +++ b/Modelo/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "NhK3CE/FFk0=", + "dgSpecHash": "nBJjlPItJBA=", "success": true, - "projectFilePath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "expectedPackageFiles": [ "C:\\Users\\fedpo\\.nuget\\packages\\azure.core\\1.35.0\\azure.core.1.35.0.nupkg.sha512", "C:\\Users\\fedpo\\.nuget\\packages\\azure.identity\\1.10.3\\azure.identity.1.10.3.nupkg.sha512", diff --git a/Vista/FrmFactura.Designer.cs b/Vista/FrmFactura.Designer.cs index d0269c9..60a5882 100644 --- a/Vista/FrmFactura.Designer.cs +++ b/Vista/FrmFactura.Designer.cs @@ -56,7 +56,7 @@ // // btnAceptar // - btnAceptar.Location = new Point(10, 380); + btnAceptar.Location = new Point(10, 456); btnAceptar.Name = "btnAceptar"; btnAceptar.Size = new Size(82, 26); btnAceptar.TabIndex = 0; @@ -66,7 +66,7 @@ // // btnCancelar // - btnCancelar.Location = new Point(1174, 380); + btnCancelar.Location = new Point(1174, 456); btnCancelar.Name = "btnCancelar"; btnCancelar.Size = new Size(80, 26); btnCancelar.TabIndex = 1; @@ -76,7 +76,7 @@ // // numid // - numid.Location = new Point(37, 351); + numid.Location = new Point(37, 427); numid.Maximum = new decimal(new int[] { 1215752191, 23, 0, 0 }); numid.Name = "numid"; numid.Size = new Size(120, 23); @@ -85,7 +85,7 @@ // label1 // label1.AutoSize = true; - label1.Location = new Point(10, 353); + label1.Location = new Point(10, 429); label1.Name = "label1"; label1.Size = new Size(18, 15); label1.TabIndex = 3; @@ -94,7 +94,7 @@ // numtotal // numtotal.Enabled = false; - numtotal.Location = new Point(202, 351); + numtotal.Location = new Point(202, 427); numtotal.Maximum = new decimal(new int[] { 1215752191, 23, 0, 0 }); numtotal.Name = "numtotal"; numtotal.ReadOnly = true; @@ -104,7 +104,7 @@ // label2 // label2.AutoSize = true; - label2.Location = new Point(164, 355); + label2.Location = new Point(164, 431); label2.Name = "label2"; label2.Size = new Size(32, 15); label2.TabIndex = 5; @@ -112,7 +112,7 @@ // // datepick // - datepick.Location = new Point(378, 353); + datepick.Location = new Point(378, 429); datepick.Name = "datepick"; datepick.Size = new Size(120, 23); datepick.TabIndex = 6; @@ -120,7 +120,7 @@ // label3 // label3.AutoSize = true; - label3.Location = new Point(334, 357); + label3.Location = new Point(334, 433); label3.Name = "label3"; label3.Size = new Size(38, 15); label3.TabIndex = 7; @@ -145,7 +145,7 @@ dgvProductos.Location = new Point(428, 27); dgvProductos.Name = "dgvProductos"; dgvProductos.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dgvProductos.Size = new Size(413, 318); + dgvProductos.Size = new Size(413, 394); dgvProductos.TabIndex = 11; // // dgvDetalles @@ -158,12 +158,13 @@ dgvDetalles.Location = new Point(847, 27); dgvDetalles.Name = "dgvDetalles"; dgvDetalles.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dgvDetalles.Size = new Size(407, 318); + dgvDetalles.Size = new Size(407, 394); dgvDetalles.TabIndex = 12; // // numCantidad // - numCantidad.Location = new Point(586, 355); + numCantidad.Location = new Point(586, 431); + numCantidad.Maximum = new decimal(new int[] { 1215752191, 23, 0, 0 }); numCantidad.Name = "numCantidad"; numCantidad.Size = new Size(120, 23); numCantidad.TabIndex = 13; @@ -171,7 +172,7 @@ // Unidades // Unidades.AutoSize = true; - Unidades.Location = new Point(512, 363); + Unidades.Location = new Point(512, 439); Unidades.Name = "Unidades"; Unidades.Size = new Size(56, 15); Unidades.TabIndex = 14; @@ -179,7 +180,7 @@ // // btnAddDetalle // - btnAddDetalle.Location = new Point(716, 351); + btnAddDetalle.Location = new Point(716, 427); btnAddDetalle.Name = "btnAddDetalle"; btnAddDetalle.Size = new Size(80, 31); btnAddDetalle.TabIndex = 15; @@ -207,7 +208,7 @@ // // btnEliminar // - btnEliminar.Location = new Point(802, 351); + btnEliminar.Location = new Point(802, 427); btnEliminar.Name = "btnEliminar"; btnEliminar.Size = new Size(80, 31); btnEliminar.TabIndex = 18; @@ -225,14 +226,14 @@ dgvClientes.Location = new Point(10, 27); dgvClientes.Name = "dgvClientes"; dgvClientes.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dgvClientes.Size = new Size(412, 318); + dgvClientes.Size = new Size(412, 394); dgvClientes.TabIndex = 19; // // FrmFactura // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1266, 413); + ClientSize = new Size(1266, 494); Controls.Add(dgvClientes); Controls.Add(btnEliminar); Controls.Add(label6); diff --git a/Vista/FrmRemitos.cs b/Vista/FrmRemitos.cs index ccabdea..d94a0f3 100644 --- a/Vista/FrmRemitos.cs +++ b/Vista/FrmRemitos.cs @@ -49,7 +49,7 @@ namespace Vista foreach (DataGridViewColumn column in dgvDetallesRemito.Columns) { column.Visible = column.Name == "Id" || column.Name == "Fecha" - || column.Name == "Cantidad" || column.Name == "NombreProducto"; + || column.Name == "Cantidad" || column.Name == "NombreProducto" || column.Name == "CantRecibida"; } } } diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index f93c896..1b5ef9b 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\Vista.csproj": {} + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\Vista.csproj": {} }, "projects": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -29,14 +29,14 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj" } } } @@ -75,14 +75,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -136,14 +136,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -161,8 +161,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" } } } @@ -201,14 +201,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -226,8 +226,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" } } } @@ -286,14 +286,14 @@ } } }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\Vista.csproj": { + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\Vista.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -311,14 +311,14 @@ "net8.0-windows7.0": { "targetAlias": "net8.0-windows", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj" } } } diff --git a/Vista/obj/project.assets.json b/Vista/obj/project.assets.json index fd05da3..196871d 100644 --- a/Vista/obj/project.assets.json +++ b/Vista/obj/project.assets.json @@ -4596,11 +4596,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -4618,14 +4618,14 @@ "net8.0-windows7.0": { "targetAlias": "net8.0-windows", "projectReferences": { - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Controladora\\Controladora.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Controladora\\Controladora.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Entidades\\Entidades.csproj" }, - "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj": { - "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Informes\\Informes.csproj" + "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Informes\\Informes.csproj" } } } diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache index d32babb..84f4478 100644 --- a/Vista/obj/project.nuget.cache +++ b/Vista/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "gLAiGl4EbGM=", + "dgSpecHash": "nu+4L8PPAqM=", "success": true, - "projectFilePath": "C:\\Users\\fedpo\\source\\repos\\Final_Das\\Vista\\Vista.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final_Das\\Vista\\Vista.csproj", "expectedPackageFiles": [ "C:\\Users\\fedpo\\.nuget\\packages\\azure.core\\1.35.0\\azure.core.1.35.0.nupkg.sha512", "C:\\Users\\fedpo\\.nuget\\packages\\azure.identity\\1.10.3\\azure.identity.1.10.3.nupkg.sha512",