diff --git a/Areas/Inventory/Models/DepartmentModel.cs b/Areas/Inventory/Models/DepartmentModel.cs index 18e7fdf..a9f2fb0 100644 --- a/Areas/Inventory/Models/DepartmentModel.cs +++ b/Areas/Inventory/Models/DepartmentModel.cs @@ -10,6 +10,6 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models public required string Name { get; set; } public required int CompanyId { get; set; } [ForeignKey("CompanyId")] - public virtual required CompanyModel Company { get; set; } + public virtual CompanyModel? Company { get; set; } } } diff --git a/Areas/Inventory/Models/ItemModel.cs b/Areas/Inventory/Models/ItemModel.cs index cd9b0c5..99a7fc2 100644 --- a/Areas/Inventory/Models/ItemModel.cs +++ b/Areas/Inventory/Models/ItemModel.cs @@ -24,10 +24,10 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models public required DateTime EndWDate { get; set; } public required DateTime InvoiceDate { get; set; } [ForeignKey("CompanyId")] - public required virtual CompanyModel Company { get; set; } + public virtual CompanyModel? Company { get; set; } [ForeignKey("DepartmentId")] - public required virtual DepartmentModel Department { get; set; } + public virtual DepartmentModel? Department { get; set; } [ForeignKey("ProductId")] - public required virtual ProductModel Product { get; set; } + public virtual ProductModel? Product { get; set; } } } diff --git a/Areas/Inventory/Models/ProductModel.cs b/Areas/Inventory/Models/ProductModel.cs index d2bf4ee..eb64bca 100644 --- a/Areas/Inventory/Models/ProductModel.cs +++ b/Areas/Inventory/Models/ProductModel.cs @@ -8,13 +8,12 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models [Key] public int ProductId { get; set; } public required string ProductName { get; set; } - public required string Manufacturer { get; set; } + public required int ManufacturerId { get; set; } public required string Category { get; set; } public required string ModelNo { get; set; } - public required int QuantityProduct { get; set; } + public int? QuantityProduct { get; set; } public required string ImageProduct { get; set; } - public required int CompanyId { get; set; } - [ForeignKey("CompanyId")] - public required virtual CompanyModel Company { get; set; } + [ForeignKey("ManufacturerId")] + public virtual ManufacturerModel? Manufacturer { get; set; } } } diff --git a/Areas/Inventory/Views/Item/ProductRegistration.cshtml b/Areas/Inventory/Views/Item/ProductRegistration.cshtml index ef59cd4..42fa89c 100644 --- a/Areas/Inventory/Views/Item/ProductRegistration.cshtml +++ b/Areas/Inventory/Views/Item/ProductRegistration.cshtml @@ -4,114 +4,127 @@ } @await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml"); -