Upgraded sqlservice to 2.0.x

This commit is contained in:
Marcus Lindvall 2023-04-13 10:55:42 +02:00
parent 229ea6fb5b
commit 6c1eb903f7
8 changed files with 95 additions and 91 deletions

View file

@ -82,11 +82,11 @@ class Article():
logger.info('Creating GTIN for %s, %s, %s' % (n1.ArtNr, n1.AltEnhetKod, n1.ArtNrEAN))
continue
db.raw_db.add(n1)
db.raw_session.add(n1)
logger.debug('Created/updated Article EAN for %s - %s with GTIN %s' % (
gtin['article_no'], gtin.get('unit', 'no unit'), gtin['article_gtin']))
db.raw_db.commit()
db.raw_session.commit()
logger.info('Succesfully commited %s GTINs to database' % (len(gtins)))
@staticmethod
@ -94,9 +94,9 @@ class Article():
gtins = db.raw_session.query(ArticleEAN).all()
for gtin in gtins:
db.raw_db.delete(gtin)
db.raw_session.delete(gtin)
db.raw_db.commit()
db.raw_session.commit()
logger.info('Deleted %s GTINs' % (len(gtins)))
@ -126,6 +126,7 @@ def get_gtin_for_article(article_ean, article_unit=None, use_prefix=True):
'Kart': 1,
'Bricka': 1,
'½-pall': 2,
'½-pall A': 2,
'tray_no_wrap': 8
}
prefixes = []
@ -273,7 +274,7 @@ def create_gtins(dry_run=True):
for unit in article.ArticleUnit:
# Skip paket for 21%, should only match HV with plastic wrapping.
if article.ArtNr[0:2] == '21' and unit.AltEnhetKod[0:6].lower() == 'paket':
if article.ArtNr[0:2] == '21' and unit.AltEnhetKod[0:5].lower() == 'paket':
logger.info('Skip paket unit for %s' % (article.ArtNr))
continue
@ -354,7 +355,7 @@ def set_storage_type():
for article in articles:
article.LagTyp = 4
db.raw_db.commit()
db.raw_session.commit()
logger.info("Updated storage type for %s articles" % (len(articles)))
@ -386,7 +387,7 @@ def set_zone_placement():
else:
logger.info("Excluded %s, wrong article class or no balance " % (article.ArtNr))
db.raw_db.commit()
db.raw_session.commit()
logger.info("Updated placement zone for %s articles" % (zone_placements_update))
@ -409,7 +410,7 @@ def update_decimals_on_alt_units():
updated_units += 1
db.raw_db.commit()
db.raw_session.commit()
logger.info("Updated decimal count for %s article units" % (updated_units))
@ -454,6 +455,7 @@ if __name__ == '__main__':
# Article.clear_article_gtins()
logger.info("Creating new GTINs from base GTIN")
create_gtins(dry_run=False)
# logger.info("Creating new GTINs from trading goods CSV")
# create_gtins_for_trading_goods()