diff --git a/Areas/Inventory/Controllers/ItemMovementController.cs b/Areas/Inventory/Controllers/ItemMovementController.cs index 2da7e77..e12df88 100644 --- a/Areas/Inventory/Controllers/ItemMovementController.cs +++ b/Areas/Inventory/Controllers/ItemMovementController.cs @@ -15,6 +15,10 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers { return View(); } + public ActionResult Qr() + { + return View(); + } [Authorize] [HttpPost("/i/{id}")] diff --git a/Areas/Inventory/Models/RequestModel.cs b/Areas/Inventory/Models/RequestModel.cs index d54dfe0..73ebe84 100644 --- a/Areas/Inventory/Models/RequestModel.cs +++ b/Areas/Inventory/Models/RequestModel.cs @@ -7,14 +7,21 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models { [Key] public int requestId { get; set; } - //public int DepartmentId { get; set; } - //[ForeignKey("DepartmentId")] - //public virtual ItemModel? Department { get; set; } - //[ForeignKey("ItemID")] + public int ProductId { get; set; } + [ForeignKey("ProductId")] + public virtual ProductModel? Product { get; set; } + public int StationId { get; set; } + [ForeignKey("StationId")] + public virtual StationModel? Station { get; set; } + public int UserId { get; set; } + [ForeignKey("UserId")] + public virtual UserModel? User { get; set; } public string? remark { get; set; } public string? status { get; set; } public DateTime requestDate { get; set; } public DateTime approvalDate { get; set; } + public int RequestQuantity { get; set; } + public byte[]? Document { get; set; } } } diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRequest.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRequest.cshtml index c892ec3..dd974c3 100644 --- a/Areas/Inventory/Views/InventoryMaster/ItemRequest.cshtml +++ b/Areas/Inventory/Views/InventoryMaster/ItemRequest.cshtml @@ -1,26 +1,13 @@  @{ - ViewData["Title"] = "Item Request"; + ViewData["Title"] = "Product Request"; Layout = "~/Views/Shared/_Layout.cshtml"; } - @await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml"); -
+
- +
@*
@@ -28,78 +15,32 @@ Loading...
*@ -
+
- -