Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TME supplier order number splitting (#6900)

Browse Source 
* Fix TME supplier order number splitting

* Fix order number not split for QR codes, handle standard ecia codes
This commit is contained in:
Bobbe 2024-04-01 03:45:49 +02:00 committed by GitHub
parent 34e86bfbeb
commit 1fc2e454fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
InvenTree/plugin/builtin/suppliers/tme.py
View File

@ -30,7 +30,7 @@ class TMEPlugin(SupplierBarcodeMixin, SettingsMixin, InvenTreePlugin):
} }
TME_IS_QRCODE_REGEX = re.compile(r'([^\s:]+:[^\s:]+\s+)+(\S+(\s|$)+)+') TME_IS_QRCODE_REGEX = re.compile(r'([^\s:]+:[^\s:]+\s+)+(\S+(\s|$)+)+')
TME_IS_BARCODE2D_REGEX = re.compile(r'(([^\s]+)(\s+|$))+') TME_IS_OLD_BARCODE2D_REGEX = re.compile(r'(([^\s]+)(\s+|$))+')
# Custom field mapping # Custom field mapping
TME_QRCODE_FIELDS = { TME_QRCODE_FIELDS = {
@ -52,22 +52,19 @@ class TMEPlugin(SupplierBarcodeMixin, SettingsMixin, InvenTreePlugin):
key, value = item.split(':') key, value = item.split(':')
if key in self.TME_QRCODE_FIELDS: if key in self.TME_QRCODE_FIELDS:
barcode_fields[self.TME_QRCODE_FIELDS[key]] = value barcode_fields[self.TME_QRCODE_FIELDS[key]] = value
elif self.TME_IS_OLD_BARCODE2D_REGEX.fullmatch(barcode_data):
return barcode_fields # Old 2D Barcode format e.g. "PWBP-302 1PMPNWBP-302 Q1 K19361337/1"
elif self.TME_IS_BARCODE2D_REGEX.fullmatch(barcode_data):
# 2D Barcode format e.g. "PWBP-302 1PMPNWBP-302 Q1 K19361337/1"
for item in barcode_data.split(' '): for item in barcode_data.split(' '):
for k, v in self.ecia_field_map().items(): for k, v in self.ecia_field_map().items():
if item.startswith(k): if item.startswith(k):
barcode_fields[v] = item[len(k) :] barcode_fields[v] = item[len(k) :]
else: else:
return {} barcode_fields = self.parse_ecia_barcode2d(barcode_data)
# Custom handling for order number # Custom handling for order number
if SupplierBarcodeMixin.CUSTOMER_ORDER_NUMBER in barcode_fields: if SupplierBarcodeMixin.SUPPLIER_ORDER_NUMBER in barcode_fields:
order_number = barcode_fields[SupplierBarcodeMixin.CUSTOMER_ORDER_NUMBER] order_number = barcode_fields[SupplierBarcodeMixin.SUPPLIER_ORDER_NUMBER]
order_number = order_number.split('/')[0] order_number = order_number.split('/')[0]
barcode_fields[SupplierBarcodeMixin.CUSTOMER_ORDER_NUMBER] = order_number barcode_fields[SupplierBarcodeMixin.SUPPLIER_ORDER_NUMBER] = order_number
return barcode_fields return barcode_fields