diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml index ec50f74..97482c8 100644 --- a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml +++ b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml @@ -170,6 +170,9 @@ // }, }, methods: { + resetForm() { + this.rejectremark = ""; + }, async addRequest() { try { const requiredFields = ['stationId', 'productId', 'quantity', 'productCategory']; diff --git a/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml b/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml index cbe36b4..4785875 100644 --- a/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml +++ b/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml @@ -193,12 +193,12 @@ @* Receive *@ @* *@ @* *@ - @* zx *@ - @* *@ - @* zx*@ + @* *@ + @* *@ + @* *@ @* *@ -zx
+

Add Item Movement

diff --git a/Controllers/API/Inventory/InvMainAPI.cs b/Controllers/API/Inventory/InvMainAPI.cs index cb9df9b..2abea70 100644 --- a/Controllers/API/Inventory/InvMainAPI.cs +++ b/Controllers/API/Inventory/InvMainAPI.cs @@ -561,6 +561,7 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory .Include(i => i.NextStore) .Include(i => i.NextStation) .Include(i => i.NextUser) + .Include(i => i.NextUser) .ToListAsync(); //var itemList = await _centralDbContext.Items.ToListAsync(); @@ -973,6 +974,7 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory i.approvalDate, i.remarkMasterInv, i.remarkUser, + })); } diff --git a/wwwroot/Media/Inventory/itemmovement/8_8bac7305-ebd5-42b9-9cd1-f871994f88bc8_Request.jpg b/wwwroot/Media/Inventory/itemmovement/8_8bac7305-ebd5-42b9-9cd1-f871994f88bc8_Request.jpg new file mode 100644 index 0000000..b4c8942 Binary files /dev/null and b/wwwroot/Media/Inventory/itemmovement/8_8bac7305-ebd5-42b9-9cd1-f871994f88bc8_Request.jpg differ diff --git a/wwwroot/Media/Inventory/request/0_b4d930da-122a-4767-a535-7159aa451f488_Request.jpg b/wwwroot/Media/Inventory/request/0_b4d930da-122a-4767-a535-7159aa451f488_Request.jpg new file mode 100644 index 0000000..b4c8942 Binary files /dev/null and b/wwwroot/Media/Inventory/request/0_b4d930da-122a-4767-a535-7159aa451f488_Request.jpg differ diff --git a/wwwroot/Media/Inventory/request/1_8c442caf-9a12-4998-bcc8-47918657338011_Request.jpg b/wwwroot/Media/Inventory/request/1_8c442caf-9a12-4998-bcc8-47918657338011_Request.jpg new file mode 100644 index 0000000..5e223c8 Binary files /dev/null and b/wwwroot/Media/Inventory/request/1_8c442caf-9a12-4998-bcc8-47918657338011_Request.jpg differ diff --git a/wwwroot/Media/Inventory/request/3_640ef119-a416-46d8-9bfb-17d6dfe70ed111_Request.jpg b/wwwroot/Media/Inventory/request/3_640ef119-a416-46d8-9bfb-17d6dfe70ed111_Request.jpg new file mode 100644 index 0000000..5e223c8 Binary files /dev/null and b/wwwroot/Media/Inventory/request/3_640ef119-a416-46d8-9bfb-17d6dfe70ed111_Request.jpg differ