diff --git a/OrdersManagement/Components/Pages/WarehousePackList.razor b/OrdersManagement/Components/Pages/WarehousePackList.razor index 7c0035d..1fcc226 100644 --- a/OrdersManagement/Components/Pages/WarehousePackList.razor +++ b/OrdersManagement/Components/Pages/WarehousePackList.razor @@ -25,7 +25,7 @@ - + @@ -138,7 +138,8 @@ _wzHeader = await WarehouseService.GetWzHeaderByIdAsync(WzHeader); _wzRowsMeyle = await WarehouseService.GetWzRowsByWzHeaderId(WzHeader); - _wzRowsMeyle.ToList().ForEach(x => ScannedValuesWithItems.Add(x.ItemNumber.Replace(" ", ""), null)); + _wzRowsMeyle.ToList().ForEach(x => ScannedValuesWithItems.Add(x.ItemNumber.Replace(" ", "").Replace("-", ""), null)); + ScannedValuesWithItems.Add("40409100006", null); EmailAddresses = _wzHeader.EmailAddresses; @@ -186,20 +187,23 @@ Visibility = true; } - private void ScanValue(KeyboardEventArgs obj) + private void ScanValue(ChangedEventArgs obj) { - if (obj.Key != "Enter") return; + if (string.IsNullOrWhiteSpace(obj.Value)) return; - LastScannedValue = ScannedValue.Trim(); - - if (!ScannedValuesWithItems.ContainsKey(ScannedValues.Replace(" ", "").Trim()) && ScannedValuesWithItems.ContainsKey(LastScannedValue.Replace(" ", "").Trim())) + ScannedValue = obj.Value.Replace(" ", "").Replace("-", "").Replace("http://qr.meyle.com/", "").Trim(); + + if (!ScannedValuesWithItems.ContainsKey(ScannedValue) && ScannedValuesWithItems.ContainsKey(LastScannedValue.Trim())) { ScannedValuesWithItems[LastScannedValue] = ScannedValue.Trim(); - ScannedValues += $"{ScannedValue})\n"; + ScannedValues += $"{ScannedValue}\n"; } else if(!string.IsNullOrWhiteSpace(ScannedValue)) { ScannedValues += $"{ScannedValue}: "; } + + LastScannedValue = ScannedValue; + ScannedValue = string.Empty; } } \ No newline at end of file