update qr
This commit is contained in:
parent
e478637fba
commit
8b7a4d5390
@ -20,11 +20,6 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers
|
|||||||
return View();
|
return View();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ActionResult Qr()
|
|
||||||
{
|
|
||||||
return View();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Authorize]
|
[Authorize]
|
||||||
[HttpPost("/i/{id}")]
|
[HttpPost("/i/{id}")]
|
||||||
public IActionResult ItemRecognization(string id, [FromBody] ItemModel item)
|
public IActionResult ItemRecognization(string id, [FromBody] ItemModel item)
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -636,6 +636,97 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost("AddItemMovement")]
|
||||||
|
public async Task<IActionResult> AddItemMovement([FromBody] ItemMovementModel itemmovement)
|
||||||
|
//public async Task<IActionResult> AddItemMovement()
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if (!ModelState.IsValid)
|
||||||
|
{
|
||||||
|
return BadRequest(ModelState);
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_centralDbContext.ItemMovements.Add(itemmovement);
|
||||||
|
|
||||||
|
await _centralDbContext.SaveChangesAsync(); // This generates the auto-incremented ItemID
|
||||||
|
|
||||||
|
|
||||||
|
//ItemMovementModel itemMovement = new ItemMovementModel
|
||||||
|
//{
|
||||||
|
// ItemId = item.ItemID,
|
||||||
|
// ToUser = inventoryMaster.UserId,
|
||||||
|
// ToStore = inventoryMaster.StoreId,
|
||||||
|
// LastStore = inventoryMaster.StoreId,
|
||||||
|
// LastUser = inventoryMaster.UserId,
|
||||||
|
// LatestStatus = "Ready To Deploy",
|
||||||
|
// Quantity = item.Quantity,
|
||||||
|
// Action = "Register",
|
||||||
|
// Date = DateTime.Now,
|
||||||
|
// MovementComplete = true,
|
||||||
|
//};
|
||||||
|
|
||||||
|
//_centralDbContext.ItemMovements.Add(itemMovement);
|
||||||
|
//await _centralDbContext.SaveChangesAsync();
|
||||||
|
|
||||||
|
// Fetch the generated ItemID
|
||||||
|
//var savedItem = await _centralDbContext.Items.FirstOrDefaultAsync(i => i.ItemID == item.ItemID);
|
||||||
|
//// Fetch the generated itemMovement
|
||||||
|
//var savedMovement = await _centralDbContext.ItemMovements.FirstOrDefaultAsync(i => i.Id == itemMovement.Id);
|
||||||
|
|
||||||
|
//if (savedItem != null)
|
||||||
|
//{
|
||||||
|
// var companyDepartment = await GetDepartmentWithCompany(item.CompanyId, item.DepartmentId);
|
||||||
|
// var itemProduct = _centralDbContext.Products.Where(p => p.ProductId == item.ProductId).FirstOrDefault();
|
||||||
|
|
||||||
|
// string? companyInitial = companyDepartment!.CompanyName?.ToString().Substring(0, 1).ToUpper();
|
||||||
|
// string? departmentInitial = companyDepartment!.DepartmentName?.ToString().Substring(0, 1).ToUpper();
|
||||||
|
// string? deptCode = companyDepartment!.DepartmentCode?.ToString();
|
||||||
|
// char? initialCategory = itemProduct!.Category.ToString().Substring(0, 1).ToUpper().FirstOrDefault();
|
||||||
|
// string? productId = itemProduct!.ProductId.ToString("D3");
|
||||||
|
// string? itemId = item.ItemID.ToString("D5");
|
||||||
|
// var uniqueId = $"{deptCode}{initialCategory}{productId}{itemId}".ToUpper();
|
||||||
|
// savedItem.UniqueID = uniqueId;
|
||||||
|
// savedItem.MovementId = savedMovement?.Id;
|
||||||
|
|
||||||
|
// _centralDbContext.Items.Update(savedItem);
|
||||||
|
// await _centralDbContext.SaveChangesAsync();
|
||||||
|
//}
|
||||||
|
|
||||||
|
//var updatedItem = new
|
||||||
|
//{
|
||||||
|
// savedItem!.ItemID,
|
||||||
|
// savedItem.UniqueID,
|
||||||
|
// savedItem.CompanyId,
|
||||||
|
// savedItem.DepartmentId,
|
||||||
|
// savedItem.ProductId,
|
||||||
|
// savedItem.SerialNumber,
|
||||||
|
// savedItem.Quantity,
|
||||||
|
// savedItem.Supplier,
|
||||||
|
// savedItem.PurchaseDate,
|
||||||
|
// savedItem.PONo,
|
||||||
|
// savedItem.Currency,
|
||||||
|
// savedItem.DefaultPrice,
|
||||||
|
// savedItem.CurrencyRate,
|
||||||
|
// savedItem.ConvertPrice,
|
||||||
|
// savedItem.DODate,
|
||||||
|
// savedItem.Warranty,
|
||||||
|
// savedItem.EndWDate,
|
||||||
|
// savedItem.InvoiceDate,
|
||||||
|
// savedItem.PartNumber,
|
||||||
|
//};
|
||||||
|
return Json(itemmovement);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return BadRequest(ex.Message);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
#endregion ItemMovement
|
#endregion ItemMovement
|
||||||
|
|
||||||
#region ItemRequestUser
|
#region ItemRequestUser
|
||||||
|
|||||||
@ -146,11 +146,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
@* <div> *@
|
||||||
<p v-if="isAdmin">Welcome, Admin! You have full access.</p>
|
@* <p v-if="isAdmin">Welcome, Admin! You have full access.</p> *@
|
||||||
<p v-else-if="userRole === 'user'">Welcome, User! You have limited access.</p>
|
@* <p v-else-if="userRole === 'user'">Welcome, User! You have limited access.</p> *@
|
||||||
<p v-else>Guest View: Please log in.</p>
|
@* <p v-else>Guest View: Please log in.</p> *@
|
||||||
</div>
|
@* </div> *@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -209,7 +209,7 @@
|
|||||||
);
|
);
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
this.thisItem = await response.json();
|
this.thisItem = await response.json();
|
||||||
// console.log(this.thisItem);
|
|
||||||
} else {
|
} else {
|
||||||
console.error('Failed to fetch item information');
|
console.error('Failed to fetch item information');
|
||||||
this.responseMessage = await response.text();
|
this.responseMessage = await response.text();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user